Merge branch 'usky-zyj' into server-165

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeResultServiceImpl.java

@@ -52,8 +52,8 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
     private static final String SMS_SIGN_NAME = "上海永天科技股份有限公司";
     private static final String SMS_TEMPLATE_CODE = "SMS_463791105";
     private static final String REGION_ID = "cn-beijing";
-    private static final String ACCESS_KEY_ID = "LTAI5tH3VvRL5BUkovCokHJX";
-    private static final String ACCESS_KEY_SECRET = "SaaWUouNqvcA0C746gcNOH9m6SRYN4";
+    private static final String ACCESS_KEY_ID = "LTAI5t7GgkVKSdAbPWAzUq8U";
+    private static final String ACCESS_KEY_SECRET = "9zQ3e8GPTSlcfF1ev0JaBjlpvvSG6N";
 
     private static final String INFO_TYPE = "4";
     private static final String INFO_TITLE = "设备告警";
@@ -209,6 +209,7 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
         mceRequestVO.setUserIds(Collections.singletonList(sysUser.getUserId()));
         mceRequestVO.setUserName(sysUser.getUserName());
         mceRequestVO.setId(baseAlarm.getId());
+        mceRequestVO.setTenantId(baseAlarm.getTenantId());
         return mceRequestVO;
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/config/SyncPatrolInspectionEvent.java

