Merge branch 'fu-dev' of uskycloud/usky-modules into master

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

@@ -93,24 +93,26 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
 
                 if (records3.get(0).getNoticeMethod().contains("电话")) {
                     handleVoiceNotice(sysUser, baseAlarmNoticeResult, records.get(0), baseAlarmType, baseAlarm);
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
 
                 if (records3.get(0).getNoticeMethod().contains("短信")) {
                     handleSmsNotice(sysUser, baseAlarmNoticeResult, templateParam);
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
 
                 if (records3.get(0).getNoticeMethod().contains("APP")) {
                     handleMceNotice(sysUser, baseAlarmNoticeResult, baseAlarm, baseAlarmType, records2.get(0), "1");
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
 
                 if (records3.get(0).getNoticeMethod().contains("微信")) {
                     handleMceNotice(sysUser, baseAlarmNoticeResult, baseAlarm, baseAlarmType, records2.get(0), "2");
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
-
-                saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
             }
         } catch (Exception e) {
-            log.error("Error in sending alarm notice", e);
+            log.error("发送报警通知时异常", e);
         }
         return saveAlarmResult;
     }
@@ -163,7 +165,7 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
             request.setTemplateCode(SMS_TEMPLATE_CODE);
             request.setTemplateParam(templateParam);
             SendSmsResponse response = client.getAcsResponse(request);
-            baseAlarmNoticeResult.setNoticeResult(response.getCode() != null && response.getCode().equals("OK") ? 1 : 2);
+            baseAlarmNoticeResult.setNoticeResult(response.getCode() != null && "OK".equals(response.getCode()) ? 1 : 2);
         } catch (Exception e) {
             log.error("用户：{}，告警消息短信发送失败", sysUser.getUserId(), e);
             baseAlarmNoticeResult.setNoticeResult(2);
@@ -198,12 +200,15 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
         mceRequestVO.setInfoType(INFO_TYPE);
         mceRequestVO.setInfoTitle(INFO_TITLE);
         mceRequestVO.setDeviceId(device.getDeviceId());
+        log.info("设备ID：{}", device.getDeviceId());
         mceRequestVO.setInfoContent(baseAlarmType.getTypeName());
         mceRequestVO.setAlarmTime(formatAlarmTime(baseAlarm.getAlarmTime()));
+        log.info("告警时间：{}", baseAlarm.getAlarmTime());
         mceRequestVO.setAlarmSendType(sendType);
         mceRequestVO.setRemark(String.format(REMARK_TEMPLATE, device.getDeviceName()));
         mceRequestVO.setUserIds(Collections.singletonList(sysUser.getUserId()));
         mceRequestVO.setUserName(sysUser.getUserName());
+        mceRequestVO.setId(baseAlarm.getId());
         return mceRequestVO;
     }
 

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

@@ -115,6 +115,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     List<BaseAlarmNotice> records3 = baseAlarmNoticeService.list(lambdaQuery3);
                     if (records3.size()>0){
                         Integer saveAlarmResult = baseAlarmNoticeResultService.send(baseAlarm,records3,alarmId,records,baseAlarmType,records2);
+                        log.info("异步发送告警通知数据: {}", baseAlarm);
                     }
                     return saveResult;
                 }

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/impl/EgDeviceServiceImpl.java

@@ -68,10 +68,11 @@ public class EgDeviceServiceImpl extends AbstractCrudService<EgDeviceMapper, EgD
                 .like(StringUtils.isNotBlank(requestVO.getInstallAddress()),EgDevice::getInstallAddress,requestVO.getInstallAddress())
                 .eq(null != requestVO.getServiceStatus(),EgDevice::getServiceStatus,requestVO.getServiceStatus())
                 .eq(null != requestVO.getId(),EgDevice::getId,requestVO.getId())
+                .eq(null != requestVO.getDeviceUuid(),EgDevice::getDeviceUuid, requestVO.getDeviceUuid())
                 .eq(EgDevice::getTenantId,tenantId)
                 .orderByDesc(EgDevice::getId);
         page = this.page(page,queryWrapper);
-        if(page.getRecords().size() > 0){
+        if(!page.getRecords().isEmpty()){
 
             LambdaQueryWrapper<MeetingFace> meetingFaceQuery = Wrappers.lambdaQuery();
             meetingFaceQuery.select(MeetingFace::getFid,MeetingFace::getCreateTime,MeetingFace::getVefNum,MeetingFace::getFaceName,MeetingFace::getRemark,MeetingFace::getFaceStatus,MeetingFace::getCardNum,MeetingFace::getBindDevice,MeetingFace::getDeptId,MeetingFace::getTenantId,MeetingFace::getUserId)

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceRequestVO.java

@@ -40,4 +40,9 @@ public class EgDeviceRequestVO implements Serializable {
      * 域名
      */
     private String domain;
+
+    /**
+     * 设备uuid
+     */
+    private String deviceUuid;
 }

service-eg/service-eg-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/data-transfer" />
+	<property name="log.path" value="/var/log/uskycloud/service-eg"/>
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

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

@@ -71,6 +71,9 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         Integer tenantId = SecurityUtils.getTenantId();
         LocalDateTime now = LocalDateTime.now();
 
+        // 验证项目成员
+        validateProjectMember(project.getProjectMember());
+
         // 检查项目名称是否为空或超过长度限制
         String projectName = project.getProjectName();
         if (StringUtils.isBlank(projectName)) {
@@ -107,6 +110,16 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         saveOrUpdateProject(project, userName, now, deptId, tenantId);
     }
 
+    // 验证项目成员
+    private void validateProjectMember(String member) {
+        if (StringUtils.isBlank(member)) {
+            return;
+        }
+        if (!member.matches("\\d+(,\\d+)*")) {
+            throw new BusinessException("项目成员格式错误！");
+        }
+    }
+
     // 检查项目名称是否已存在
     private void checkProjectNameExistence(PmProject project, Integer tenantId) {
         LambdaQueryWrapper<PmProject> wrapper = Wrappers.lambdaQuery();

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

@@ -511,7 +511,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 try {
                     pmReceiveMapper.insert(pmReceive);
                 } catch (Exception e) {
-                    log.error("报告接收人：" + id + "，报告发送人：" + createBy + "，存入报告消息表失败！");
+                    log.error("报告接收人：{}，报告发送人：{}，存入报告消息表失败！", id, createBy, e);
                     throw new BusinessException(createBy + " 的工作报告存入报告消息表失败！");
                 }
             }