短信服务集成

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DeviceMessageFeignClient.java

@@ -27,4 +27,8 @@ public interface DeviceMessageFeignClient {
     @ApiOperation("根据事件类型和用户id查询打开推送的用户信息")
     HttpResult<List<User>> getSendUserByType(@RequestBody DeviceMessageParam param);
 
+    @PostMapping("/getLineInfo")
+    @ApiOperation("获取监测点信息")
+    HttpResult<String> getLineInfo(@RequestParam("id") String id);
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/SmsSendFeignClient.java

@@ -0,0 +1,23 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.fallback.SmsSendClientFallbackFactory;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/sms", fallbackFactory = SmsSendClientFallbackFactory.class,contextId = "sms")
+public interface SmsSendFeignClient {
+
+    @PostMapping("/send/simple")
+    @ApiOperation("发送短信（简化参数）")
+    HttpResult<String> sendSmsSimple(@RequestParam("receiver") String receiver
+            , @RequestParam("content") String content
+            , @RequestParam("messageType") String messageType);
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DeviceMessageClientFallbackFactory.java

@@ -39,6 +39,12 @@ public class DeviceMessageClientFallbackFactory implements FallbackFactory<Devic
                 log.error("{}异常，降级处理，异常为：{}","根据事件类型和用户id查询打开推送的用户信息数据异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<String> getLineInfo(String id) {
+                log.error("{}异常，降级处理，异常为：{}","获取监测点信息数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/SmsSendClientFallbackFactory.java

@@ -0,0 +1,34 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.SmsSendFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class SmsSendClientFallbackFactory implements FallbackFactory<SmsSendFeignClient> {
+    @Override
+    public SmsSendFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new SmsSendFeignClient() {
+
+            @Override
+            public HttpResult<String> sendSmsSimple(String receiver, String content, String messageType) {
+                log.error("{}异常，降级处理，异常为：{}","发送短信（简化参数）数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CredentialReqDTO.java

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.pojo.dto;
+
+/**
+ * @author caozehui
+ * @data 2026-03-31
+ */
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * 系统凭证请求 DTO
+ *
+ * @author msgpush
+ */
+@Data
+public class CredentialReqDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 上游系统名称
+     */
+    @NotEmpty(message = "上游系统名称不能为空")
+    private String systemName;
+
+    /**
+     * 密钥（用于生成凭证）
+     */
+    @NotEmpty(message = "密钥不能为空")
+    private String secretKey;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/SendResult.java

@@ -0,0 +1,21 @@
+package com.njcn.csdevice.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+@AllArgsConstructor
+public class SendResult implements Serializable {
+
+    private final boolean success;
+    private final String messageId;
+    private final String failReason;
+    private final boolean isTimeOut;
+    private final boolean unauthorized;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java

@@ -67,7 +67,7 @@ public class CsEdDataAuditParm {
     private String versionType;
 
     @ApiModelProperty(value = "crc信息")
-    private String crcInfo;
+    private String crc;
     @ApiModelProperty(value="0：删除 1：正常")
     private String status;
     @ApiModelProperty(value = ".bin文件")

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java

@@ -88,6 +88,12 @@ public class CsEdDataPO extends BaseEntity {
     @TableField(value = "file_path")
     private String filePath;
 
+    /**
+     * crc文件校验码
+     */
+    @TableField(value = "crc")
+    private String crc;
+
 
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsSmsSendRecord.java

@@ -0,0 +1,45 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author xy
+ */
+@Data
+@TableName("cs_sms_send_record")
+public class CsSmsSendRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    private String receiver;
+
+    private String content;
+
+    private String messageType;
+
+    private String credentialToken;
+
+    private Integer sendStatus;
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String failReason;
+
+    private Integer retryCount;
+
+    private Integer maxRetry;
+
+    private Long responseTime;
+
+    private LocalDateTime sendTime;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/MessageRecordReqVO.java

@@ -0,0 +1,40 @@
+package com.njcn.csdevice.pojo.vo;
+
+import cn.hutool.core.lang.RegexPool;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author caozehui
+ * @data 2026-02-27
+ */
+@Data
+@Schema(description = "管理后台 - 消息记录发送 Request VO")
+public class MessageRecordReqVO {
+
+    private String channel;
+
+    @Schema(description = "消息类型", example = "verify_code/order_notify/marketing/system_notify")
+    @NotBlank(message = "消息类型不能为空")
+    private String messageType;
+
+    @Schema(description = "接收者")
+    @NotBlank(message = "接收者不能为空")
+    @Pattern(regexp = RegexPool.EMAIL + "|" + RegexPool.MOBILE, message = "必须是有效的邮箱或手机号格式")
+    private String receiver;
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "消息内容")
+    private String content;
+
+    @Schema(description = "模板编码")
+    private String templateCode;
+
+    @Schema(description = "模板参数")
+    private String templateParams;
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/message/DeviceMessageController.java

@@ -66,5 +66,15 @@ public class DeviceMessageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLineInfo")
+    @ApiOperation("获取监测点信息")
+    @ApiImplicitParam(name = "id", value = "参数", required = true, paramType = "query")
+    public HttpResult<String> getLineInfo(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getLineInfo");
+        deviceMessageService.getLineInfo(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
+    }
+
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/message/SmsSendController.java

@@ -0,0 +1,77 @@
+package com.njcn.csdevice.controller.message;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.vo.MessageRecordReqVO;
+import com.njcn.csdevice.service.ISmsSendService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sms")
+@Api(tags = "短信发送管理")
+@AllArgsConstructor
+public class SmsSendController extends BaseController {
+
+    private final ISmsSendService smsSendService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/send")
+    @ApiOperation("发送短信（同步，包含重试）")
+    public HttpResult<String> sendSms(@RequestBody MessageRecordReqVO vo) {
+        String methodDescribe = getMethodDescribe("sendSms");
+
+        try {
+            smsSendService.sendSmsWithRetry(vo);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.SUCCESS,
+                    "短信发送成功",
+                    methodDescribe
+            );
+        } catch (Exception e) {
+            log.error("短信发送失败", e);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.FAIL,
+                    e.getMessage(),
+                    methodDescribe
+            );
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/send/simple")
+    @ApiOperation("发送短信（简化参数）")
+    public HttpResult<String> sendSmsSimple(
+            @RequestParam String receiver,
+            @RequestParam String content,
+            @RequestParam(defaultValue = "verify_code") String messageType) {
+        String methodDescribe = getMethodDescribe("sendSmsSimple");
+
+        try {
+            smsSendService.sendSmsWithRetry(receiver, content, messageType);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.SUCCESS,
+                    "短信发送成功",
+                    methodDescribe
+            );
+        } catch (Exception e) {
+            log.error("短信发送失败", e);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.FAIL,
+                    e.getMessage(),
+                    methodDescribe
+            );
+        }
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsSmsSendRecordMapper.java

@@ -0,0 +1,7 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsSmsSendRecord;
+
+public interface CsSmsSendRecordMapper extends BaseMapper<CsSmsSendRecord> {
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/DeviceMessageService.java

@@ -14,4 +14,6 @@ public interface DeviceMessageService {
 
     List<User> getSendUserByType(DeviceMessageParam param);
 
+    void getLineInfo(String id);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ISmsSendService.java

@@ -0,0 +1,12 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.CsSmsSendRecord;
+import com.njcn.csdevice.pojo.vo.MessageRecordReqVO;
+
+public interface ISmsSendService extends IService<CsSmsSendRecord> {
+
+    void sendSmsWithRetry(String receiver, String content, String messageType);
+
+    void sendSmsWithRetry(MessageRecordReqVO messageRecordReqVO);
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -162,29 +162,40 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csEquipmentProcess.setDevId(csEquipmentDeliveryAddParm.getNdid());
         csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
         csEquipmentProcess.setStartTime(LocalDateTime.now());
-//        csEquipmentProcess.setProcess(1);
         csEquipmentProcess.setProcess(4);
         csEquipmentProcess.setStatus (1);
         csEquipmentProcessPOService.save(csEquipmentProcess);
         result = this.save (csEquipmentDeliveryPo);
 
-        //谁新建的设备，则认为是该设备的主用户，新建用户设备关系表数据
+        String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
-        boolean addUser = csDeviceUserPOService.add(csEquipmentDeliveryPo.getId());
+        if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),code) && Objects.equals(csEquipmentDeliveryAddParm.getDevAccessMethod(),"CLD")) {
-
+            //谁新建的设备，则认为是该设备的主用户，新建用户设备关系表数据
-        if (result && addUser) {
+            boolean addUser = csDeviceUserPOService.add(csEquipmentDeliveryPo.getId());
-            refreshDeviceDataCache();
+            if (result && addUser) {
+                refreshDeviceDataCache();
+            }
+        } else {
+            if (result) {
+                refreshDeviceDataCache();
+            }
         }
+
         return csEquipmentDeliveryPo;
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public Boolean AuditEquipmentDelivery(String id) {
-        CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, id).one();
         //物理删除
-        QueryWrapper<CsEquipmentDeliveryPO> wrapper = new QueryWrapper();
+        boolean update = false;
-        wrapper.eq ("id", id);
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> wrapper = new LambdaQueryWrapper<>();
-        boolean update = this.remove (wrapper);
+        wrapper.eq(CsEquipmentDeliveryPO::getId,id);
-        //删除deviceuser表里的设备，游客数据设备,删除监测点相关数据
+        CsEquipmentDeliveryPO po = this.getOne(wrapper);
+        if (po != null) {
+            update = this.remove(wrapper);
+            redisUtil.deleteKeysByString(AppRedisKey.LINE_POSITION+po.getNdid());
+        }
+        //删除监测点表、监测点拓扑图关系
         List<CsLedger> list = csLedgerService.lambdaQuery().eq(CsLedger::getPid, id).list();
         if(!CollectionUtils.isEmpty(list)){
             List<String> collect = list.stream().map(CsLedger::getId).collect(Collectors.toList());
@@ -195,8 +206,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             appLineTopologyDiagramPOQueryWrapper.clear();
             appLineTopologyDiagramPOQueryWrapper.in("line_id",collect);
             appLineTopologyDiagramService.remove(appLineTopologyDiagramPOQueryWrapper);
-//            appLineTopologyDiagramService.lambdaUpdate().in(AppLineTopologyDiagramPO::getLineId,collect).set(AppLineTopologyDiagramPO::getStatus,0).update();
         }
+        //清空关系表
         LambdaQueryWrapper<CsLedger>  csLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         csLedgerLambdaQueryWrapper.clear();
         csLedgerLambdaQueryWrapper.eq(CsLedger::getId,id);
@@ -204,14 +215,20 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csLedgerLambdaQueryWrapper.clear();
         csLedgerLambdaQueryWrapper.eq(CsLedger::getPid,id);
         csLedgerService.remove(csLedgerLambdaQueryWrapper);
-        csDeviceUserPOService.lambdaUpdate().eq(CsDeviceUserPO::getDeviceId,id).set(CsDeviceUserPO::getStatus,0).update();
+        //删除设备和模板的关系
+        LambdaQueryWrapper<CsDevModelRelationPO> csDevModelRelationPOQueryWrapper = new LambdaQueryWrapper<>();
+        csDevModelRelationPOQueryWrapper.clear();
+        csDevModelRelationPOQueryWrapper.eq(CsDevModelRelationPO::getDevId,id);
+        csDevModelRelationService.remove(csDevModelRelationPOQueryWrapper);
+        //删除设备/用户关系
+        QueryWrapper<CsDeviceUserPO> csDeviceUserPOQueryWrapper = new QueryWrapper<>();
+        csDeviceUserPOQueryWrapper.clear();
+        csDeviceUserPOQueryWrapper.eq("device_id",id);
+        csDeviceUserPOService.remove(csDeviceUserPOQueryWrapper);
+        //删除游客
         QueryWrapper<CsTouristDataPO> queryWrap = new QueryWrapper<>();
         queryWrap.eq("device_id",id);
         csTouristDataPOService.getBaseMapper().delete(queryWrap);
-        /*后续徐那边做处理*/
-//        CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.getBaseMapper().selectById(id);
-//        mqttUserService.deleteUser(csEquipmentDeliveryPO.getNdid());
-        csDevModelRelationService.lambdaUpdate().eq(CsDevModelRelationPO::getDevId,id).set(CsDevModelRelationPO::getStatus,0).update();
         if (update) {
             refreshDeviceDataCache();
         }
@@ -379,11 +396,14 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         int total = this.baseMapper.getCounts(queryParam);
         if (total > 0) {
             List<CsEquipmentDeliveryVO> recordList = this.baseMapper.getList(queryParam);
-            //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+            //新增逻辑(针对便携式设备、监测设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
             for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : recordList){
-                if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+                String code = dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevType()).getData().getCode();
+                if((Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && csEquipmentDeliveryVO.getStatus() == 1)
+                        || (Objects.equals(code, DicDataEnum.DEV_CLD.getCode()) && csEquipmentDeliveryVO.getStatus() == 1)){
                     csEquipmentDeliveryVO.setStatus(5);
-                } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+                } else if((Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && csEquipmentDeliveryVO.getStatus() == 2)
+                        || (Objects.equals(code, DicDataEnum.DEV_CLD.getCode()) && csEquipmentDeliveryVO.getStatus() == 2)){
                     csEquipmentDeliveryVO.setStatus(6);
                 }
                 //判断装置是否已经连接上mqtt服务器

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -21,7 +21,6 @@ import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
-import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csharmonic.api.PqSensitiveUserFeignClient;
 import com.njcn.device.biz.pojo.po.PqSensitiveUser;
@@ -1296,9 +1295,19 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         if (CollectionUtil.isNotEmpty(enginingeringIds)) {
             List<CsLedger> engineer = this.listByIds(enginingeringIds);
             engineer.forEach(item -> {
+                List<String> devNames = new ArrayList<>();
+                List<String> devIds = new ArrayList<>();
                 DevDetailDTO detail = new DevDetailDTO();
                 detail.setEngineeringid(item.getId());
                 detail.setEngineeringName(item.getName());
+                ledgers.forEach(item2->{
+                    if (item2.getPids().contains(item.getId())) {
+                        devIds.add(item2.getId());
+                        devNames.add(item2.getName());
+                    }
+                });
+                detail.setEquipmentId(String.join(",", devIds));
+                detail.setEquipmentName(String.join(",", devNames));
                 details.add(detail);
             });
         }
@@ -1395,15 +1404,17 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsLedger::getPid, item);
             List<CsLedger> project = this.list(queryWrapper);
-            //工程id
+            if (CollectionUtil.isNotEmpty(project)) {
-            List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
+                //项目id
-            LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
+                List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
-            queryWrapper2.in(CsLedger::getPid, projectIds);
+                LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
-            List<CsLedger> dev = this.list(queryWrapper2);
+                queryWrapper2.in(CsLedger::getPid, projectIds);
-            if (CollectionUtil.isNotEmpty(dev)) {
+                List<CsLedger> dev = this.list(queryWrapper2);
-                DevDetailDTO dto = new DevDetailDTO();
+                if (CollectionUtil.isNotEmpty(dev)) {
-                dto.setEngineeringid(item);
+                    DevDetailDTO dto = new DevDetailDTO();
-                result.add(dto);
+                    dto.setEngineeringid(item);
+                    result.add(dto);
+                }
             }
         });
         return result;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java

@@ -99,6 +99,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
         if (!mqttClient) {
             throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
         }
+        //判断文件如果过大，不给下载
+        if (size > 15728640) {
+            throw new BusinessException("文件过大(超过15M),暂不支持下载!");
+        }
         Object task = redisUtil.getObjectByKey("fileDowning:"+nDid);
         if (Objects.nonNull(task)) {
             throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java

@@ -1,9 +1,17 @@
 package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsDeviceUserFeignClient;
 import com.njcn.csdevice.param.DeviceMessageParam;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.DeviceMessageService;
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.AppInfoSetFeignClient;
 import com.njcn.user.api.AppUserFeignClient;
 import com.njcn.user.api.UserFeignClient;
@@ -12,8 +20,7 @@ import com.njcn.user.pojo.po.app.AppInfoSet;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
@@ -24,6 +31,9 @@ class DeviceMessageServiceImpl implements DeviceMessageService {
     private final CsDeviceUserFeignClient csDeviceUserFeignClient;
     private final AppInfoSetFeignClient appInfoSetFeignClient;
     private final UserFeignClient userFeignClient;
+    private final CsLinePOService csLinePOService;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final RedisUtil redisUtil;
 
     @Override
     public List<String> getEventUserByDeviceId(String devId, Boolean isAdmin) {
@@ -74,4 +84,29 @@ class DeviceMessageServiceImpl implements DeviceMessageService {
         }
         return users;
     }
+
+    @Override
+    public void getLineInfo(String id) {
+        Map<Integer,String> map = new HashMap<>();
+        List<CsLinePO> lineList = csLinePOService.findByNdid(id);
+        if (CollectionUtil.isEmpty(lineList)){
+            throw new BusinessException("监测点为空");
+        }
+        for (CsLinePO item : lineList) {
+            if (Objects.isNull(item.getPosition())){
+                map.put(item.getClDid(),item.getLineId());
+            } else {
+                DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData();
+                if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){
+                    map.put(0,item.getLineId());
+                } else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){
+                    map.put(1,item.getLineId());
+                } else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){
+                    map.put(2,item.getLineId());
+                }
+            }
+        }
+        redisUtil.saveByKey(AppRedisKey.LINE_POSITION+id,map);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/SmsSendServiceImpl.java

@@ -0,0 +1,417 @@
+package com.njcn.csdevice.service.impl;
+
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.mapper.CsSmsSendRecordMapper;
+import com.njcn.csdevice.pojo.dto.CredentialReqDTO;
+import com.njcn.csdevice.pojo.dto.SendResult;
+import com.njcn.csdevice.pojo.po.CsSmsSendRecord;
+import com.njcn.csdevice.pojo.vo.MessageRecordReqVO;
+import com.njcn.csdevice.service.ISmsSendService;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+@RequiredArgsConstructor
+public class SmsSendServiceImpl extends ServiceImpl<CsSmsSendRecordMapper, CsSmsSendRecord> implements ISmsSendService {
+
+    @Value("${msg.credential_url:http://192.168.2.126:48083/admin-api/push/credential/generate}")
+    private String CREDENTIAL_URL;
+    @Value("${msg.sms_send_url:http://192.168.2.126:48083/admin-api/push/message/send/sms}")
+    private String SMS_SEND_URL;
+    @Value("${msg.connect_timeout:5000}")
+    private Integer CONNECT_TIMEOUT;
+    @Value("${msg.read_timeout:30000}")
+    private Integer READ_TIMEOUT;
+    @Value("${msg.system_name:NPQS-9500}")
+    private String SYSTEM_NAME;
+    @Value("${msg.secret_key:123456}")
+    private String SECRET_KEY;
+
+    private static final int[] RETRY_DELAYS = {1, 2, 3};
+    private static final int MAX_RETRY = 3;
+    private static final String CREDENTIAL_CACHE_KEY = "SMS_CREDENTIAL_TOKEN";
+    private static final Gson GSON = new Gson();
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Override
+    public void sendSmsWithRetry(String receiver, String content, String messageType) {
+        MessageRecordReqVO vo = new MessageRecordReqVO();
+        vo.setReceiver(receiver);
+        vo.setContent(content);
+        vo.setMessageType(messageType);
+        sendSmsWithRetry(vo);
+    }
+
+    @Override
+    public void sendSmsWithRetry(MessageRecordReqVO messageRecordReqVO) {
+        CsSmsSendRecord record = initRecord(messageRecordReqVO);
+
+        this.save(record);
+
+        try {
+            String credentialToken = getOrRefreshCredentialWithRetry(record);
+
+            if (credentialToken == null) {
+                record.setSendStatus(0);
+                record.setFailReason("获取凭证失败，已重试3次");
+                log.error("获取凭证失败，短信未发送，接收者: {}", messageRecordReqVO.getReceiver());
+                this.updateById(record);
+                throw new BusinessException("获取凭证失败，已重试3次");
+            }
+
+            record.setCredentialToken(credentialToken);
+            record.setSendTime(LocalDateTime.now());
+            this.updateById(record);
+
+            boolean success = attemptSendWithRetry(messageRecordReqVO, credentialToken, record);
+
+            if (success) {
+                record.setSendStatus(1);
+                record.setFailReason(null);
+                log.info("短信发送成功，接收者: {}", messageRecordReqVO.getReceiver());
+            } else {
+                record.setSendStatus(0);
+                if (record.getFailReason() == null) {
+                    record.setFailReason("超过最大重试次数，发送失败");
+                }
+                log.error("短信发送失败，接收者: {}，已重试{}次，原因: {}",
+                        messageRecordReqVO.getReceiver(), record.getRetryCount(), record.getFailReason());
+                throw new BusinessException("短信发送失败: " + record.getFailReason());
+            }
+        } catch (BusinessException e) {
+            record.setSendStatus(0);
+            record.setFailReason(e.getMessage());
+            log.error("短信发送业务异常，接收者: {}", messageRecordReqVO.getReceiver(), e);
+            this.updateById(record);
+            throw e;
+        } catch (Exception e) {
+            record.setSendStatus(0);
+            record.setFailReason("发送异常: " + e.getMessage());
+            log.error("短信发送异常，接收者: {}", messageRecordReqVO.getReceiver(), e);
+            this.updateById(record);
+            throw new BusinessException("短信发送异常: " + e.getMessage());
+        } finally {
+            this.updateById(record);
+        }
+    }
+
+    private CsSmsSendRecord initRecord(MessageRecordReqVO vo) {
+        CsSmsSendRecord record = new CsSmsSendRecord();
+        record.setReceiver(vo.getReceiver());
+        record.setContent(vo.getContent());
+        record.setMessageType(vo.getMessageType());
+        record.setSendStatus(-1);
+        record.setRetryCount(0);
+        record.setMaxRetry(MAX_RETRY);
+        record.setCreateTime(LocalDateTime.now());
+        return record;
+    }
+
+    private String getOrRefreshCredentialWithRetry(CsSmsSendRecord record) {
+        Object cachedToken = redisUtil.getObjectByKey(CREDENTIAL_CACHE_KEY);
+        if (cachedToken != null) {
+            log.info("使用缓存的凭证令牌");
+            return cachedToken.toString();
+        }
+
+        log.info("缓存中无凭证，开始获取新凭证（最多重试3次）");
+
+        for (int i = 1; i <= 3; i++) {
+            try {
+                String token = fetchNewCredential();
+                log.info("第{}次尝试获取凭证成功", i);
+                return token;
+            } catch (Exception e) {
+                log.warn("第{}次获取凭证失败: {}", i, e.getMessage());
+
+                record.setFailReason("获取凭证第" + i + "次失败: " + e.getMessage());
+                this.updateById(record);
+
+                try {
+                    int waitSeconds = i * 10;
+                    log.info("等待{}秒后重试...", waitSeconds);
+                    TimeUnit.SECONDS.sleep(waitSeconds);
+                } catch (InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    log.error("凭证获取重试被中断");
+                    record.setFailReason("获取凭证实例被中断");
+                    this.updateById(record);
+                    return null;
+                }
+            }
+        }
+
+        log.error("获取凭证失败，已重试3次");
+        return null;
+    }
+
+    private String fetchNewCredential() {
+        CredentialReqDTO reqDTO = new CredentialReqDTO();
+        reqDTO.setSystemName(SYSTEM_NAME);
+        reqDTO.setSecretKey(SECRET_KEY);
+
+        HttpURLConnection connection = null;
+        try {
+            URL url = new URL(CREDENTIAL_URL);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Content-Type", "application/json");
+            connection.setConnectTimeout(CONNECT_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setDoOutput(true);
+
+            OutputStream outputStream = connection.getOutputStream();
+            outputStream.write(GSON.toJson(reqDTO).getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+            outputStream.close();
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode != 200) {
+                throw new BusinessException("获取凭证失败，HTTP响应码: " + responseCode);
+            }
+
+            BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+            StringBuilder response = new StringBuilder();
+            String inputLine;
+            while ((inputLine = reader.readLine()) != null) {
+                response.append(inputLine);
+            }
+            reader.close();
+
+            JsonObject jsonResponse = GSON.fromJson(response.toString(), JsonObject.class);
+            int code = jsonResponse.get("code").getAsInt();
+
+            if (code != 0) {
+                String msg = jsonResponse.has("msg") ? jsonResponse.get("msg").getAsString() : "未知错误";
+                throw new BusinessException("获取凭证失败，错误码: " + code + "，错误信息: " + msg);
+            }
+
+            JsonObject data = jsonResponse.getAsJsonObject("data");
+            String token = data.get("credentialToken").getAsString();
+            long expiresTimestamp = data.get("expiresTime").getAsLong();
+
+            LocalDateTime expiresTime = LocalDateTime.ofInstant(
+                    Instant.ofEpochMilli(expiresTimestamp),
+                    ZoneId.systemDefault()
+            );
+
+            long expireSeconds = calculateExpireSeconds(expiresTime);
+            redisUtil.saveByKeyWithExpire(CREDENTIAL_CACHE_KEY, token, expireSeconds);
+
+            log.info("获取新凭证成功，过期时间: {}，缓存有效期: {}秒", expiresTime, expireSeconds);
+            return token;
+
+        } catch (SocketTimeoutException e) {
+            throw new BusinessException("获取凭证超时(30秒)，请检查网络连接");
+        } catch (ConnectException e) {
+            throw new BusinessException("无法连接到凭证服务，请检查服务是否启动和网络是否正常");
+        } catch (IOException e) {
+            throw new BusinessException("获取凭证IO异常: " + e.getMessage());
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    private long calculateExpireSeconds(LocalDateTime expiresTime) {
+        long expireSeconds = java.time.Duration.between(
+                LocalDateTime.now(),
+                expiresTime
+        ).getSeconds();
+
+        expireSeconds = expireSeconds - 60;
+
+        return Math.max(expireSeconds, 60);
+    }
+
+    private boolean attemptSendWithRetry(MessageRecordReqVO vo, String token, CsSmsSendRecord record) {
+        for (int attempt = 0; attempt <= MAX_RETRY; attempt++) {
+            if (attempt > 0) {
+                int delayMinutes = RETRY_DELAYS[attempt - 1];
+                log.info("第{}次重试，等待{}分钟后发送...", attempt, delayMinutes);
+
+                try {
+                    TimeUnit.MINUTES.sleep(delayMinutes);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    log.error("重试等待被中断", e);
+                    record.setFailReason("重试等待被中断");
+                    return false;
+                }
+                record.setRetryCount(attempt);
+            }
+
+            SendResult result = executeSendSms(vo, token, record);
+
+            if (result.isSuccess()) {
+                record.setFailReason(null);
+                log.info("第{}次尝试发送成功，消息ID: {}", attempt, result.getMessageId());
+                return true;
+            }
+
+            record.setFailReason(result.getFailReason());
+
+            if (result.isUnauthorized()) {
+                log.warn("凭证失效(401)，重新获取凭证后重试...");
+                String newToken = getOrRefreshCredentialWithRetry(record);
+                if (newToken == null) {
+                    record.setFailReason("凭证刷新失败，无法重新获取凭证");
+                    return false;
+                }
+                token = newToken;
+                record.setCredentialToken(newToken);
+                this.updateById(record);
+                continue;
+            }
+
+            if (!result.isTimeOut()) {
+                log.warn("发送失败且非超时，不再重试，原因: {}，响应时间: {}ms",
+                        result.getFailReason(), record.getResponseTime());
+                return false;
+            }
+
+            log.warn("第{}次发送超时，将重试，响应时间: {}ms",
+                    attempt, record.getResponseTime());
+        }
+
+        record.setFailReason("超过最大重试次数，发送超时");
+        return false;
+    }
+
+    private SendResult executeSendSms(MessageRecordReqVO vo, String token, CsSmsSendRecord record) {
+        HttpURLConnection connection = null;
+        long startTime = System.currentTimeMillis();
+
+        try {
+            URL url = new URL(SMS_SEND_URL);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Content-Type", "application/json");
+            connection.setRequestProperty("X-Credential-Token", token);
+            connection.setConnectTimeout(CONNECT_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setDoOutput(true);
+
+            OutputStream outputStream = connection.getOutputStream();
+            outputStream.write(GSON.toJson(Collections.singletonList(vo)).getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+            outputStream.close();
+
+            int responseCode = connection.getResponseCode();
+            long responseTime = System.currentTimeMillis() - startTime;
+            record.setResponseTime(responseTime);
+
+            BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(
+                            responseCode == 200 ? connection.getInputStream() : connection.getErrorStream(),
+                            StandardCharsets.UTF_8
+                    )
+            );
+            StringBuilder response = new StringBuilder();
+            String inputLine;
+            while ((inputLine = reader.readLine()) != null) {
+                response.append(inputLine);
+            }
+            reader.close();
+
+            if (responseCode != 200) {
+                String failReason = "HTTP响应码异常: " + responseCode;
+                if (response.length() > 0) {
+                    failReason += "，响应: " + response.toString();
+                }
+                record.setFailReason(failReason);
+                return new SendResult(false, null, failReason, false, false);
+            }
+
+            JsonObject jsonResponse = GSON.fromJson(response.toString(), JsonObject.class);
+            int code = jsonResponse.get("code").getAsInt();
+
+            if (code == 401) {
+                String failReason = "凭证失效(HTTP 401)";
+                record.setFailReason(failReason);
+                redisUtil.delete(CREDENTIAL_CACHE_KEY);
+                return new SendResult(false, null, failReason, false, true);
+            } else {
+                if (code != 0) {
+                    String msg = jsonResponse.has("msg") ? jsonResponse.get("msg").getAsString() : "未知错误";
+                    String failReason = "业务错误码: " + code + "，错误信息: " + msg;
+                    record.setFailReason(failReason);
+                    return new SendResult(false, null, failReason, false, false);
+                }
+            }
+
+            JsonObject firstResult = jsonResponse.getAsJsonArray("data").get(0).getAsJsonObject();
+            boolean result = firstResult.get("result").getAsBoolean();
+            String messageId = firstResult.has("messageId") ? firstResult.get("messageId").getAsString() : null;
+            String detail = firstResult.has("detail") ? firstResult.get("detail").getAsString() : null;
+
+            if (result) {
+                log.info("短信发送成功，接收者: {}，消息ID: {}，详情: {}，耗时: {}ms",
+                        vo.getReceiver(), messageId, detail, responseTime);
+                return new SendResult(true, messageId, null, false, false);
+            } else {
+                String failReason = "发送失败: " + detail;
+                record.setFailReason(failReason);
+                return new SendResult(false, messageId, failReason, false, false);
+            }
+
+        } catch (SocketTimeoutException e) {
+            long responseTime = System.currentTimeMillis() - startTime;
+            record.setResponseTime(responseTime);
+            String failReason = "请求超时(30秒)";
+            record.setFailReason(failReason);
+            log.warn("短信发送超时，接收者: {}，耗时: {}ms", vo.getReceiver(), responseTime);
+            return new SendResult(false, null, failReason, true, false);
+        } catch (ConnectException e) {
+            long responseTime = System.currentTimeMillis() - startTime;
+            record.setResponseTime(responseTime);
+            String failReason = "无法连接到短信服务";
+            record.setFailReason(failReason);
+            log.error("短信服务连接失败，接收者: {}", vo.getReceiver(), e);
+            return new SendResult(false, null, failReason, false, false);
+        } catch (IOException e) {
+            long responseTime = System.currentTimeMillis() - startTime;
+            record.setResponseTime(responseTime);
+            String failReason = "IO异常: " + e.getMessage();
+            record.setFailReason(failReason);
+            log.error("短信发送IO异常，接收者: {}，耗时: {}ms", vo.getReceiver(), responseTime, e);
+            return new SendResult(false, null, failReason, false, false);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsEventController.java

@@ -81,7 +81,7 @@ public class CsEventController extends BaseController {
     @ApiImplicitParam(name = "eventId", value = "暂态事件索引", required = true)
     public HttpResult<WaveDataDTO> analyseWave(String eventId) {
         String methodDescribe = getMethodDescribe("analyseWave");
-        WaveDataDTO wave = csEventPOService.analyseWave(eventId,1);
+        WaveDataDTO wave = csEventPOService.analyseWave(eventId,2);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, wave, methodDescribe);
     }
 

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/RealDataController.java

@@ -41,8 +41,8 @@ public class RealDataController extends BaseController {
     @PostMapping("/getBaseRealData")
     @ApiOperation("获取基础实时数据")
     @ApiImplicitParam(name = "lineId", value = "监测点id")
-    public HttpResult<Boolean> getRealData(@RequestParam("lineId") String lineId) {
+    public HttpResult<Boolean> getBaseRealData(@RequestParam("lineId") String lineId) {
-        String methodDescribe = getMethodDescribe("getRealData");
+        String methodDescribe = getMethodDescribe("getBaseRealData");
         boolean result = realDataService.getBaseRealData(lineId);
         if (result) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java

@@ -19,6 +19,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.DeviceMessageFeignClient;
+import com.njcn.csdevice.api.SmsSendFeignClient;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.param.DeviceMessageParam;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
@@ -39,6 +40,7 @@ import com.njcn.csharmonic.pojo.vo.CsWarnDescVO;
 import com.njcn.csharmonic.pojo.vo.EventDetailVO;
 import com.njcn.csharmonic.service.CsEventPOService;
 import com.njcn.csharmonic.service.CsEventUserPOService;
+import com.njcn.cssystem.api.AppMsgSetFeignClient;
 import com.njcn.event.common.mapper.WlRmpEventDetailMapper;
 import com.njcn.event.file.component.WaveFileComponent;
 import com.njcn.event.file.component.WavePicComponent;
@@ -62,6 +64,7 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.system.pojo.po.EleEvtParm;
+import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
@@ -73,6 +76,7 @@ import org.influxdb.InfluxDB;
 import org.influxdb.dto.BatchPoints;
 import org.influxdb.dto.Point;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -123,6 +127,11 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
     private final CsLedgerFeignClient csLedgerFeignclient;
     private final SendMessageUtil sendMessageUtil;
     private final DeviceMessageFeignClient deviceMessageClient;
+    private final AppMsgSetFeignClient appMsgSetFeignClient;
+    private final UserFeignClient userFeignClient;
+    private final SmsSendFeignClient smsSendFeignClient;
+    @Value("${msg.msg_sign:南京灿能电力}")
+    private String msgSign;
 
     @Override
     public List<EventDetailVO> queryEventList(CsEventUserQueryParam csEventUserQueryParam) {
@@ -456,6 +465,26 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
             if (CollectionUtil.isNotEmpty(result)){
                 csEventUserPOService.saveBatch(result);
             }
+            //如果事件是暂降事件，则推送短信给用户
+            if (param.getEventType() == 1) {
+                //根据设备获取需要推送的用户列表
+                List<String> userIdList = appMsgSetFeignClient.queryUserIdsByDeviceId(po.getDeviceId()).getData();
+                if (CollectionUtil.isNotEmpty(userIdList)) {
+                    //获取用户详细信息
+                    List<User> userList = userFeignClient.getUserListByIds(userIdList).getData();
+                    if (CollectionUtil.isNotEmpty(userList)) {
+                        //筛选出有手机号码的；打开短信推送的
+                        List<User> userList1 = userList.stream().filter(item-> StrUtil.isNotBlank(item.getPhone()) && Objects.equals(item.getSmsNotice(),1)).collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(userList1)) {
+                            String msgContent = "【"+msgSign+"】" +devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName()
+                                    + "于" + time.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生暂降事件";
+                            userList1.forEach(item->{
+                                smsSendFeignClient.sendSmsSimple(item.getPhone(),msgContent, "verify_code");
+                            });
+                        }
+                    }
+                }
+            }
         } else {
             if (StrUtil.isNotBlank(param.getWavePath())) {
                 //更新文件信息

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/api/AppMsgSetFeignClient.java

@@ -0,0 +1,24 @@
+package com.njcn.cssystem.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.cssystem.api.fallback.AppMsgSetFeignClientFallbackFactory;
+import com.njcn.cssystem.api.fallback.FeedBackFeignClientFallbackFactory;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_SYSTEM_BOOT, path = "/appMsgSet", fallbackFactory = AppMsgSetFeignClientFallbackFactory.class,contextId = "appMsgSet")
+public interface AppMsgSetFeignClient {
+
+    @PostMapping("/queryUserIdsByDeviceId")
+    @ApiOperation("根据设备ID查询用户列表")
+    HttpResult<List<String>> queryUserIdsByDeviceId(@RequestParam("deviceId") @Validated String deviceId);
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/api/fallback/AppMsgSetFeignClientFallbackFactory.java

@@ -0,0 +1,36 @@
+package com.njcn.cssystem.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.cssystem.api.AppMsgSetFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class AppMsgSetFeignClientFallbackFactory implements FallbackFactory<AppMsgSetFeignClient> {
+    @Override
+    public AppMsgSetFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new AppMsgSetFeignClient() {
+
+            @Override
+            public HttpResult<List<String>> queryUserIdsByDeviceId(String deviceId) {
+                log.error("{}异常，降级处理，异常为：{}","根据设备ID查询用户列表数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppMsgSetParam.java

@@ -0,0 +1,17 @@
+package com.njcn.cssystem.pojo.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class AppMsgSetParam {
+
+    private String userId;
+
+    private List<String> deviceIds;
+
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppVersionParam.java

@@ -28,4 +28,13 @@ public class AppVersionParam implements Serializable {
     @NotNull(message = "版本类型不能为空")
     private String versionType;
 
+    @ApiModelProperty("安卓更新地址")
+    private String androidPath;
+
+    @ApiModelProperty("ios更新地址")
+    private String iosPath;
+
+    @ApiModelProperty("版本ID")
+    private String id;
+
 }

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppMsgSet.java

@@ -0,0 +1,40 @@
+package com.njcn.cssystem.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 设备发送短信配置表
+ * </p>
+ *
+ * @author xy
+ * @since 2026-04-21
+ */
+@Getter
+@Setter
+@TableName("app_msg_set")
+public class AppMsgSet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppVersion.java

@@ -53,5 +53,14 @@ public class AppVersion extends BaseEntity implements Serializable {
      */
     private String content;
 
+    /**
+     * 安卓更新地址
+     */
+    private String androidPath;
+
+    /**
+     * ios更新地址
+     */
+    private String iosPath;
 
 }

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/AppVersionVo.java

@@ -22,4 +22,10 @@ public class AppVersionVo implements Serializable {
 
     @ApiModelProperty("严重度(0:优化 1:bug调整)")
     private Integer sev;
+
+    @ApiModelProperty("安卓更新地址")
+    private String androidPath;
+
+    @ApiModelProperty("ios更新地址")
+    private String iosPath;
 }

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/WlUserVo.java

@@ -30,6 +30,9 @@ public class WlUserVo implements Serializable {
         @ApiModelProperty(value = "工程名称")
         private String name;
 
+        @ApiModelProperty(value = "设备集合")
+        private List<portableDevVo> devList;
+
     }
 
     @Data

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/AppMsgSetController.java

@@ -0,0 +1,86 @@
+package com.njcn.cssystem.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.cssystem.pojo.param.AppMsgSetParam;
+import com.njcn.cssystem.service.IAppMsgSetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备发送短信配置表 前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2026-04-21
+ */
+@RestController
+@RequestMapping("/appMsgSet")
+@Slf4j
+@Api(tags = "短信配置")
+@AllArgsConstructor
+public class AppMsgSetController extends BaseController {
+
+    private final IAppMsgSetService appMsgSetService;
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/addUserDevices")
+    @ApiOperation("新增用户设备关联")
+    @ApiImplicitParam(name = "param", value = "参数{userId:用户ID, deviceIds:设备ID列表}", required = true)
+    public HttpResult<Void> addUserDevices(@RequestBody @Validated AppMsgSetParam param) {
+        String methodDescribe = getMethodDescribe("addUserDevices");
+        LogUtil.njcnDebug(log, "{}，参数：{}", methodDescribe, param);
+        appMsgSetService.addUserDevices(param.getUserId(), param.getDeviceIds());
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @PostMapping("/deleteByUserId")
+    @ApiOperation("根据用户ID删除设备关联")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true)
+    public HttpResult<Void> deleteByUserId(@RequestParam @Validated String userId) {
+        String methodDescribe = getMethodDescribe("deleteByUserId");
+        LogUtil.njcnDebug(log, "{}，用户ID：{}", methodDescribe, userId);
+        appMsgSetService.deleteByUserId(userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+    @PostMapping("/queryDeviceIdsByUserId")
+    @ApiOperation("根据用户ID查询设备列表")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true)
+    public HttpResult<List<String>> queryDeviceIdsByUserId(@RequestParam @Validated String userId) {
+        String methodDescribe = getMethodDescribe("queryDeviceIdsByUserId");
+        LogUtil.njcnDebug(log, "{}，用户ID：{}", methodDescribe, userId);
+        List<String> deviceIds = appMsgSetService.queryDeviceIdsByUserId(userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deviceIds, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+    @PostMapping("/queryUserIdsByDeviceId")
+    @ApiOperation("根据设备ID查询用户列表")
+    @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true)
+    public HttpResult<List<String>> queryUserIdsByDeviceId(@RequestParam @Validated String deviceId) {
+        String methodDescribe = getMethodDescribe("queryUserIdsByDeviceId");
+        LogUtil.njcnDebug(log, "{}，设备ID：{}", methodDescribe, deviceId);
+        List<String> userIds = appMsgSetService.queryUserIdsByDeviceId(deviceId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userIds, methodDescribe);
+    }
+
+}
+

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/baseinfo/AppVersionController.java

@@ -72,5 +72,34 @@ public class AppVersionController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/update")
+    @ApiOperation("修改版本信息")
+    @ApiImplicitParam(name = "param", value = "app版本信息", required = true)
+    public HttpResult<String> update(@RequestBody @Validated AppVersionParam param){
+        String methodDescribe = getMethodDescribe("update");
+        boolean result = appVersionService.update(param);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "修改成功", methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "修改失败", methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/delete")
+    @ApiOperation("删除版本信息")
+    @ApiImplicitParam(name = "id", value = "版本ID", required = true)
+    public HttpResult<String> delete(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = appVersionService.delete(id);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "删除成功", methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "删除失败", methodDescribe);
+        }
+    }
+
 }
 

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/AppMsgSetMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.cssystem.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.cssystem.pojo.po.AppMsgSet;
+
+/**
+ * <p>
+ * 设备发送短信配置表 Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2026-04-21
+ */
+public interface AppMsgSetMapper extends BaseMapper<AppMsgSet> {
+
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppMsgSetService.java

@@ -0,0 +1,50 @@
+package com.njcn.cssystem.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.cssystem.pojo.po.AppMsgSet;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备发送短信配置表 服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2026-04-21
+ */
+public interface IAppMsgSetService extends IService<AppMsgSet> {
+
+    /**
+     * 新增用户设备关联（先清空该用户的旧数据，再批量插入新数据）
+     *
+     * @param userId 用户ID
+     * @param deviceIds 设备ID列表
+     */
+    void addUserDevices(String userId, List<String> deviceIds);
+
+    /**
+     * 根据用户ID删除设备关联
+     *
+     * @param userId 用户ID
+     */
+    void deleteByUserId(String userId);
+
+    /**
+     * 根据用户ID查询设备列表
+     *
+     * @param userId 用户ID
+     * @return 设备ID列表
+     */
+    List<String> queryDeviceIdsByUserId(String userId);
+
+
+    /**
+     * 根据设备ID查询用户列表
+     *
+     * @param deviceId 设备ID
+     * @return 用户ID列表
+     */
+    List<String> queryUserIdsByDeviceId(String deviceId);
+
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppVersionService.java

@@ -22,4 +22,8 @@ public interface IAppVersionService extends IService<AppVersion> {
     AppVersionVo getLastData(String versionType);
 
     List<AppVersion> getAllData(String versionType);
+
+    boolean update(AppVersionParam param);
+
+    boolean delete(String id);
 }

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppMsgSetServiceImpl.java

@@ -0,0 +1,90 @@
+package com.njcn.cssystem.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.cssystem.mapper.AppMsgSetMapper;
+import com.njcn.cssystem.pojo.po.AppMsgSet;
+import com.njcn.cssystem.service.IAppMsgSetService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备发送短信配置表 服务实现类
+ * </p>
+ *
+ * @author xy
+ * @since 2026-04-21
+ */
+@Service
+public class AppMsgSetServiceImpl extends ServiceImpl<AppMsgSetMapper, AppMsgSet> implements IAppMsgSetService {
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addUserDevices(String userId, List<String> deviceIds) {
+        // 先删除该用户的所有设备关联
+        deleteByUserId(userId);
+        // 如果设备列表为空，直接返回
+        if (CollectionUtils.isEmpty(deviceIds)) {
+            return;
+        }
+
+        // 批量插入新的设备关联
+        List<AppMsgSet> relationList = new ArrayList<>();
+        for (String deviceId : deviceIds) {
+            AppMsgSet relation = new AppMsgSet();
+            relation.setId(IdUtil.fastSimpleUUID());
+            relation.setUserId(userId);
+            relation.setDeviceId(deviceId);
+            relationList.add(relation);
+        }
+        this.saveBatch(relationList);
+    }
+
+    @Override
+    public void deleteByUserId(String userId) {
+        LambdaQueryWrapper<AppMsgSet> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppMsgSet::getUserId, userId);
+        this.remove(wrapper);
+    }
+
+    @Override
+    public List<String> queryDeviceIdsByUserId(String userId) {
+        LambdaQueryWrapper<AppMsgSet> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppMsgSet::getUserId, userId);
+        wrapper.select(AppMsgSet::getDeviceId);
+
+        List<AppMsgSet> relationList = this.list(wrapper);
+        List<String> deviceIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(relationList)) {
+            for (AppMsgSet relation : relationList) {
+                deviceIds.add(relation.getDeviceId());
+            }
+        }
+        return deviceIds;
+    }
+
+
+    @Override
+    public List<String> queryUserIdsByDeviceId(String deviceId) {
+        LambdaQueryWrapper<AppMsgSet> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppMsgSet::getDeviceId, deviceId);
+        wrapper.select(AppMsgSet::getUserId);
+
+        List<AppMsgSet> relationList = this.list(wrapper);
+        List<String> userIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(relationList)) {
+            for (AppMsgSet relation : relationList) {
+                userIds.add(relation.getUserId());
+            }
+        }
+        return userIds;
+    }
+
+
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppVersionServiceImpl.java

@@ -34,6 +34,8 @@ public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVers
         appVersion.setSev(param.getSev());
         appVersion.setVersionType(param.getVersionType());
         appVersion.setContent(param.getContent());
+        appVersion.setAndroidPath(param.getAndroidPath());
+        appVersion.setIosPath(param.getIosPath());
         return this.save(appVersion);
     }
 
@@ -59,4 +61,22 @@ public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVers
         queryWrapper.orderByDesc(AppVersion::getPublishTime);
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean update(AppVersionParam param) {
+        AppVersion appVersion = new AppVersion();
+        appVersion.setId(param.getId());
+        appVersion.setVersionName(param.getAppVersion());
+        appVersion.setSev(param.getSev());
+        appVersion.setVersionType(param.getVersionType());
+        appVersion.setContent(param.getContent());
+        appVersion.setAndroidPath(param.getAndroidPath());
+        appVersion.setIosPath(param.getIosPath());
+        return this.updateById(appVersion);
+    }
+
+    @Override
+    public boolean delete(String id) {
+        return this.removeById(id);
+    }
 }

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/WlUserServiceImpl.java

@@ -48,7 +48,18 @@ public class WlUserServiceImpl implements IWlUserService {
                 } else {
                     WlUserVo.EngineeringVo engineeringVo = new WlUserVo.EngineeringVo();
                     engineeringVo.setId(item.getEngineeringid());
-                    engineeringVo.setName(item.getEngineeringName());
+                    engineeringVo.setName(item.getEngineeringName() + "("+item.getEquipmentName()+")");
+
+                    List<WlUserVo.portableDevVo> devList2 = new ArrayList<>();
+                    String[] arr1 = item.getEquipmentId().split(",");
+                    String[] arr2 = item.getEquipmentName().split(",");
+                    for (int i = 0; i < arr1.length; i++) {
+                        WlUserVo.portableDevVo portableDevVo = new WlUserVo.portableDevVo();
+                        portableDevVo.setId(arr1[i]);
+                        portableDevVo.setName(arr2[i]);
+                        devList2.add(portableDevVo);
+                    }
+                    engineeringVo.setDevList(devList2);
                     list1.add(engineeringVo);
                 }
             });