洪城义警-正式版后台
tangzy
2021-06-29 8e749f36afe3ee1ae14198262f5da36d67337106
1.群管理
8 files modified
70 ■■■■■ changed files
src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java 33 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/chatrg/entity/Chatgroup.java 17 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/chatrg/mapper/ChatgroupMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IUserService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java
@@ -23,16 +23,24 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.common.vo.DeptVo;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.chatrg.entity.Chatgroup;
import org.springblade.modules.chatrg.vo.ChatgroupVO;
import org.springblade.modules.chatrg.service.IChatgroupService;
import org.springblade.core.boot.ctrl.BladeController;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 *  控制器
@@ -47,6 +55,7 @@
public class ChatgroupController extends BladeController {
    private final IChatgroupService chatgroupService;
    private final IUserService iUserService;
    /**
     * 详情
@@ -67,6 +76,22 @@
    @ApiOperation(value = "分页", notes = "传入chatgroup")
    public R<IPage<Chatgroup>> list(Chatgroup chatgroup, Query query) {
        IPage<Chatgroup> pages = chatgroupService.page(Condition.getPage(query), Condition.getQueryWrapper(chatgroup));
        List<Map<String, Object>> list = iUserService.selectUser();
        for (int i=0;i<pages.getTotal();i++){
            StringBuffer deptNameBuiffer = new StringBuffer();
            String groupmember = pages.getRecords().get(i).getGroupmember();
            String[] split =groupmember.split(",");
            List<String> lists = Arrays.asList(split);
            //数据匹配封装
            for (String deptId:lists) {
                for (Map<String, Object> deptVo:list) {
                    if (deptId.equals(deptVo.get("groupmember").toString())){
                        deptNameBuiffer.append(deptVo.get("rname")).append("/");
                    }
                }
            }
            pages.getRecords().get(i).setGroupmember(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
        }
        return R.data(pages);
    }
@@ -88,6 +113,10 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入chatgroup")
    public R save(@Valid @RequestBody Chatgroup chatgroup) {
        Date dd = new Date();
        SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String end = sim.format(dd);
        chatgroup.setTime(end);
        return R.status(chatgroupService.save(chatgroup));
    }
@@ -108,6 +137,10 @@
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入chatgroup")
    public R submit(@Valid @RequestBody Chatgroup chatgroup) {
        Date dd = new Date();
        SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String end = sim.format(dd);
        chatgroup.setTime(end);
        return R.status(chatgroupService.saveOrUpdate(chatgroup));
    }
src/main/java/org/springblade/modules/chatrg/entity/Chatgroup.java
@@ -59,13 +59,18 @@
    */
        @ApiModelProperty(value = "群介绍")
        @TableField("GroupContent")
    private String groupcontent;
    /**
    * 群主id
    private String groupcontent;/**
    * 群介绍
    */
        @ApiModelProperty(value = "群主id")
        @TableField("GroupId")
    private String groupid;
        @ApiModelProperty(value = "群公告")
        @TableField("GroupNotice")
    private String groupnotice;
//    /**
//    * 群主id
//    */
//        @ApiModelProperty(value = "群主id")
//        @TableField("GroupId")
//    private String groupid;
    /**
    * 群成员id
    */
src/main/java/org/springblade/modules/chatrg/mapper/ChatgroupMapper.xml
@@ -11,6 +11,7 @@
        <result column="GroupId" property="groupid"/>
        <result column="GroupMember" property="groupmember"/>
        <result column="time" property="time"/>
        <result column="GroupNotice" property="groupnotice"/>
    </resultMap>
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -374,4 +374,9 @@
        User detail = userService.getOne(Condition.getQueryWrapper(user));
        return R.data(UserWrapper.build().entityVO(detail));
    }
    @GetMapping("/selectUser")
    public R selectUser() {
        return R.data(userService.selectUser());
    }
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -25,6 +25,7 @@
import org.springblade.modules.system.vo.UsersVo;
import java.util.List;
import java.util.Map;
/**
 * Mapper 接口
@@ -84,5 +85,5 @@
     * @param page  分页
     */
    List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
    List<Map<String, Object>> selectUser();
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -176,4 +176,8 @@
        order by bu.code asc
    </select>
    <select id="selectUser" resultType="java.util.HashMap">
        select CAST(id AS CHAR) as groupmember,real_name as rname from blade_user
    </select>
</mapper>
src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -32,6 +32,7 @@
import org.springblade.modules.system.vo.UsersVo;
import java.util.List;
import java.util.Map;
/**
 * 服务类
@@ -243,5 +244,6 @@
    boolean updateUserInfos(User user);
    R<Boolean> saveUser(User user);
    List<Map<String, Object>> selectUser();
}
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -470,5 +470,10 @@
        return null;
    }
    @Override
    public List<Map<String, Object>> selectUser() {
        return baseMapper.selectUser();
    }
}