Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志记录调整

Browse Source
This commit is contained in:
xuyang
2023-08-28 16:28:52 +08:00
parent 1d378e0c03
commit 7384af08db
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()){

4
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -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)){

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

@@ -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 {
//获取版本