opc完善

platform-dao/src/main/resources/application-daoProd.yml

@@ -3,7 +3,7 @@ spring:
     druid:
       master:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://localhost:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true&removeAbandoned=true&removeAbandonedTimeout=60&logAbandoned=true
+        url: jdbc:mysql://192.168.16.222:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true&removeAbandoned=true&removeAbandonedTimeout=60&logAbandoned=true
         username: root
         password: mydm888
         filters: wall,stat

platform-dao/src/main/resources/application-daoTest.yml

@@ -3,7 +3,7 @@ spring:
     druid:
       master:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://localhost:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true&removeAbandoned=true&removeAbandonedTimeout=60&logAbandoned=true
+        url: jdbc:mysql://192.168.16.222:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true&removeAbandoned=true&removeAbandonedTimeout=60&logAbandoned=true
         username: root
         # password: mysql?123!@MYSQL
         password: mydm888

platform-opc/src/main/java/com/platform/opc/servie/OpcTaskService.java

@@ -83,9 +83,9 @@ public class OpcTaskService {
             // 查询当天是否已经存在了，存在则追加，否则则更新
             Weekend<RemoteOpcLog> weekend = new Weekend<>(RemoteOpcLog.class);
             WeekendCriteria<RemoteOpcLog, Object> weekendCriteria = weekend.weekendCriteria();
-            OpcResult log = resultList.get(0);
-            LocalDateTime time = DateUtils.strToLocalDateTime(log.getTime(), DateUtils.PATTERN_YMD_HMS);
-            weekendCriteria.andEqualTo(RemoteOpcLog::getPositionNum, log.getId());
+            OpcResult opcResult = resultList.get(0);
+            LocalDateTime time = DateUtils.strToLocalDateTime(opcResult.getTime(), DateUtils.PATTERN_YMD_HMS);
+            weekendCriteria.andEqualTo(RemoteOpcLog::getPositionNum, opcResult.getId());
             weekendCriteria.andEqualTo(RemoteOpcLog::getYear, time.getYear());
             weekendCriteria.andEqualTo(RemoteOpcLog::getMonth, time.getMonthValue());
             weekendCriteria.andEqualTo(RemoteOpcLog::getDay, time.getDayOfMonth());
@@ -108,6 +108,7 @@ public class OpcTaskService {
             }
 
             // TODO:判断remoteOpcLogList是否大于5000，大于5000，就分多次存入
+            log.info("count：" + count);
             if (count > 0) {
                 remoteOpcLogMapper.updateBatch(remoteOpcLogList);
             } else {

platform-rest/src/main/java/com/platform/rest/controller/remote/RemoteOpcLogController.java

@@ -71,7 +71,6 @@ public class RemoteOpcLogController {
         return new R<>();
     }
 
-
     /**
      * 通过id删除一条记录
      *