Merge remote-tracking branch 'origin/master'

# Conflicts:
#	iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java

iot-access/access-api/src/main/java/com/njcn/access/api/CsDeviceFeignClient.java

@@ -0,0 +1,20 @@
+package com.njcn.access.api;
+
+import com.njcn.access.api.fallback.CsDeviceClientFallbackFactory;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+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.ACCESS_BOOT, path = "/device", fallbackFactory = CsDeviceClientFallbackFactory.class,contextId = "device")
+
+public interface CsDeviceFeignClient {
+
+    @PostMapping("/updateRunStatus")
+    HttpResult<String> updateRunStatus(@RequestParam("nDid") String nDid, @RequestParam("runStatus") Integer runStatus);
+
+}

iot-access/access-api/src/main/java/com/njcn/access/api/fallback/CsDeviceClientFallbackFactory.java

@@ -0,0 +1,34 @@
+package com.njcn.access.api.fallback;
+
+import com.njcn.access.api.CsDeviceFeignClient;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class CsDeviceClientFallbackFactory implements FallbackFactory<CsDeviceFeignClient> {
+    @Override
+    public CsDeviceFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsDeviceFeignClient() {
+
+            @Override
+            public HttpResult<String> updateRunStatus(String nDid, Integer runStatus) {
+                log.error("{}异常，降级处理，异常为：{}","云设备状态调整异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java

@@ -30,7 +30,7 @@ public enum AccessResponseEnum {
     DEV_MODEL_NOT_FIND("A0303","装置型号未找到!"),
     DEV_IS_NOT_ZL("A0303","注册装置不是直连装置!"),
     DEV_IS_NOT_WG("A0303","注册装置不是网关!"),
-    DEV_IS_NOT_PORTABLE("A0303","注册装置不是便携式装置!"),
+    DEV_IS_NOT_PORTABLE("A0303","注册装置不是便携式装置或者在线监测设备!"),
 
     REGISTER_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),
     ACCESS_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),

iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -18,6 +17,11 @@ import java.util.List;
 @Data
 public class DevAccessParam implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("工程id")
+    private String engineeringId;
+
     @ApiModelProperty("项目id")
     @NotNull(message = "项目id不能为空")
     private String projectId;

iot-access/access-api/src/main/java/com/njcn/access/utils/FileCommonUtils.java

@@ -51,6 +51,7 @@ public class FileCommonUtils {
      */
     public void cleanRedisData(String nDid, String fileName) {
         redisUtil.deleteKeysByString("downloadFilePath:"+ nDid);
+        redisUtil.deleteKeysByString("isWeb:"+ nDid);
         redisUtil.delete("fileDowning:"+nDid);
         redisUtil.delete("fileCheck" + nDid + fileName);
         redisUtil.delete(AppRedisKey.FILE_PART_TIME.concat(fileName));

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java

@@ -2,6 +2,7 @@ package com.njcn.access.controller;
 
 import com.njcn.access.param.DevAccessParam;
 import com.njcn.access.service.ICsDeviceService;
+import com.njcn.access.service.ICsEquipmentDeliveryService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 public class CsDeviceController extends BaseController {
 
     private final ICsDeviceService csDeviceService;
+    private final ICsEquipmentDeliveryService csEquipmentDeliveryService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/register")
@@ -120,4 +122,42 @@ public class CsDeviceController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/autoPortableLedger")
+    @ApiOperation("调整便携式设备的台账信息")
+    @ReturnMsg
+    public HttpResult<String> autoPortableLedger(){
+        String methodDescribe = getMethodDescribe("autoPortableLedger");
+        csDeviceService.autoPortableLedger();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateRunStatus")
+    @ApiOperation("设备状态调整")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true),
+            @ApiImplicitParam(name = "runStatus", value = "状态", required = true)
+    })
+    public HttpResult<String> updateRunStatus(@RequestParam String nDid, @RequestParam Integer runStatus){
+        String methodDescribe = getMethodDescribe("updateRunStatus");
+        csEquipmentDeliveryService.updateRunStatusBynDid(nDid,runStatus);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/onlineRegister")
+    @ApiOperation("监测设备接入")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectId", value = "项目id", required = true),
+            @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
+    })
+    @ReturnMsg
+    public HttpResult<String> onlineRegister(@RequestParam("projectId") String projectId,@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("onlineRegister");
+        String result = csDeviceService.onlineRegister(projectId,nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
 }

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsLineLatestDataController.java

@@ -32,7 +32,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/csLineLatestData")
-@Api(tags = "暂降事件")
+@Api(tags = "治理设备模块运行状态记录")
 @AllArgsConstructor
 public class CsLineLatestDataController extends BaseController {
 

iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java

@@ -312,7 +312,7 @@ public class MqttMessageHandler {
                     if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){
                         int mid = 1;
                         //修改装置状态
-                        csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.ACCESS.getCode());
+                        csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.ACCESS.getCode(),null,null);
                         csEquipmentDeliveryService.updateRunStatusBynDid(nDid,AccessEnum.ONLINE.getCode());
                         //记录设备上线
                         PqsCommunicateDto dto = new PqsCommunicateDto();

iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java

@@ -140,7 +140,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
         //装置下线
         csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
         //装置调整为注册状态
-        csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
+        csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode(),null,null);
         logDto.setOperate(nDid +"装置离线");
         sendMessage(nDid);
         //记录装置掉线时间

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsDeviceService.java

@@ -54,4 +54,8 @@ public interface ICsDeviceService {
      * @param nDid 设备识别码
      */
     void wlAccess(String nDid);
+
+    String autoPortableLedger();
+
+    String onlineRegister(String projectId,String nDid);
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java

@@ -22,7 +22,7 @@ public interface ICsEquipmentDeliveryService extends IService<CsEquipmentDeliver
      * 根据网关id修改装置的状态
      * @param nDid 网关id
      */
-    void updateStatusBynDid(String nDid,Integer status);
+    void updateStatusBynDid(String nDid,Integer status,String engineeringId, String projectId);
 
     /**
      * 根据网关id修改软件信息

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsLedgerService.java

@@ -24,4 +24,6 @@ public interface ICsLedgerService extends IService<CsLedger> {
      */
     CsLedger addLedgerTree(CsLedgerParam csLedgerParam);
 
+    void updatePortableLedger(String engineeringId, String projectId);
+
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java

@@ -87,6 +87,7 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService {
     public boolean downloadFile(String nDid, String name, Integer size, String fileCheck) {
         boolean result = true;
         try {
+            redisUtil.saveByKeyWithExpire("isWeb:"+nDid,name,30L);
             redisUtil.saveByKeyWithExpire("fileDowning:"+nDid,"fileDowning",300L);
             redisUtil.saveByKey("fileCheck"+nDid+name,fileCheck);
             Object object = getDeviceMid(nDid);
@@ -104,6 +105,7 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService {
             redisUtil.delete("fileDowning:"+nDid);
             redisUtil.delete("fileCheck"+nDid+name);
             redisUtil.delete("fileDownUserId"+nDid+name);
+            redisUtil.deleteKeysByString("isWeb:"+ nDid);
             throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR);
         }
         return result;

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java

@@ -22,9 +22,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.*;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
-import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm;
-import com.njcn.csdevice.pojo.param.CsLedgerParam;
-import com.njcn.csdevice.pojo.param.CsLineParam;
+import com.njcn.csdevice.pojo.param.*;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
@@ -33,6 +31,9 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.enums.AppRoleEnum;
+import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -80,6 +81,10 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
     private final ChannelObjectUtil channelObjectUtil;
     private final CsLineFeignClient csLineFeignClient;
     private final DataSetFeignClient dataSetFeignClient;
+    private final CsMarketDataFeignClient csMarketDataFeignClient;
+    private final UserFeignClient userFeignClient;
+    private final EngineeringFeignClient engineeringFeignClient;
+    private final AppProjectFeignClient appProjectFeignClient;
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -130,15 +135,16 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
         }
         //5.判断当前流程是否是合法的
-        if (csEquipmentDeliveryVO.getProcess() > type){
-            logDto.setResult(0);
-            logDto.setFailReason(AccessResponseEnum.PROCESS_SAME_ERROR.getMessage());
-            throw new BusinessException(AccessResponseEnum.PROCESS_SAME_ERROR);
-        } else if (csEquipmentDeliveryVO.getProcess() < type){
-            logDto.setResult(0);
-            logDto.setFailReason(AccessResponseEnum.PROCESS_MISSING_ERROR.getMessage());
-            throw new BusinessException(AccessResponseEnum.PROCESS_MISSING_ERROR);
-        }
+        //note(重要说明) 这边流程原先是三个阶段，在实际应用中嫌麻烦，简化为一个流程
+//        if (csEquipmentDeliveryVO.getProcess() > type){
+//            logDto.setResult(0);
+//            logDto.setFailReason(AccessResponseEnum.PROCESS_SAME_ERROR.getMessage());
+//            throw new BusinessException(AccessResponseEnum.PROCESS_SAME_ERROR);
+//        } else if (csEquipmentDeliveryVO.getProcess() < type){
+//            logDto.setResult(0);
+//            logDto.setFailReason(AccessResponseEnum.PROCESS_MISSING_ERROR.getMessage());
+//            throw new BusinessException(AccessResponseEnum.PROCESS_MISSING_ERROR);
+//        }
         //6.询问设备支持的主题信息
         //将支持的主题入库
         askTopic(nDid);
@@ -289,16 +295,16 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             po.setSubUserId(RequestUtil.getUserIndex());
             po.setDeviceId(vo.getId());
             csDeviceUserService.saveBatch(Collections.singletonList(po));
-            //6.修改装置状态
-            csEquipmentDeliveryService.updateStatusBynDid(devAccessParam.getNDid(), AccessEnum.REGISTERED.getCode());
+            //6.修改装置状态;修改设备接入的工程、项目
+            csEquipmentDeliveryService.updateStatusBynDid(devAccessParam.getNDid(), AccessEnum.REGISTERED.getCode(),devAccessParam.getEngineeringId(), devAccessParam.getProjectId());
             //7.发起自动接入请求
             devAccessAskTemplate(devAccessParam.getNDid(),version,1);
             //8.删除redis监测点模板信息
             redisUtil.delete(AppRedisKey.MODEL + devAccessParam.getNDid());
             redisUtil.delete(AppRedisKey.LINE + devAccessParam.getNDid());
-            //存储日志
+            //9.存储日志
             csLogsFeignClient.addUserLog(logDto);
-            //存储设备调试日志表
+            //10.存储设备调试日志表
             CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
             csEquipmentProcess.setDevId(devAccessParam.getNDid());
             csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
@@ -309,6 +315,14 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                 csEquipmentProcess.setStatus(1);
             }
             processFeignClient.add(csEquipmentProcess);
+            //11.这里会出现工程用户接入设备时，如果当前工程用户并没有关注，接入之后应该将用户和工程关联起来
+            List<UserVO> users = userFeignClient.getUserVOByIdList(Collections.singletonList(RequestUtil.getUserIndex())).getData();
+            if (CollectionUtil.isNotEmpty(users)) {
+                UserVO userVO = users.get(0);
+                if (CollectionUtil.isNotEmpty(userVO.getRoleCode()) && userVO.getRoleCode().contains(AppRoleEnum.ENGINEERING_USER.getCode())) {
+                    csMarketDataFeignClient.insertData(userVO.getId(), devAccessParam.getEngineeringId());
+                }
+            }
         } catch (Exception e) {
             logDto.setResult(0);
             logDto.setFailReason(e.getMessage());
@@ -327,12 +341,13 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         param.setNDid(nDid);
         param.setStatus(1);
         param.setRunStatus(1);
-        boolean isConnectDev = DicDataEnum.CONNECT_DEV.getCode().equals(dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevType()).getData().getCode());
-        if (isConnectDev) {
-            param.setProcess(2);
-        } else {
-            param.setProcess(4);
-        }
+//        boolean isConnectDev = DicDataEnum.CONNECT_DEV.getCode().equals(dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevType()).getData().getCode());
+//        if (isConnectDev) {
+//            param.setProcess(2);
+//        } else {
+//            param.setProcess(4);
+//        }
+        param.setProcess(4);
         csEquipmentDeliveryService.devResetFactory(param);
         //清除关系表
         QueryWrapper<CsLedger> csLedgerQueryWrapper = new QueryWrapper<>();
@@ -396,9 +411,13 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
             List<CsLinePO> csLinePoList = new ArrayList<>();
             //1.录入装置台账信息
+            //note 1、这边发现便携式设备注册时，如果没有工程 项目，后期特殊处理非常的麻烦，这边接入时，先查询工程 项目，如果没有则创建；如果存在则直接使用；
+            //note 2、查询之前已经接入过的便携式设备，如果存在修改台账信息，添加工程、项目
+            String projectId = this.autoPortableLedger();
+            //新增便携式设备
             CsLedgerParam csLedgerParam = new CsLedgerParam();
             csLedgerParam.setId(vo.getId());
-            csLedgerParam.setPid("0");
+            csLedgerParam.setPid(projectId);
             csLedgerParam.setName(vo.getName());
             csLedgerParam.setLevel(2);
             csLedgerParam.setSort(0);
@@ -445,7 +464,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             //5.发起自动接入请求
             Thread.sleep(2000);
             //先获取版本
-//            String version = csTopicService.getVersion(nDid);
+            //String version = csTopicService.getVersion(nDid);
             String version = "V1";
             devAccessAskTemplate(nDid,version,1);
             //6.修改流程,便携式设备接入成功即为实际环境
@@ -481,6 +500,144 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         this.devAccessAskTemplate(nDid,version,1);
     }
 
+    @Override
+    public String autoPortableLedger() {
+        CsEngineeringPO csEngineeringPO = engineeringFeignClient.getEngineeringByName("便携式工程").getData();
+        if (csEngineeringPO == null) {
+            //新增便携式工程
+            CsEngineeringAddParm param = new CsEngineeringAddParm();
+            param.setName("便携式工程");
+            param.setProvince("320000000000");
+            param.setCity("320100000000");
+            param.setDescription("便携式工程");
+            param.setSort(Integer.MAX_VALUE);
+            csEngineeringPO = engineeringFeignClient.addEngineering(param).getData();
+        }
+
+        AppProjectPO csProjectPO = appProjectFeignClient.getProjectByName("便携式项目").getData();
+        if (csProjectPO == null) {
+            //新增便携式项目
+            AppProjectAddParm param = new AppProjectAddParm();
+            param.setEngineeringId(csEngineeringPO.getId());
+            param.setName("便携式项目");
+            param.setArea("园区");
+            param.setDescription("便携式项目");
+            param.setTopoIds(Collections.singletonList("99ed9b9c8cf9007cc4d2ac4c7127b7e4"));
+            param.setSort(Integer.MAX_VALUE);
+            csProjectPO = appProjectFeignClient.addPortableProject(param).getData();
+        }
+        //修改已存在的便携式设备
+        csLedgerService.updatePortableLedger(csEngineeringPO.getId(),csProjectPO.getId());
+        return csProjectPO.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String onlineRegister(String projectId,String nDid) {
+        String result = "fail";
+        // 根据模板接入设备
+        DeviceLogDTO logDto = new DeviceLogDTO();
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
+        logDto.setOperate("监测设备"+nDid+"注册、接入");
+        logDto.setResult(1);
+        try {
+            // 设备状态判断
+            checkDeviceStatus(nDid);
+            // 询问设备支持的主题信息，并将支持的主题入库
+            askAndStoreTopics(nDid);
+            Thread.sleep(2000);
+            // MQTT询问装置用的模板，并判断库中是否存在模板
+            checkDeviceModel(nDid);
+            Thread.sleep(2000);
+            CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
+            List<CsLinePO> csLinePoList = new ArrayList<>();
+            //1.录入装置台账信息
+            //新增便携式设备
+            CsLedgerParam csLedgerParam = new CsLedgerParam();
+            csLedgerParam.setId(vo.getId());
+            csLedgerParam.setPid(projectId);
+            csLedgerParam.setName(vo.getName());
+            csLedgerParam.setLevel(2);
+            csLedgerParam.setSort(0);
+            csLedgerService.addLedgerTree(csLedgerParam);
+            //2.根据模板获取监测点个数，插入监测点表
+            Thread.sleep(2000);
+            List<CsModelDto> modelList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(AppRedisKey.MODEL + nDid),CsModelDto.class);
+            if (CollUtil.isEmpty(modelList)) {
+                throwExceptionAndLog(nDid,AccessResponseEnum.MODEL_ERROR, logDto);
+            }
+            List<CsDataSet> list = csDataSetService.getDataSetData(modelList.get(0).getModelId());
+            list.forEach(item->{
+                CsLinePO po = new CsLinePO();
+                po.setLineId(nDid + item.getClDev().toString());
+                po.setName(item.getClDev().toString() + "#监测点");
+                po.setStatus(1);
+                po.setClDid(item.getClDev());
+                po.setLineNo(item.getClDev());
+                po.setRunStatus(0);
+                po.setDeviceId(vo.getId());
+                po.setDataSetId(item.getId());
+                po.setDataModelId(item.getPid());
+                //防止主键重复
+                QueryWrapper<CsLinePO> qw = new QueryWrapper<>();
+                qw.eq("line_id",po.getLineId());
+                if(csLineService.getBaseMapper().selectList(qw).isEmpty()){
+                    csLinePoList.add(po);
+                }
+                //3.生成台账树监测点数据
+                CsLedgerParam param = new CsLedgerParam();
+                param.setId(nDid + item.getClDev().toString());
+                param.setPid(vo.getId());
+                param.setName(item.getClDev().toString() + "#监测点");
+                param.setLevel(3);
+                param.setSort(0);
+                csLedgerService.addLedgerTree(param);
+            });
+            csLineService.saveBatch(csLinePoList);
+            redisUtil.saveByKeyWithExpire("accessLineInfo:" + nDid,csLinePoList,30L);
+            //4.生成装置和模板的关系表
+            CsDevModelRelationAddParm csDevModelRelationAddParm = new CsDevModelRelationAddParm();
+            csDevModelRelationAddParm.setDevId(vo.getId());
+            csDevModelRelationAddParm.setModelId(modelList.get(0).getModelId());
+            csDevModelRelationAddParm.setDid(modelList.get(0).getDid());
+            csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm);
+            //5.绑定装置和人的关系
+            CsDeviceUserPO po = new CsDeviceUserPO();
+            po.setPrimaryUserId(RequestUtil.getUserIndex());
+            po.setStatus("1");
+            po.setSubUserId(RequestUtil.getUserIndex());
+            po.setDeviceId(vo.getId());
+            csDeviceUserService.saveBatch(Collections.singletonList(po));
+
+            //发起自动接入请求
+            Thread.sleep(2000);
+            //先获取版本
+            String version = "V1";
+            devAccessAskTemplate(nDid,version,1);
+            //6.修改流程,接入成功即为实际环境
+            csEquipmentDeliveryService.updateProcessBynDid(nDid,4);
+            //7.存储日志
+            csLogsFeignClient.addUserLog(logDto);
+            //9.删除redis监测点模板信息
+            redisUtil.delete(AppRedisKey.MODEL + nDid);
+            redisUtil.delete(AppRedisKey.LINE + nDid);
+            //判断接入状态
+            Thread.sleep(5000);
+            Object object = redisUtil.getObjectByKey("online" + nDid);
+            if (Objects.nonNull(object)) {
+                result = "success";
+            }
+        } catch (Exception e) {
+            logDto.setResult(0);
+            logDto.setFailReason(e.getMessage());
+            csLogsFeignClient.addUserLog(logDto);
+            resetFactory(nDid);
+            throw new BusinessException(e.getMessage());
+        }
+        return result;
+    }
+
     private void checkDeviceStatus(String nDid) {
         DeviceLogDTO logDto = createLogDto("当前设备"+nDid+"状态判断");
         CsEquipmentDeliveryVO csEquipmentDeliveryVO = csEquipmentDeliveryService.queryEquipmentBynDid(nDid);
@@ -492,7 +649,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             throwExceptionAndLog(nDid,AccessResponseEnum.DEV_NOT_FIND, logDto);
         }
         String code = sysDicTreePo.getCode();
-        if (!Objects.equals(code, DicDataEnum.PORTABLE.getCode())) {
+        if (!Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && !Objects.equals(code, DicDataEnum.DEV_CLD.getCode())) {
             throwExceptionAndLog(nDid,AccessResponseEnum.DEV_IS_NOT_PORTABLE, logDto);
         }
         if (!mqttUtil.judgeClientOnline("NJCN-" + nDid.substring(nDid.length() - 6))) {

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -41,9 +41,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private final CsLogsFeignClient csLogsFeignClient;
 
     @Override
-    public void updateStatusBynDid(String nDid,Integer status) {
+    public void updateStatusBynDid(String nDid,Integer status,String engineeringId, String projectId) {
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDid);
+        if (engineeringId != null && !engineeringId.isEmpty()) {
+            lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getAssociatedEngineering,engineeringId);
+        }
+        if (projectId != null && !projectId.isEmpty()) {
+            lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getAssociatedProject,projectId);
+        }
         this.update(lambdaUpdateWrapper);
     }
 

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsLedgerServiceImpl.java

@@ -1,5 +1,7 @@
 package com.njcn.access.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.mapper.CsLedgerMapper;
 import com.njcn.access.service.ICsLedgerService;
@@ -8,8 +10,11 @@ import com.njcn.csdevice.pojo.po.CsLedger;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -43,4 +48,35 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         return csLedger;
     }
 
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public void updatePortableLedger(String engineeringId, String projectId) {
+        //先查询有没有历史的便携式设备
+        List<CsLedger> portableDevices = this.list(
+                new LambdaQueryWrapper<CsLedger>()
+                        .eq(CsLedger::getPid, "0")
+                        .eq(CsLedger::getLevel, 2)
+                        .eq(CsLedger::getState, 1));
+        if (CollectionUtil.isNotEmpty(portableDevices)) {
+            portableDevices.forEach(item->{
+                item.setPid(projectId);
+                item.setPids("0," + engineeringId + "," + projectId);
+            });
+            this.updateBatchById(portableDevices);
+            //获取监测点id
+            List<String> devList = portableDevices.stream().map(CsLedger::getId).collect(Collectors.toList());
+            LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(CsLedger::getPid, devList).eq(CsLedger::getState,1).eq(CsLedger::getLevel,3);
+            List<CsLedger> pointList = this.list(queryWrapper);
+            if (CollectionUtil.isNotEmpty(pointList)) {
+                pointList.forEach(item->{
+                    String pidS = item.getPids();
+                    String devPid = pidS.split(",")[1];
+                    item.setPids("0," + engineeringId + "," + projectId + "," + devPid);
+                });
+                this.updateBatchById(pointList);
+            }
+        }
+    }
+
 }

iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java

@@ -2,7 +2,9 @@ package com.njcn.stat.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.njcn.access.api.CsDeviceFeignClient;
 import com.njcn.access.api.CsLineLatestDataFeignClient;
+import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.pojo.po.CsLineLatestData;
 import com.njcn.access.utils.ChannelObjectUtil;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -57,6 +59,7 @@ public class StatServiceImpl implements IStatService {
     private final RedisUtil redisUtil;
     private final ChannelObjectUtil channelObjectUtil;
     private final CsLineLatestDataFeignClient csLineLatestDataFeignClient;
+    private final CsDeviceFeignClient csDeviceFeignClient;
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
@@ -106,7 +109,6 @@ public class StatServiceImpl implements IStatService {
         //云前置设备
         else if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),code)) {
             lineId = appAutoDataMessage.getId() + appAutoDataMessage.getMsg().getClDid();
-
         }
 
         //获取当前设备信息
@@ -133,7 +135,8 @@ public class StatServiceImpl implements IStatService {
                     default:
                         break;
                 }
-                int clDid = Objects.equals(DicDataEnum.DEV_CLD.getCode(),code)?1:appAutoDataMessage.getMsg().getClDid();
+                boolean flag = Objects.equals(DicDataEnum.DEV_CLD.getCode(), code) && Objects.equals(po.getDevAccessMethod(), "CLD");
+                int clDid = flag?1:appAutoDataMessage.getMsg().getClDid();
                 String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + clDid + dataArrayParam.getStatMethod() + dataArrayParam.getIdx());
                 Object object = redisUtil.getObjectByKey(key);
                 List<CsDataArray> dataArrayList;
