'解决冲突'

base-modules/service-system/service-system-api/src/main/java/com/usky/system/RemoteMceService.java

@@ -4,6 +4,7 @@ package com.usky.system;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.factory.RemoteMceFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -22,6 +23,7 @@ public interface RemoteMceService
      * @param mceInfo 消息信息
      * @return 结果
      */
-    @PostMapping("/addMce")
+    @PostMapping(value = "/addMce",produces= MediaType.APPLICATION_JSON_UTF8_VALUE,consumes = "application/json;" +
+            "charset=UTF-8")
     public ApiResult<Void> addMce(@RequestBody String mceInfo);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/MceReceiveController.java

@@ -115,5 +115,15 @@ public class MceReceiveController {
         mceReceiveService.add(mceReceive);
         return ApiResult.success();
     }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> removeById(@PathVariable("id") Integer id)
+    {
+        mceReceiveService.removeById(id);
+        return ApiResult.success();
+    }
 }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDeptController.java

@@ -6,8 +6,10 @@ import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysDept;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.service.ISysDeptService;
+import com.usky.system.service.ISysUserService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -21,22 +23,23 @@ import java.util.Map;
 
 /**
  * 部门信息
- * 
+ *
  * @author yq
  */
 @RestController
 @RequestMapping("/dept")
