From 7384af08db793cc5256f9b0b52b17270f4eaa2c4 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 28 Aug 2023 16:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/access/handler/MqttMessageHandler.java | 10 +++++----- .../access/service/impl/CsDevModelServiceImpl.java | 4 ++-- .../njcn/access/service/impl/CsDeviceServiceImpl.java | 11 +++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java index 057a270..013f32d 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java @@ -89,7 +89,7 @@ public class MqttMessageHandler { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("装置主题录入"); + logDto.setOperate(nDid + "设备主题录入"); logDto.setResult(1); //业务流程开始 Gson gson = new Gson(); @@ -147,7 +147,7 @@ public class MqttMessageHandler { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("收到设备注册应答响应"); + logDto.setOperate("收到设备"+nDid+"注册应答响应"); logDto.setResult(1); //业务处理 Gson gson = new Gson(); @@ -196,7 +196,7 @@ public class MqttMessageHandler { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("装置类型模板应答"); + logDto.setOperate(nDid + "设备类型模板应答"); logDto.setResult(1); //业务处理 Gson gson = new Gson(); @@ -279,7 +279,7 @@ public class MqttMessageHandler { ReqAndResDto.Res res = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), ReqAndResDto.Res.class); switch (res.getType()){ case 4613: - logDto.setOperate("设备接入"); + logDto.setOperate(nDid + "设备接入"); log.info("收到接入应答响应--->" + nDid); if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){ log.info("接入应答成功--->" + nDid); @@ -294,7 +294,7 @@ public class MqttMessageHandler { } break; case 4614: - logDto.setOperate("设备数据应答"); + logDto.setOperate(nDid + "设备数据应答"); log.info("设备数据应答--->" + nDid); RspDataDto rspDataDto = JSON.parseObject(JSON.toJSONString(res.getMsg()), RspDataDto.class); switch (rspDataDto.getDataType()){ diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java index 9d32921..3d0d3bf 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java @@ -114,13 +114,13 @@ public class CsDevModelServiceImpl implements ICsDevModelService { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("录入通用字典"); logDto.setResult(1); String json = null; try { json = JsonUtil.convertStreamToString(file.getInputStream()); Gson gson = new Gson(); TemplateDto templateDto = gson.fromJson(json, TemplateDto.class); + logDto.setOperate(templateDto.getDevType() + "录入通用字典"); analysisDict(templateDto); csLogsFeignClient.addUserLog(logDto); } catch (Exception e) { @@ -140,7 +140,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("新增cs_dev_model数据"); + logDto.setOperate("新增"+templateDto.getDevType()+"模板数据"); logDto.setResult(1); CsDevModelPO po = devModelFeignClient.findModel(templateDto.getDevType(),templateDto.getVersion(),templateDto.getTime()).getData(); if (!Objects.isNull(po)){ diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index d432847..e933775 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -21,14 +21,13 @@ import com.njcn.access.utils.MqttUtil; import com.njcn.common.pojo.dto.DeviceLogDTO; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.utils.PubUtils; -import com.njcn.csdevice.api.*; +import com.njcn.csdevice.api.CsLogsFeignClient; +import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm; import com.njcn.csdevice.pojo.param.CsLedgerParam; import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO; import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import com.njcn.csdevice.pojo.po.CsLinePO; -import com.njcn.csdevice.pojo.po.CsLogsPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.redis.pojo.enums.AppRedisKey; import com.njcn.redis.utils.RedisUtil; @@ -102,7 +101,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("直连设备状态判断"); + logDto.setOperate("当前设备"+nDid+"状态判断"); logDto.setResult(1); //1.判断nDid是否存在 CsEquipmentDeliveryVO csEquipmentDeliveryVO = equipmentFeignClient.queryEquipmentByndid(nDid).getData(); @@ -160,7 +159,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("获取直连设备模板信息"); + logDto.setOperate("获取"+nDid+"设备模板信息"); logDto.setResult(1); Object model = null; try { @@ -188,7 +187,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { logDto.setUserIndex(RequestUtil.getUserIndex()); logDto.setUserName(RequestUtil.getUsername()); logDto.setLoginName(RequestUtil.getLoginName()); - logDto.setOperate("直连设备注册"); + logDto.setOperate("设备"+devAccessParam.getNDid()+"注册"); logDto.setResult(1); try { //获取版本