@@ -142,10 +145,11 @@ public class StatServiceImpl implements IStatService {
                 } else {
                     dataArrayList = objectToList(object);
                 }
-                List<String> result = assembleData(lineId,dataArrayList,item,appAutoDataMessage.getMsg().getClDid(),dataArrayParam.getStatMethod(),po.getProcess(),code);
+                List<String> result = assembleData(lineId,dataArrayList,item,appAutoDataMessage.getMsg().getClDid(),dataArrayParam.getStatMethod(),po.getProcess(),code,po.getDevAccessMethod());
                 recordList.addAll(result);
                 //获取时间
-                long devTime = Objects.equals(DicDataEnum.DEV_CLD.getCode(),code)?item.getDataTimeSec():item.getDataTimeSec()-8*3600;
+                boolean timeFlag = Objects.equals(DicDataEnum.DEV_CLD.getCode(), code) && Objects.equals(po.getDevAccessMethod(), "CLD");
+                long devTime = timeFlag?item.getDataTimeSec():item.getDataTimeSec()-8*3600;
                 time = Instant.ofEpochSecond(devTime)
                         .atZone(ZoneId.systemDefault())
                         .toLocalDateTime();
@@ -159,7 +163,12 @@ public class StatServiceImpl implements IStatService {
                 csLineLatestData.setTimeId(Objects.isNull(time) ? LocalDateTime.now() : time);
                 csLineLatestDataFeignClient.addData(csLineLatestData);
             }