@@ -17,7 +17,7 @@ public class SyncPatrolInspectionEvent {
     private RemoteDictService remoteDictService;
 
     @Async("asyncServiceExecutor")
-    public void sendAsyncMessage(Integer eventId,String eventName,Integer eventType){
+    public void sendAsyncMessage(Integer tenantId,Integer eventId,String eventName,Integer eventType){
         String eventTypeName = remoteDictService.selectNameById("patrol_event_type",
                 eventType.toString());
         JsonObject jsonObject = new JsonObject();
@@ -26,6 +26,7 @@ public class SyncPatrolInspectionEvent {
         jsonObject.addProperty("infoType",2);
         jsonObject.addProperty("userName", SecurityUtils.getUsername());
         jsonObject.addProperty("id",eventId);
+        jsonObject.addProperty("tenantId",tenantId);
         remoteMceService.addMce(jsonObject.toString());
     }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionEventServiceImpl.java

@@ -134,7 +134,7 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
 
         this.save(patrolInspectionEvent);
 
-//        syncPatrolInspectionEvent.sendAsyncMessage(patrolInspectionEvent.getId(),patrolInspectionEvent.getEventName(),patrolInspectionEvent.getEventType());
+//        syncPatrolInspectionEvent.sendAsyncMessage(SecurityUtils.getTenantId(),patrolInspectionEvent.getId(),patrolInspectionEvent.getEventName(),patrolInspectionEvent.getEventType());
 
     }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/DingTalkAndMessage.java

@@ -330,6 +330,7 @@ public class DingTalkAndMessage {
         jsonObject.put("id", newReport.getId());
         jsonObject.put("infoTypeName", INFO_TITLE);
         jsonObject.put("userName", newReport.getCreateBy());
+        jsonObject.put("tenantId", newReport.getTenantId());
         if (!userId.isEmpty()) {
             jsonObject.put("userIds", userId);
         }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -205,6 +205,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         }
 
         IPage<BaseAlarm> page = new Page<>(baseAlarmListVO.getCurrent(), baseAlarmListVO.getSize());
+        List<BaseAlarm> records = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(devIdList)){
             LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.in(BaseAlarm::getDeviceId,devIdList)
@@ -227,65 +228,27 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
             }else {
                 queryWrapper.orderByDesc(BaseAlarm::getId);
             }
-            page = this.page(page,queryWrapper);
-//        List<BaseAlarm> records = this.list(queryWrapper);
-            if(page.getRecords().size()>0){
-                List<String> devList = new ArrayList<>();
-                for(int i=0;i<page.getRecords().size();i++){
-                    devList.add(page.getRecords().get(i).getDeviceId());
-                }
-
-                if(devList.size() > 0){
-                    LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery1 = Wrappers.lambdaQuery();
-                    lambdaQuery1.in(BaseFacilityDevice::getDeviceId,devList);
-                    List<BaseFacilityDevice> records1 = baseFacilityDeviceService.list(lambdaQuery1);
-                    if(CollectionUtils.isNotEmpty(deviceInfo)){
-                        for(int i=0;i<page.getRecords().size();i++){
-                            for(int j=0;j<deviceInfo.size();j++){
-                                if(page.getRecords().get(i).getDeviceId().equals(deviceInfo.get(j).getDeviceId())){
-                                    page.getRecords().get(i).setDeviceName(deviceInfo.get(j).getDeviceName());
-                                    page.getRecords().get(i).setDeviceType(deviceInfo.get(j).getDeviceType());
-                                    break;
-                                }
-                            }
-                            for(int k=0;k<records1.size();k++){
-                                if(page.getRecords().get(i).getDeviceId().equals(records1.get(k).getDeviceId())){
-                                    page.getRecords().get(i).setFacilityId(records1.get(k).getFacilityId());
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                List<BaseAlarmType> alarmTypeList = baseMapper.getAlarmTypeList();
-                if(CollectionUtils.isNotEmpty(alarmTypeList)){
-                    for(int i=0;i<page.getRecords().size();i++){
-                        for(int j=0;j<alarmTypeList.size();j++){
-                            if(page.getRecords().get(i).getAlarmType().equals(alarmTypeList.get(j).getTypeCode())){
-                                page.getRecords().get(i).setTypeImg(alarmTypeList.get(j).getTypeImg());
-                                break;
-                            }
-                        }
-                    }
-                }
+//            page = this.page(page,queryWrapper);
+            records = this.list(queryWrapper);
+            if(records.size() == 0){
+                return new CommonPage<>(new ArrayList<>(),0,0,0);
 
             }
         }
 
         if(StringUtils.isNotBlank(baseAlarmListVO.getDeviceName())){
-            list = page.getRecords().stream().filter(e -> baseAlarmListVO.getDeviceName().equals(e.getDeviceName())).collect(Collectors.toList());
+            list = records.stream().filter(e -> baseAlarmListVO.getDeviceName().equals(e.getDeviceName())).collect(Collectors.toList());
         }else {
-            if(page.getRecords().size()>0){
-                for(int k=0;k<page.getRecords().size();k++){
-                    list.add(page.getRecords().get(k));
+            if(records.size()>0){
+                for(int k=0;k<records.size();k++){
+                    list.add(records.get(k));
                 }
             }
 
         }
-        int total = 0;
+
         if(list.size()>0){
-            total = list.size();
+            page.setTotal(list.size());
         }
         int current = 0;
         Integer pageNum = baseAlarmListVO.getCurrent();
@@ -297,6 +260,46 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         queryWrapper5.eq("tenant_id",SecurityUtils.getTenantId());
         List<DmpDeviceType> deviceTypeList = dmpDeviceTypeMapper.selectList(queryWrapper5);
         List<BaseAlarm> info = list.stream().sorted(Comparator.comparing(BaseAlarm::getId,Comparator.reverseOrder())).skip(current).limit(pageSize).collect(Collectors.toList());
+        List<String> devList = new ArrayList<>();
+        for(int i=0;i<info.size();i++){
+            devList.add(info.get(i).getDeviceId());
+        }
+
+        if(devList.size() > 0){
+            LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery1 = Wrappers.lambdaQuery();
+            lambdaQuery1.in(BaseFacilityDevice::getDeviceId,devList);
+            List<BaseFacilityDevice> records1 = baseFacilityDeviceService.list(lambdaQuery1);
+            if(CollectionUtils.isNotEmpty(deviceInfo)){
+                for(int i=0;i<info.size();i++){
+                    for(int j=0;j<deviceInfo.size();j++){
+                        if(info.get(i).getDeviceId().equals(deviceInfo.get(j).getDeviceId())){
+                            info.get(i).setDeviceName(deviceInfo.get(j).getDeviceName());
+                            info.get(i).setDeviceType(deviceInfo.get(j).getDeviceType());
+                            break;
+                        }
+                    }
+                    for(int k=0;k<records1.size();k++){
+                        if(info.get(i).getDeviceId().equals(records1.get(k).getDeviceId())){
+                            info.get(i).setFacilityId(records1.get(k).getFacilityId());
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        List<BaseAlarmType> alarmTypeList = baseMapper.getAlarmTypeList();
+        if(CollectionUtils.isNotEmpty(alarmTypeList)){
+            for(int i=0;i<info.size();i++){
+                for(int j=0;j<alarmTypeList.size();j++){
+                    if(info.get(i).getAlarmType().equals(alarmTypeList.get(j).getTypeCode())){
+                        info.get(i).setTypeImg(alarmTypeList.get(j).getTypeImg());
+                        break;
+                    }
+                }
+            }
+        }
+
         LocalDateTime toDateTime = LocalDateTime.now();
         for(int l=0;l<info.size();l++){
             LocalDateTime fromDateTime = info.get(l).getAlarmTime();
@@ -318,8 +321,10 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     info.get(l).setDeviceTypeName(deviceTypeList.get(m).getTypeName());
                 }
             }
+
         }
-        return new CommonPage<BaseAlarm>(info,total,pageSize,pageNum);
+        page.setRecords(info);
+        return new CommonPage<BaseAlarm>(page.getRecords(),page.getTotal(),pageSize,pageNum);
 
     }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java

@@ -421,6 +421,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                     rp.setReportStatus(1);
                     pmWorkReportMapper.updateById(rp);
                     if (StringUtils.isNotBlank(ccTo)) {
+                        rp.setTenantId(tenantId);
                         dingTalkAndMessage.sendAsyncMessage(rp);
                         receiveMessages(ccTo, rid);
                     }
@@ -776,6 +777,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         jsonObject.put("infoTypeName", INFO_TITLE);
         jsonObject.put("userName", "报告提醒通知");
         jsonObject.put("userIds", userIds);
+        jsonObject.put("tenantId", tenantId);
 
         // 推送消息中心
         try {

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaApprovalServiceImpl.java

@@ -238,6 +238,7 @@ public class OaApprovalServiceImpl extends AbstractCrudService<OaApprovalMapper,
 
                             // 发送消息通知下一步审批人
                             oaSendMessageCenter.sendAsyncMessage(
+                                    tenantId,
                                     oaApproval.getCreateBy(),
                                     oaApproval.getApprovalUid(),
                                     approval.getId(),
@@ -253,6 +254,7 @@ public class OaApprovalServiceImpl extends AbstractCrudService<OaApprovalMapper,
             else {
                 Long proposerId = Long.valueOf(oaApproval.getProposer());
                 oaSendMessageCenter.sendAsyncMessage(
+                        tenantId,
                         oaApproval.getCreateBy(),
                         oaApproval.getApprovalUid(),
                         oaApproval.getId(),
@@ -265,6 +267,7 @@ public class OaApprovalServiceImpl extends AbstractCrudService<OaApprovalMapper,
             Long proposerId = Long.valueOf(oaApproval.getProposer());
             // 发送消息通知申请人审核不通过
             oaSendMessageCenter.sendAsyncMessage(
+                    tenantId,
                     oaApproval.getCreateBy(),
                     oaApproval.getApprovalUid(),
                     oaApproval.getId(),

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaFbdDocumentServiceImpl.java

@@ -179,6 +179,7 @@ public class OaFbdDocumentServiceImpl extends AbstractCrudService<OaFbdDocumentM
             oaApprovalMapper.insert(approval);
 
             oaSendMessageCenter.sendAsyncMessage(
+                    oaFbdDocument.getTenantId(),
                     oaFbdDocument.getCreateBy(),
                     approval.getApprovalUid(),
                     oaFbdDocument.getId(),

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/utils/OaSendMessageCenter.java

@@ -57,7 +57,7 @@ public class OaSendMessageCenter {
      * @param sign 申请单类型
      */
     @Async
-    public void sendAsyncMessage(String username, Long approvalUid, Integer id, List<Long> receivers, Integer isPass, String sign) {
+    public void sendAsyncMessage(Integer tenantId, String username, Long approvalUid, Integer id, List<Long> receivers, Integer isPass, String sign) {
 
         log.info(username + "的申请开始发送消息中心-----------------------------------");
 
@@ -99,6 +99,7 @@ public class OaSendMessageCenter {
         mceRequestVO.setInfoTypeName(INFO_TITLE);
         mceRequestVO.setUserName(username);
         mceRequestVO.setUserIds(receivers);
+        mceRequestVO.setTenantId(tenantId);
         try {
             // 推送消息中心
             //ApiResult<Void> voidApiResult = remoteMceService.addMce(jsonObject.toString());

service-pm/service-pm-biz/src/main/java/com/usky/pm/service/config/DingTalkAndMessage.java

@@ -330,6 +330,7 @@ public class DingTalkAndMessage {
         mceRequestVO.setInfoTypeName(INFO_TITLE);
         mceRequestVO.setUserName(username);
         mceRequestVO.setRealName(nickName.getNickName());
+        mceRequestVO.setTenantId(newReport.getTenantId());
 
         if (!userId.isEmpty()) {
             mceRequestVO.setUserIds(userId);

service-pm/service-pm-biz/src/main/java/com/usky/pm/service/impl/PmWorkReportServiceImpl.java

@@ -443,6 +443,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                         if (pmWorkReport.getSendDingTalk().equals(1)) {
                             dingTalkAndMessage.sendDingTalkDailyReport(rp, contents);
                         }
+                        rp.setTenantId(tenantId);
                         dingTalkAndMessage.sendAsyncMessage(rp);
                         receiveMessages(ccTo, rid);
                     }
@@ -808,6 +809,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         mceRequestVO.setId(0);
         mceRequestVO.setInfoTypeName(INFO_TITLE);
         mceRequestVO.setUserName("报告管理系统");
+        mceRequestVO.setTenantId(tenantId);
         if (!userIds.isEmpty()) {
             mceRequestVO.setUserIds(userIds);
         }