From 9d91dc402f279630eaa100024fd3b1542fbeb41c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 11:04:41 +0800
Subject: [PATCH] 分钟，5分钟，小时表存入非本月数据bug修复

---
 screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 41aad0c..74d010f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -75,9 +75,6 @@
     private GovMonitorPointMapper govMonitorPointMapper;
 
     @Autowired
-    private LogUtils logUtils;
-
-    @Autowired
     private AdjustDataUtils adjustDataUtils;
 
     /*
@@ -289,7 +286,7 @@
             HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
             StringBuilder content = new StringBuilder();
             content.append("������������������������������������").append(insertSpecialDeviceHistory.getName()).append(":").append("mac���").append(insertSpecialDeviceHistory.getMac());
-            logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+            LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
         }else {
             /*UpdateWrapper<SpecialDeviceHistory> wrapper_insertSpecialDeviceHistory = new UpdateWrapper<>();
             wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
@@ -324,7 +321,7 @@
                 }
 
             }
-            logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+            LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
         }
         //Map<String, Object> deviceInfo = selectDeviceInfoById(specialDevice.getId());
         SpecialDeviceInfoDTO specialDeviceInfoDTO = selectDeviceInfoDTOById(specialDevice.getId());
@@ -342,7 +339,7 @@
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
         content.append("������������������������").append(specialDevice.getName()).append(":").append("mac���").append(mac);
-        logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
         resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
         resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
         return resultMap;
@@ -378,7 +375,7 @@
         wrapper_specialDeviceHistory.eq("organization_id",updateSpecialDevice.getOrganizationId());
         SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory);
         SpecialDeviceHistory updateSpecialDeviceHistory = new SpecialDeviceHistory();
-        BeanUtils.copyProperties(updateSpecialDevice,updateSpecialDeviceHistory);
+        BeanUtils.copyProperties(specialDevice,updateSpecialDeviceHistory);
         updateSpecialDeviceHistory.setCreateTime(null);
         updateSpecialDeviceHistory.setUpdateTime(null);
         updateSpecialDeviceHistory.setIsDelete(null);
@@ -388,7 +385,7 @@
             HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
             StringBuilder content = new StringBuilder();
             content.append("������������������������������������").append(updateSpecialDeviceHistory.getName()).append(":").append("mac���").append(updateSpecialDeviceHistory.getMac());
-            logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+            LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
         }else {
             /*UpdateWrapper<SpecialDeviceHistory> wrapper_insertSpecialDeviceHistory = new UpdateWrapper<>();
             wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
@@ -398,7 +395,7 @@
             //������������������
             HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
             StringBuilder content = new StringBuilder();
-            content.append("������������������������").append(specialDeviceHistory.getId()).append("���");
+            content.append("������������������������������").append(specialDeviceHistory.getId()).append(";");
             Field[] fields = SpecialDevice.class.getDeclaredFields();
             for (Field field : fields) {
                 if (field.getName().equals("id")) {
@@ -415,7 +412,7 @@
                     Object o1 = method.invoke(specialDeviceHistory);
                     Object o2 = method.invoke(updateSpecialDeviceHistory);
                     if (o2 != null) {
-                        content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
+                        content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(";");
                     }
 
                 } catch (Exception e) {
@@ -423,12 +420,12 @@
                 }
 
             }
-            logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+            LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
         }
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
-        content.append("������������������������").append(specialDeviceId).append("���");
+        content.append("������������������������").append(specialDeviceId).append(";");
         Field[] fields = SpecialDevice.class.getDeclaredFields();
         for (Field field : fields) {
             if (field.getName().equals("id")) {
@@ -445,7 +442,7 @@
                 Object o1 = method.invoke(oldSpecialDevice);
                 Object o2 = method.invoke(specialDevice);
                 if (o2 != null) {
-                    content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
+                    content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(";");
                 }
 
             } catch (Exception e) {
@@ -453,7 +450,7 @@
             }
 
         }
-        logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
     }
 
     @Override
@@ -475,7 +472,7 @@
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
         content.append("������������������").append(specialDevice.getName()).append(";").append("mac���").append(mac);
-        logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
     }
 
     @Override

--
Gitblit v1.8.0