+            //判断设备运行状态
+            if (!Objects.isNull(po.getRunStatus()) && po.getRunStatus() == 1) {
+                csDeviceFeignClient.updateRunStatus(appAutoDataMessage.getId(), AccessEnum.ONLINE.getCode());
+            }
         }
+        System.gc();
     }
 
     /**
@@ -204,7 +213,7 @@ public class StatServiceImpl implements IStatService {
     /**
      * influxDB数据组装
      */
-    public List<String> assembleData(String lineId,List<CsDataArray> dataArrayList,AppAutoDataMessage.DataArray item,Integer clDid,String statMethod,Integer process,String devType) {
+    public List<String> assembleData(String lineId,List<CsDataArray> dataArrayList,AppAutoDataMessage.DataArray item,Integer clDid,String statMethod,Integer process,String devType,String accessMethod) {
         List<String> records = new ArrayList<String>();
         //解码
         List<Float> floats = PubUtils.byteArrayToFloatList(Base64.getDecoder().decode(item.getData()));
@@ -232,7 +241,8 @@ public class StatServiceImpl implements IStatService {
             fields.put(dataArrayList.get(i).getName(),Objects.equals(floats.get(i),3.14159f) ? null:floats.get(i));
             fields.put(InfluxDBTableConstant.IS_ABNORMAL,item.getDataTag());
             //fixme 这边前置传递的应该是UTC时间,但是前置说是传递的北京时间,讨论了一下没太理解。这边暂时先这样处理,influx入库处理成北京时间,减去8小时。
-            Point point = influxDbUtils.pointBuilder(tableName, Objects.equals(DicDataEnum.DEV_CLD.getCode(),devType)?item.getDataTimeSec():item.getDataTimeSec()-8*3600, TimeUnit.SECONDS, tags, fields);
+            boolean flag = Objects.equals(DicDataEnum.DEV_CLD.getCode(), devType) && Objects.equals(accessMethod, "CLD");
+            Point point = influxDbUtils.pointBuilder(tableName, flag?item.getDataTimeSec():item.getDataTimeSec()-8*3600, TimeUnit.SECONDS, tags, fields);
             BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
             batchPoints.point(point);
             records.add(batchPoints.lineProtocol());

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/constant/ZlConstant.java

@@ -41,6 +41,9 @@ public interface ZlConstant {
      */
     String EVT_PARAM_TM = "Evt_Param_Tm";
 
-
+    /**
+     * 幅值
+     */
+    String EVT_PARAM_VVADEPTH = "Evt_Param_VVaDepth";
 
 }

iot-analysis/analysis-zl-event/zl-event-boot/pom.xml

@@ -94,6 +94,11 @@
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>event-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java

@@ -2,7 +2,9 @@ package com.njcn.zlevent.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
@@ -14,6 +16,8 @@ import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.po.WlRecord;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
+import com.njcn.event.common.mapper.WlRmpEventDetailMapper;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import com.njcn.influx.utils.InfluxDbUtils;
 import com.njcn.mq.message.AppEventMessage;
@@ -27,7 +31,6 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.dto.EpdDTO;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.zlevent.pojo.constant.ZlConstant;
-import com.njcn.zlevent.pojo.po.CsEventLogs;
 import com.njcn.zlevent.service.ICsEventLogsService;
 import com.njcn.zlevent.service.ICsEventService;
 import com.njcn.zlevent.service.IEventService;
@@ -49,6 +52,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 类的介绍：
@@ -72,9 +76,10 @@ public class EventServiceImpl implements IEventService {
     private final ICsEventLogsService csEventLogsService;
     private final SendEventUtils sendEventUtils;
     private final WlRecordFeignClient wlRecordFeignClient;
+    private final WlRmpEventDetailMapper wlRmpEventDetailMapper;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     public void analysis(AppEventMessage appEventMessage) {
         List<CsEventPO> list1 = new ArrayList<>();
         List<String> records = new ArrayList<String>();
@@ -96,12 +101,21 @@ public class EventServiceImpl implements IEventService {
         try {
             if (devModel) {
                 if (Objects.equals(appEventMessage.getDid(),1)){
-                    lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("0").toString();
+                    Object object = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("0");
+                    if (ObjectUtil.isNotNull(object)) {
+                        lineId = object.toString();
+                    }
                 } else if (Objects.equals(appEventMessage.getDid(),2)){
-                    lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get(appEventMessage.getMsg().getClDid().toString()).toString();
+                    Object object = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get(appEventMessage.getMsg().getClDid().toString());
+                    if (ObjectUtil.isNotNull(object)) {
+                        lineId = object.toString();
+                    }
                 }
             } else {
-                lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get(appEventMessage.getMsg().getClDid().toString()).toString();
+                Object object = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get(appEventMessage.getMsg().getClDid().toString());
+                if (ObjectUtil.isNotNull(object)) {
+                    lineId = object.toString();
+                }
             }
 
             //处理事件数据
@@ -111,9 +125,9 @@ public class EventServiceImpl implements IEventService {
                 //判断事件是否存在，如果存在则不处理
                 LambdaQueryWrapper<CsEventPO> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(CsEventPO::getDeviceId,po.getId())
-                        .eq(CsEventPO::getTag,tag)
+                        .eq(CsEventPO::getTag,item.getName())
                         .eq(CsEventPO::getStartTime,eventTime)
-                        .eq(CsEventPO::getLineId,lineId);
+                        .eq(ObjectUtil.isNotNull(lineId),CsEventPO::getLineId,lineId);
                 List<CsEventPO> eventList = csEventService.list(queryWrapper);
                 if (CollectionUtil.isEmpty(eventList)) {
                     id = IdUtil.fastSimpleUUID();
@@ -150,6 +164,12 @@ public class EventServiceImpl implements IEventService {
                             if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_TM)){
                                 csEvent.setPersistTime(Double.parseDouble(param.getData().toString()));
                             }
+                            if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_VVADEPTH)) {
+                                csEvent.setAmplitude(Double.parseDouble(param.getData().toString()));
+                            }
+                            if (Objects.equals(param.getName(),"Evt_Param_Phase")) {
+                                csEvent.setPhase(param.getData().toString());
+                            }
                             fields.put(param.getName(),param.getData());
                         }
                         //只有治理型号的设备有监测位置
@@ -169,20 +189,16 @@ public class EventServiceImpl implements IEventService {
                         records.add(batchPoints.lineProtocol());
                     }
                     list1.add(csEvent);
-                    //事件处理日志库
-                    CsEventLogs csEventLogs = new CsEventLogs();
-                    csEventLogs.setLineId(lineId);
-                    csEventLogs.setDeviceId(po.getId());
-                    csEventLogs.setStartTime(timeFormat(item.getDataTimeSec(),item.getDataTimeUSec()));
-                    csEventLogs.setTag(item.getName());
-                    csEventLogs.setStatus(1);
-                    csEventLogs.setTime(LocalDateTime.now());
-                    csEventLogsService.save(csEventLogs);
                 }
             }
             //cs_event入库
             if (CollectionUtil.isNotEmpty(list1)){
                 csEventService.saveBatch(list1);
+                //同步数据到 r_mp_event_detail 只有暂态事件再同步
+                List<CsEventPO> filterList = list1.stream().filter(csEvent -> Objects.equals(csEvent.getType(), 0)).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(filterList)) {
+                    filterList.forEach(this::insertEvent);
+                }
                 //推送事件逻辑处理 && cs_event_user入库
                 for (AppEventMessage.DataArray item : dataArray) {
                     sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,id,po.getNdid());
@@ -193,18 +209,64 @@ public class EventServiceImpl implements IEventService {
                 influxDbUtils.batchInsert(influxDbUtils.getDbName(), "", InfluxDB.ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, records);
             }
         } catch (Exception e) {
-            CsEventLogs csEventLogs = new CsEventLogs();
-            csEventLogs.setLineId(lineId);
-            csEventLogs.setDeviceId(po.getId());
-            csEventLogs.setStartTime(eventTime);
-            csEventLogs.setTag(tag);
-            csEventLogs.setStatus(0);
-            csEventLogs.setTime(LocalDateTime.now());
-            csEventLogs.setRemark(e.getMessage());
-            csEventLogsService.save(csEventLogs);
+            log.error("事件入库异常：{}",e.getMessage());
         }
     }
 
+    public void insertEvent(CsEventPO item) {
+        RmpEventDetailPO rmpEventDetailPo = new RmpEventDetailPO();
+        rmpEventDetailPo.setEventId(item.getId());
+        rmpEventDetailPo.setMeasurementPointId(item.getLineId());
+        rmpEventDetailPo.setStartTime(item.getStartTime());
+        rmpEventDetailPo.setEventType(getEventType(item.getTag()));
+        rmpEventDetailPo.setFeatureAmplitude(item.getAmplitude());
+        rmpEventDetailPo.setDuration(item.getPersistTime());
+        rmpEventDetailPo.setEventDescribe(getTag(item.getTag()));
+        rmpEventDetailPo.setDealFlag(0);
+        rmpEventDetailPo.setFileFlag(0);
+        rmpEventDetailPo.setPhase(item.getPhase());
+        wlRmpEventDetailMapper.insert(rmpEventDetailPo);
+    }
+
+    public String getEventType(String tag) {
+        switch (tag) {
+            case "Evt_Sys_DipStr":
+                DictData dip = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+                tag = dip.getId();
+                break;
+            case "Evt_Sys_SwlStr":
+                DictData rise = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData();
+                tag = rise.getId();
+                break;
+            case "Evt_Sys_IntrStr":
+                DictData interruptions = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
+                tag = interruptions.getId();
+                break;
+            default:
+                tag = "Un_Know";
+                break;
+        }
+        return tag;
+    }
+
+    public String getTag(String tag) {
+        switch (tag) {
+            case "Evt_Sys_DipStr":
+                tag = DicDataEnum.VOLTAGE_DIP.getCode();
+                break;
+            case "Evt_Sys_SwlStr":
+                tag = DicDataEnum.VOLTAGE_RISE.getCode();
+                break;
+            case "Evt_Sys_IntrStr":
+                tag = DicDataEnum.SHORT_INTERRUPTIONS.getCode();
+                break;
+            default:
+                tag = "Un_Know";
+                break;
+        }
+        return tag;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void getPortableData(AppEventMessage appEventMessage) {

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/FileServiceImpl.java

@@ -31,7 +31,6 @@ import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
-import com.njcn.user.api.UserFeignClient;
 import com.njcn.zlevent.param.CsEventParam;
 import com.njcn.zlevent.pojo.dto.FileInfoDto;
 import com.njcn.zlevent.pojo.dto.FileStreamDto;
@@ -270,7 +269,7 @@ public class FileServiceImpl implements IFileService {
                         + ",nowStep:" + appFileMessage.getMsg().getFrameCurr()
                         + ",userId:" + userIndex
                         +"}";
-                publisher.send("/Web/Progress/" + appFileMessage.getId(), new Gson().toJson(json), 1, false);
+                publisher.send("/Web/Progress/" + appFileMessage.getId(), new Gson().toJson(json), 2, false);
                 if (!Objects.isNull(filePath)){
                     redisUtil.saveByKeyWithExpire("downloadFilePath:" + appFileMessage.getId() + appFileMessage.getMsg().getName(),filePath,60L);
                 }
@@ -280,6 +279,7 @@ public class FileServiceImpl implements IFileService {
             //2.缓存了判断收到的报文个数是否和总个数一致，一致则解析文件；不一致则更新缓存
             //3.超时判断: 30s未收到相关文件信息，核查文件个数，看丢失哪些帧，重新请求
             else {
+                Object isWeb = redisUtil.getObjectByKey("isWeb:" + appFileMessage.getId());
                 redisUtil.saveByKey("handleEvent:" + appFileMessage.getId(),"doing");
                 if (appFileMessage.getMsg().getFrameTotal() == 1){
                     //解析文件入库
@@ -289,14 +289,20 @@ public class FileServiceImpl implements IFileService {
                     csEventLogs.setNowStep(1);
                     csEventLogs.setAllStep(1);
                     csEventLogs.setIsAll(1);
-                    //更新文件信息
-                    csWaveService.updateCsWave(fileName);
-                    //波形文件关联事件
-                    filePath = filePath.replaceAll(GeneralConstant.CFG,"").replaceAll(GeneralConstant.DAT,"");
-                    List<String> eventList = correlateEvents(fileInfoDto,filePath,fileName);
-                    //波形文件解析成图片
-                    if (CollectionUtil.isNotEmpty(eventList) && devModel){
-                        eventList.forEach(wavePicFeignClient::getWavePics);
+                    if (Objects.isNull(isWeb)) {
+                        //更新文件信息
+                        csWaveService.updateCsWave(fileName);
+                        //波形文件关联事件
+                        filePath = filePath.replaceAll(GeneralConstant.CFG,"").replaceAll(GeneralConstant.DAT,"");
+                        List<String> eventList = correlateEvents(fileInfoDto,filePath,fileName);
+                        if (CollectionUtil.isNotEmpty(eventList) && devModel){
+                            eventList.forEach(item -> {
+                                //波形文件解析成图片
+                                wavePicFeignClient.getWavePics(item);
+                                //同步更新r_mp_event_detail，将波形路径录入
+                                wavePicFeignClient.updateEventById(item);
+                            });
+                        }
                     }
                     //解析完删除、处理缓存
                     removeInfoUtils.deleteEventInfo(appFileMessage.getId(),fileName);
@@ -335,14 +341,20 @@ public class FileServiceImpl implements IFileService {
                                 csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
                                 csEventLogs.setIsAll(1);
                                 log.info("当前文件 {} 帧,这是第 {} 帧报文,全部收到,解析成功!", appFileMessage.getMsg().getFrameTotal(), appFileMessage.getMsg().getFrameCurr());
-                                //修改文件信息
-                                csWaveService.updateCsWave(fileName);
-                                //波形文件关联事件
-                                filePath = filePath.replaceAll(GeneralConstant.CFG, "").replaceAll(GeneralConstant.DAT, "");
-                                List<String> eventList = correlateEvents(fileInfoDto, filePath, fileName);
-                                //波形文件解析成图片
-                                if (CollectionUtil.isNotEmpty(eventList) && devModel) {
-                                    eventList.forEach(wavePicFeignClient::getWavePics);
+                                if (Objects.isNull(isWeb)) {
+                                    //修改文件信息
+                                    csWaveService.updateCsWave(fileName);
+                                    //波形文件关联事件
+                                    filePath = filePath.replaceAll(GeneralConstant.CFG, "").replaceAll(GeneralConstant.DAT, "");
+                                    List<String> eventList = correlateEvents(fileInfoDto, filePath, fileName);
+                                    if (CollectionUtil.isNotEmpty(eventList) && devModel){
+                                        eventList.forEach(item -> {
+                                            //波形文件解析成图片
+                                            wavePicFeignClient.getWavePics(item);
+                                            //同步更新r_mp_event_detail，将波形路径录入
+                                            wavePicFeignClient.updateEventById(item);
+                                        });
+                                    }
                                 }
                                 redisUtil.delete(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()));
                                 redisUtil.delete(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()));

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java

@@ -90,7 +90,7 @@ public class SendEventUtils {
                 eventName = epdFeignClient.findByName(eventName).getData().getShowName();
                 switch (type) {
                     case "1":
-                        code = 2;
+                        code = 3;
                         //设备自身事件 不推送给用户，推送给业务管理
                         eventUser = getEventUser(devId,false);
                         if (CollectionUtil.isNotEmpty(eventUser)) {
@@ -108,7 +108,7 @@ public class SendEventUtils {
                                     userList.add(user.getDevCode());
                                 }
                                 noticeUserDto.setPushClientId(userList);
-                                noticeUserDto.setTitle("设备事件");
+                                noticeUserDto.setTitle("运行事件");
                             }
                         }
                         break;
@@ -132,26 +132,26 @@ public class SendEventUtils {
                             }
                         }
                         break;
-                    case "3":
-                        code = 1;
-                        //稳态事件
-                        eventUser = getEventUser(devId,true);
-                        if (CollectionUtil.isNotEmpty(eventUser)) {
-                            eventUser.forEach(item->{
-                                CsEventUserPO csEventUser = new CsEventUserPO();
-                                csEventUser.setUserId(item);
-                                csEventUser.setStatus(0);
-                                csEventUser.setEventId(id);
-                                result.add(csEventUser);
-                            });
-                            users = getSendUser(eventUser,1);
-                            if (CollectionUtil.isNotEmpty(users)){
-                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
-                                noticeUserDto.setPushClientId(devCodeList);
-                                noticeUserDto.setTitle("稳态事件");
-                            }
-                        }
-                        break;
+//                    case "3":
+//                        code = 1;
+//                        //稳态事件
+//                        eventUser = getEventUser(devId,true);
+//                        if (CollectionUtil.isNotEmpty(eventUser)) {
+//                            eventUser.forEach(item->{
+//                                CsEventUserPO csEventUser = new CsEventUserPO();
+//                                csEventUser.setUserId(item);
+//                                csEventUser.setStatus(0);
+//                                csEventUser.setEventId(id);
+//                                result.add(csEventUser);
+//                            });
+//                            users = getSendUser(eventUser,1);
+//                            if (CollectionUtil.isNotEmpty(users)){
+//                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+//                                noticeUserDto.setPushClientId(devCodeList);
+//                                noticeUserDto.setTitle("稳态事件");
+//                            }
+//                        }
+//                        break;
                     default:
                         code = 0;
                         break;
@@ -161,62 +161,62 @@ public class SendEventUtils {
                 content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName;
                 noticeUserDto.setContent(content);
                 payload.setType(code);
-                payload.setPath("/pages/message/message?type="+payload.getType());
-                noticeUserDto.setPayload(payload);
-            }
-            //告警处理
-            else if (eventType == 2){
-                switch (type) {
-                    case "1":
-                        //Ⅰ级告警 不推送给用户，推送给业务管理
-                        eventUser = getEventUser(devId,false);
-                        if (CollectionUtil.isNotEmpty(eventUser)) {
-                            eventUser.forEach(item->{
-                                CsEventUserPO csEventUser = new CsEventUserPO();
-                                csEventUser.setUserId(item);
-                                csEventUser.setStatus(0);
-                                csEventUser.setEventId(id);
-                                result.add(csEventUser);
-                            });
-                            users = getSendUser(eventUser,3);
-                            if (CollectionUtil.isNotEmpty(users)){
-                                eventName = epdFeignClient.findByName(eventName).getData().getShowName();
-                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
-                                noticeUserDto.setPushClientId(devCodeList);
-                            }
-                        }
-                        break;
-                    case "2":
-                        eventName = epdFeignClient.findByName(eventName).getData().getShowName();
-                    case "3":
-                        //Ⅱ、Ⅲ级告警推送相关用户及业务管理员
-                        eventUser = getEventUser(devId,true);
-                        if (CollectionUtil.isNotEmpty(eventUser)) {
-                            eventUser.forEach(item->{
-                                CsEventUserPO csEventUser = new CsEventUserPO();
-                                csEventUser.setUserId(item);
-                                csEventUser.setStatus(0);
-                                csEventUser.setEventId(id);
-                                result.add(csEventUser);
-                            });
-                            users = getSendUser(eventUser,3);
-                            if (CollectionUtil.isNotEmpty(users)){
-                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
-                                noticeUserDto.setPushClientId(devCodeList);
-                            }
-                        }
-                        break;
-                    default:
-                        break;
-                }
-                noticeUserDto.setTitle("告警事件");
-                DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
-                content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警信息:" + eventName;
-                noticeUserDto.setContent(content);
-                payload.setType(3);
-                payload.setPath("/pages/message/message?type="+payload.getType());
+                payload.setPath("/pages/index/message1?type="+payload.getType());
                 noticeUserDto.setPayload(payload);
             }
+//            //告警处理
+//            else if (eventType == 2){
+//                switch (type) {
+//                    case "1":
+//                        //Ⅰ级告警 不推送给用户，推送给业务管理
+//                        eventUser = getEventUser(devId,false);
+//                        if (CollectionUtil.isNotEmpty(eventUser)) {
+//                            eventUser.forEach(item->{
+//                                CsEventUserPO csEventUser = new CsEventUserPO();
+//                                csEventUser.setUserId(item);
+//                                csEventUser.setStatus(0);
+//                                csEventUser.setEventId(id);
+//                                result.add(csEventUser);
+//                            });
+//                            users = getSendUser(eventUser,3);
+//                            if (CollectionUtil.isNotEmpty(users)){
+//                                eventName = epdFeignClient.findByName(eventName).getData().getShowName();
+//                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+//                                noticeUserDto.setPushClientId(devCodeList);
+//                            }
+//                        }
+//                        break;
+//                    case "2":
+//                        eventName = epdFeignClient.findByName(eventName).getData().getShowName();
+//                    case "3":
+//                        //Ⅱ、Ⅲ级告警推送相关用户及业务管理员
+//                        eventUser = getEventUser(devId,true);
+//                        if (CollectionUtil.isNotEmpty(eventUser)) {
+//                            eventUser.forEach(item->{
+//                                CsEventUserPO csEventUser = new CsEventUserPO();
+//                                csEventUser.setUserId(item);
+//                                csEventUser.setStatus(0);
+//                                csEventUser.setEventId(id);
+//                                result.add(csEventUser);
+//                            });
+//                            users = getSendUser(eventUser,3);
+//                            if (CollectionUtil.isNotEmpty(users)){
+//                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+//                                noticeUserDto.setPushClientId(devCodeList);
+//                            }
+//                        }
+//                        break;
+//                    default:
+//                        break;
+//                }
+//                noticeUserDto.setTitle("告警事件");
+//                DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
+//                content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警信息:" + eventName;
+//                noticeUserDto.setContent(content);
+//                payload.setType(3);
+//                payload.setPath("/pages/message/message?type="+payload.getType());
+//                noticeUserDto.setPayload(payload);
+//            }
             if (CollectionUtil.isNotEmpty(noticeUserDto.getPushClientId())) {
                 List<String> filteredList = noticeUserDto.getPushClientId().stream()
                         .filter(Objects::nonNull)
@@ -260,6 +260,9 @@ public class SendEventUtils {
             List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
             adminList.addAll(list);
         }
+        if (CollectionUtil.isNotEmpty(adminList)) {
+            adminList = adminList.stream().distinct().collect(Collectors.toList());
+        }
         return adminList;
     }
 

iot-message/message-boot/src/main/java/com/njcn/message/consumer/CldDevRunFlagConsumer.java

@@ -49,7 +49,7 @@ public class CldDevRunFlagConsumer extends EnhanceConsumerMessageHandler<CldDevi
     protected void handleMessage(CldDeviceRunFlagMessage cldDeviceRunFlagMessage) {
         log.info("分发至翻转设备状态");
         int status = Objects.equals(cldDeviceRunFlagMessage.getStatus(),"0") ? 1 : 2;
-        equipmentFeignClient.flipCldDevStatus(cldDeviceRunFlagMessage.getId(), status);
+        equipmentFeignClient.flipCldDevStatus(cldDeviceRunFlagMessage.getDate(),cldDeviceRunFlagMessage.getId(), status);
     }