-public class SysDeptController extends BaseController
-{
+public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 获取部门列表
      */
     @GetMapping("/list")
-    public ApiResult list(SysDept dept)
-    {
+    public ApiResult list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return ApiResult.success(depts);
     }
@@ -45,16 +48,13 @@ public class SysDeptController extends BaseController
      * 查询部门列表（排除节点）
      */
     @GetMapping("/list/exclude/{deptId}")
-    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
-    {
+    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
-        while (it.hasNext())
-        {
+        while (it.hasNext()) {
             SysDept d = (SysDept) it.next();
             if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) {
                 it.remove();
             }
         }
@@ -65,8 +65,7 @@ public class SysDeptController extends BaseController
      * 根据部门编号获取详细信息
      */
     @GetMapping(value = "/{deptId}")
-    public ApiResult getInfo(@PathVariable Long deptId)
-    {
+    public ApiResult getInfo(@PathVariable Long deptId) {
         return ApiResult.success(deptService.selectDeptById(deptId));
     }
 
@@ -74,20 +73,28 @@ public class SysDeptController extends BaseController
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public ApiResult treeselect(SysDept dept)
-    {
+    public ApiResult treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return ApiResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/deptUserTreeSelect")
+    public ApiResult treeselect(SysDept dept, SysUser user) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        List<SysUser> users = iSysUserService.selectUserList(user);
+        return ApiResult.success(deptService.buildDeptUserTreeSelect(depts, users));
+    }
+
     /**
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public ApiResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
-    {
+    public ApiResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Map<String,Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.buildDeptTreeSelect(depts));
         return ApiResult.success(ajax);
@@ -97,10 +104,8 @@ public class SysDeptController extends BaseController
      * 新增部门
      */
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
+    public ApiResult add(@Validated @RequestBody SysDept dept) {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setTenantId(SecurityUtils.getTenantId());
@@ -112,19 +117,13 @@ public class SysDeptController extends BaseController
      * 修改部门
      */
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
+    public ApiResult edit(@Validated @RequestBody SysDept dept) {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(dept.getDeptId()))
-        {
+        } else if (dept.getParentId().equals(dept.getDeptId())) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
-        {
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
@@ -135,14 +134,11 @@ public class SysDeptController extends BaseController
      * 删除部门
      */
     @DeleteMapping("/{deptId}")
-    public ApiResult remove(@PathVariable Long deptId)
-    {
-        if (deptService.hasChildByDeptId(deptId))
-        {
+    public ApiResult remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
-        {
+        if (deptService.checkDeptExistUser(deptId)) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/MceReceive.java

@@ -91,5 +91,9 @@ public class MceReceive implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    /**
+     * 发布人
+     */
+    private String issuerName;
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDeptService.java

@@ -3,6 +3,7 @@ package com.usky.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.system.domain.SysDept;
+import com.usky.system.domain.SysUser;
 import com.usky.system.service.vo.TreeSelect;
 
 import java.util.List;
@@ -38,6 +39,8 @@ public interface ISysDeptService extends IService<SysDept>
      */
     public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
 
+    List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users);
+
     /**
      * 根据角色ID查询部门树信息
      * 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/MceReceiveService.java

@@ -28,4 +28,6 @@ public interface MceReceiveService extends CrudService<MceReceive> {
 
     void add(String mceReceive);
 
+    boolean removeById(Integer id);
+
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceContentServiceImpl.java

@@ -46,6 +46,9 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             sendWeChatMessageRequestVO.setInfoId(mceReceiveId);
             sendWeChatMessageRequestVO.setOpenId(cids);
             sendWeChatMessageRequestVO.setInfoType(mceReceiveVO.get("infoType").toString());
+            if (mceReceiveVO.containsKey("infoTypeName")) {
+                sendWeChatMessageRequestVO.setInfoTypeName(mceReceiveVO.get("infoTypeName").toString());
+            }
             mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -110,7 +110,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                         startTime,endTime)
                 .eq(StringUtils.isNotBlank(infoType),MceContent::getInfoType, infoType)
                 .eq(MceContent::getCreateBy,SecurityUtils.getUsername())
-                .eq(MceContent::getTenantId,SecurityUtils.getTenantId());
+                .eq(MceContent::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(MceContent::getId);
         page = mceContentService.page(page,lambdaQuery1);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             List<Integer> contentIds = new ArrayList<>();
@@ -118,9 +119,10 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                 contentIds.add(page.getRecords().get(i).getId());
             }
             QueryWrapper<MceReceive> queryWrapper = Wrappers.query();
-            queryWrapper.select("content_id AS contentId","COUNT(read_flag=0 or null) as notReadCount","COUNT(read_flag=1 or null) as readCount")
+            queryWrapper.select("content_id AS contentId","COUNT(read_flag=0 or null) as notReadCount","COUNT" +
+                    "(read_flag=1 or null) as readCount","issuer_name AS issuerName")
                     .in("content_id",contentIds)
-                    .groupBy("content_id");
+                    .groupBy("content_id","issuer_name");
             List<Map<String,Object>> readStatisticList = this.listMaps(queryWrapper);
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
@@ -133,6 +135,7 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                     if (page.getRecords().get(i).getId().equals(readStatisticList.get(j).get("contentId"))){
                         map.put("notReadCount", readStatisticList.get(j).get("notReadCount"));
                         map.put("readCount", readStatisticList.get(j).get("readCount"));
+                        map.put("userName", readStatisticList.get(j).get("issuerName"));
                     }
                 }
                 list.add(map);
@@ -212,6 +215,16 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         this.update(updateWrapper);
     }
 
+    public static List<Integer> convertObjectToList(Object object) {
+        if (object instanceof List<?>) {
+            @SuppressWarnings("unchecked")
+            List<Integer> tempList = (List<Integer>) object;
+            return tempList;
+        } else {
+            throw new IllegalArgumentException("The object is not a List");
+        }
+    }
+
     @Override
     public void add(String mceReceive){
         JSONObject mceReceiveVO = JSONObject.parseObject(mceReceive);
@@ -232,38 +245,50 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             for (int g = 0; g < list.size(); g++) {
                 userIds.add(list.get(g).getUserId().intValue());
             }
+            List<Integer> userIds1;
+            if (mceReceiveVO.containsKey("userIds")) {
+                userIds1 = convertObjectToList(mceReceiveVO.get("userIds"));
+                userIds.retainAll(userIds1);
+            }
             LambdaQueryWrapper<MceMbuser> lambdaQuery3 = Wrappers.lambdaQuery();
             lambdaQuery3.in(MceMbuser::getUserId,userIds);
             List<MceMbuser> list3 = mceMbuserService.list(lambdaQuery3);
             for (int i = 0; i < list.size(); i++) {
-                MceReceive mceReceive1 = new MceReceive();
-                mceReceive1.setReceiverId(list.get(i).getUserId().intValue());
-                mceReceive1.setContentId(contentId);
-                mceReceive1.setReadFlag(0);
-                mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
-                mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
-                mceReceive1.setReceiverName(list.get(i).getUserName());
-                mceReceive1.setCreateBy(SecurityUtils.getUsername());
-                mceReceive1.setCreateTime(LocalDateTime.now());
-                mceReceive1.setTenantId(list.get(i).getTenantId());
-//                mceReceive1.setDeptId(list.get(i).getDeptId().intValue());
-                this.save(mceReceive1);
-                Integer mceReceiveId = mceReceive1.getId();
-                LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
-                lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
-                List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
-                if (CollectionUtils.isNotEmpty(list1)){
-                    JSONObject appMode = JSONObject.parseObject(list1.get(0).getAppMode());
-                    JSONObject wcMode = JSONObject.parseObject(list1.get(0).getWcMode());
-                    for (int j = 0; j < list3.size(); j++){
-                        if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
-                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0,0);
+                if (CollectionUtils.isNotEmpty(list3)){
+                    for (int j = 0; j < list3.size(); j++) {
+                        if (list.get(i).getUserId().equals(list3.get(j).getUserId())){
+                            MceReceive mceReceive1 = new MceReceive();
+                            mceReceive1.setReceiverId(list.get(i).getUserId().intValue());
+                            mceReceive1.setContentId(contentId);
+                            mceReceive1.setReadFlag(0);
+                            mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
+                            mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
+                            if (mceReceiveVO.containsKey("userName")) {
+                                mceReceive1.setIssuerName(mceReceiveVO.get("userName").toString());
                             }
-                        }
-                        if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getOpenid())){
-                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getOpenid(),mceReceiveId,1);
+                            mceReceive1.setReceiverName(list.get(i).getUserName());
+                            mceReceive1.setCreateBy(SecurityUtils.getUsername());
+                            mceReceive1.setCreateTime(LocalDateTime.now());
+                            mceReceive1.setTenantId(list.get(i).getTenantId());
+//                mceReceive1.setDeptId(list.get(i).getDeptId().intValue());
+                            this.save(mceReceive1);
+                            Integer mceReceiveId = mceReceive1.getId();
+                            LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
+                            lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
+                            List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
+                            if (CollectionUtils.isNotEmpty(list1)){
+                                JSONObject appMode = JSONObject.parseObject(list1.get(0).getAppMode());
+                                JSONObject wcMode = JSONObject.parseObject(list1.get(0).getWcMode());
+                                if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
+                                    if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
+                                        mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0,0);
+                                    }
+                                }
+                                if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
+                                    if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getOpenid())){
+                                        mceContentService.sendApp(mceReceiveVO,list3.get(j).getOpenid(),mceReceiveId,1);
+                                    }
+                                }
                             }
                         }
                     }
@@ -271,4 +296,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             }
         }
     }
+
+    @Override
+    public boolean removeById(Integer id) {
+        LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(MceReceive::getContentId,id);
+        this.remove(lambdaQuery);
+        return mceContentService.removeById(id);
+    }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -9,6 +9,7 @@ import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysRole;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysDeptMapper;
 import com.usky.system.mapper.SysRoleMapper;
@@ -97,6 +98,31 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
+    @Override
+    public List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {
+        List<SysDept> deptTrees = buildDeptTree(depts);
+        List<TreeSelect> treeSelectList = new ArrayList<>();
+        for (SysDept dept : deptTrees) {
+            TreeSelect treeSelect = new TreeSelect();
+            treeSelect.setId(dept.getDeptId());
+            treeSelect.setLabel(dept.getDeptName());
+            List<TreeSelect> children = new ArrayList<>();
+            for (SysUser user : users) {
+                if (user.getDeptId().equals(dept.getDeptId())) {
+                    TreeSelect child = new TreeSelect();
+                    child.setId(user.getUserId());
+                    child.setLabel(user.getNickName());
+                    children.add(child);
+                }
+            }
+            treeSelect.setChildren(children);
+            treeSelectList.add(treeSelect);
+        }
+        return treeSelectList;
+    }
+
+
+
     /**
      * 根据角色ID查询部门树信息
      * 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -3,12 +3,15 @@ package com.usky.system.service.impl;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysTenant;
 import com.usky.system.mapper.SysTenantMapper;
+import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.SysTenantService;
 import com.usky.system.service.vo.SysTenantOneVo;
 import com.usky.system.service.vo.SysTenantTwoVo;
 import com.usky.system.service.vo.SysTenantVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -26,6 +29,9 @@ import java.util.UUID;
 @Service
 public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, SysTenant> implements SysTenantService {
 
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
     @Override
     public List<SysTenantVo> getUserData() {
         Integer userId = SecurityUtils.getUserId().intValue();
@@ -93,6 +99,16 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysTenant.setCreateBy(SecurityUtils.getUsername());
         sysTenant.setCreateTime(LocalDateTime.now());
         this.save(sysTenant);
+        Integer tenantId = sysTenant.getId();
+        SysDept sysDept = new SysDept();
+        sysDept.setTenantId(tenantId);
+        sysDept.setDeptName(sysTenant.getTenantName());
+        sysDept.setParentId((long)0);
+        sysDept.setOrderNum("0");
+        sysDept.setEmail(sysTenant.getEmail());
+        sysDept.setPhone(sysTenant.getPhoneNumber());
+        sysDept.setCreateBy(SecurityUtils.getUsername());
+        iSysDeptService.insertDept(sysDept);
     }
 
 

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/MceReceiveMapper.xml

@@ -17,6 +17,7 @@
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
+        <result column="issuer_name" property="issuerName" />
     </resultMap>
 
 </mapper>