opc增加量程信息

platform-dao/src/main/java/com/platform/dao/dto/remote/RemoteOpcLogDTO.java

@@ -128,5 +128,11 @@ public class RemoteOpcLogDTO extends BaseDTO implements Serializable {
      * 对应设备所属线路，用于分组统计
      */
     @Transient
-    private Integer line;
+    private String line;
+
+    /**
+     * 1: 5分钟，2:10分钟，3:15分钟，4:30分钟
+     */
+    @Transient
+    private Integer searchType;
 }

platform-dao/src/main/java/com/platform/dao/vo/query/remote/RemoteOpcLogVO.java

@@ -105,8 +105,8 @@ public class RemoteOpcLogVO extends BaseVO implements Serializable {
      */
     private LocalDateTime updateTime;
     /**
-     * 对应设备所属线路，用于分组统计
+     * 对应设备所属车间，用于分组统计
      */
-    private Integer line;
+    private String line;
 
 }

platform-dao/src/main/resources/mapper/remote/RemoteOpcLogMapper.xml

@@ -96,7 +96,7 @@
             and opc_log.update_user_id = #{updateUserId}
         </if>
         <if test="createdTimeStart != null">
-            and opc_log.created_time <![CDATA[>=]]>; #{createdTimeStart}
+            and opc_log.created_time <![CDATA[>=]]> #{createdTimeStart}
         </if>
         <if test="createdTimeEnd != null">
             and opc_log.created_time <![CDATA[<=]]> #{createdTimeEnd}
@@ -105,7 +105,7 @@
             and opc_log.created_time = #{createdTime}
         </if>
         <if test="updateTimeStart != null">
-            and opc_log.update_time <![CDATA[>=]]>; #{updateTimeStart}
+            and opc_log.update_time <![CDATA[>=]]> #{updateTimeStart}
         </if>
         <if test="updateTimeEnd != null">
             and opc_log.update_time <![CDATA[<=]]> #{updateTimeEnd}

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

@@ -121,7 +121,7 @@ public class RemoteOpcLogController {
      */
     @GetMapping("")
     public R query(RemoteOpcLogDTO RemoteOpcLogDTO) {
-        return new R<>(remoteOpcLogService.getModelListByDTO(RemoteOpcLogDTO));
+        return new R<>(remoteOpcLogService.selectList(RemoteOpcLogDTO));
     }
 
     /**

platform-service/src/main/java/com/platform/service/big/impl/BigScreenSbInfoServiceImpl.java

@@ -322,13 +322,13 @@ public class BigScreenSbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, Sb
                                     if(i == days){// 从下个月第一天找
                                         Optional<RemoteDegreeLogVO> lastR = lastList.stream().filter(item -> item.getPositionNum().equals(degreeLog.getPositionNum())).findFirst();
                                         if(lastR.isPresent()){
-                                            log.info("1: " + degreeLog.getDay() + "," + degreeLog.getDay() + ","+ degreeLog.getDay() + ","+ lastR.get().getDay());
+                                            //log.info("1: " + degreeLog.getDay() + "," + degreeLog.getDay() + ","+ degreeLog.getDay() + ","+ lastR.get().getDay());
                                             positiveTotal = positiveTotal.subtract(new BigDecimal(lastR.get().getResult()));
                                         }
                                     }else{// 从后天时间找,减去昨天的数据
                                         Optional<RemoteDegreeLogVO> lastR = list.stream().filter(item -> item.getPositionNum().equals(degreeLog.getPositionNum()) && item.getDay().equals(degreeLog.getDay()+1)).findFirst();
                                         if(lastR.isPresent()){
-                                            log.info("2: " + degreeLog.getDay() + "," + lastR.get().getDay());
+                                            //log.info("2: " + degreeLog.getDay() + "," + lastR.get().getDay());
                                             positiveTotal = new BigDecimal(lastR.get().getResult()).subtract(positiveTotal);
                                         }
                                     }

platform-service/src/main/java/com/platform/service/remote/RemoteOpcLogService.java

@@ -33,5 +33,10 @@ public interface RemoteOpcLogService extends IBaseService<RemoteOpcLog, RemoteOp
      */
     AbstractPageResultBean<RemoteOpcLogVO> selectPageList(RemoteOpcLogDTO record, int pageNum, int pageSize);
 
-
+    /**
+     * 分页查询
+     * @param record
+     * @return
+     */
+    List<RemoteOpcLogVO> selectList(RemoteOpcLogDTO record);
 }

platform-service/src/main/java/com/platform/service/remote/impl/RemoteOpcLogServiceImpl.java

@@ -47,6 +47,31 @@ public class RemoteOpcLogServiceImpl extends BaseServiceImpl<RemoteOpcLogMapper,
         return new MyPage(mapper.selectList(record));
     }
 
+    @Override
+    public List<RemoteOpcLogVO> selectList(RemoteOpcLogDTO record) {
+        if (record.getSearchType() != null && record.getCreatedTimeEnd() != null) {
+            LocalDateTime createdTimeEnd = record.getCreatedTimeEnd();
+            if (record.getSearchType() == 1) {// 10分钟
+                LocalDateTime createdTimeStart = createdTimeEnd.plusMinutes(-10);
+                record.setCreatedTimeStart(createdTimeStart);
+            } else if (record.getSearchType() == 2) {// 20分钟
+                LocalDateTime createdTimeStart = createdTimeEnd.plusMinutes(-20);
+                record.setCreatedTimeStart(createdTimeStart);
+            } else if (record.getSearchType() == 3) {// 30分钟
+                LocalDateTime createdTimeStart = createdTimeEnd.plusMinutes(-30);
+                record.setCreatedTimeStart(createdTimeStart);
+            } else if (record.getSearchType() == 4) {// 60分钟
+                LocalDateTime createdTimeStart = createdTimeEnd.plusMinutes(-60);
+                record.setCreatedTimeStart(createdTimeStart);
+            } else {// 10分钟 默认
+                LocalDateTime createdTimeStart = createdTimeEnd.plusMinutes(-10);
+                record.setCreatedTimeStart(createdTimeStart);
+            }
+
+        }
+        return mapper.selectList(record);
+    }
+
     @Override
     public AbstractPageResultBean<RemoteOpcLog> selectPageInfo(RemoteOpcLogDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);