Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-job/pom.xml

@@ -46,6 +46,12 @@
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-fire-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         
 
         

base-modules/service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -1,5 +1,8 @@
 package com.ruoyi.job.task;
 
+import com.usky.common.core.utils.SpringUtils;
+import com.usky.fire.RemoteFireService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.usky.common.core.utils.StringUtils;
 
@@ -11,6 +14,9 @@ import com.usky.common.core.utils.StringUtils;
 @Component("ryTask")
 public class RyTask
 {
+    @Autowired
+    private RemoteFireService remoteFireService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -25,4 +31,9 @@ public class RyTask
     {
         System.out.println("执行无参方法");
     }
+
+    public void addPatrolInspectionAbnormalData(){
+        remoteFireService.addPatrolInspectionAbnormalData();
+        System.out.println("addPatrolInspectionAbnormalData");
+    }
 }

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/TokenController.java

@@ -12,10 +12,7 @@ import com.usky.common.redis.core.RedisHelper;
 import com.usky.common.security.auth.AuthUtil;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.MceMbuser;
-import com.usky.system.domain.SysPerson;
-import com.usky.system.domain.SysUser;
-import com.usky.system.domain.SysUserVO;
+import com.usky.system.domain.*;
 import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.*;
@@ -57,6 +54,10 @@ public class TokenController {
 
     @Autowired
     private MceMbuserService mceMbuserService;
+
+    @Autowired
+    private MceSettingService mceSettingService;
+
     @Resource
     private HttpServletRequest request;
     @Resource
@@ -118,6 +119,27 @@ public class TokenController {
             }
         }
 
+        LambdaQueryWrapper<MceSetting> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(MceSetting::getCreateBy,userInfo.getUserName());
+        List<MceSetting> list = mceSettingService.list(queryWrapper);
+        if(CollectionUtils.isEmpty(list)){
+            //新增消息设置记录
+            MceSetting mceSetting = new MceSetting();
+            mceSetting.setAppMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+            mceSetting.setPcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+            mceSetting.setWcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+
+            mceSetting.setCreateBy(userInfo.getUserName());
+            mceSetting.setCreateTime(LocalDateTime.now());
+            mceSetting.setTenantId(userInfo.getTenantId());
+            long longValue = userInfo.getDeptId();
+            Integer intValue = (int) longValue;
+            mceSetting.setDeptId(intValue);
+            mceSettingService.save(mceSetting);
+        }
+
+
+
         // 获取登录token
         return ApiResult.success(tokenService.createToken(sysUser));
     }

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/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/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/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>