소스 검색

:bug: 设备报警提醒时间差

Ritchie 1 년 전
부모
커밋
f9af3a02db
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 0 1
      src/main/java/com/szwl/controller/DemoController.java
  2. 5 3
      src/main/java/com/szwl/controller/TEquipmentController.java

+ 0 - 1
src/main/java/com/szwl/controller/DemoController.java

@@ -20,7 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
 import java.util.List;

+ 5 - 3
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -146,7 +146,7 @@ public class TEquipmentController {
     @PostMapping("/findList")
     @PostMapping("/findList")
     public ResponseModel<IPage<?>> findList(Long id, String clientId, String adminName, String equipmentName,
     public ResponseModel<IPage<?>> findList(Long id, String clientId, String adminName, String equipmentName,
                                             String areaName, String eqeStatus, String machineType, String equimentType,
                                             String areaName, String eqeStatus, String machineType, String equimentType,
-                                            String channel, String companyType, String labelId, String todayDate, long current, long size) {
+                                            String channel, String companyType, String labelId, String todayDate, Long current, Long size) {
 
 
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         TAdmin admin = tAdminService.getById(id);
         TAdmin admin = tAdminService.getById(id);
@@ -273,8 +273,10 @@ public class TEquipmentController {
             LambdaQueryWrapper<TAlarmRecord> query1 = Wrappers.lambdaQuery();
             LambdaQueryWrapper<TAlarmRecord> query1 = Wrappers.lambdaQuery();
             query1.eq(TAlarmRecord::getEquipmentId, equipmentDTO.getId());
             query1.eq(TAlarmRecord::getEquipmentId, equipmentDTO.getId());
             query1.eq(TAlarmRecord::getIsEliminate, 0);
             query1.eq(TAlarmRecord::getIsEliminate, 0);
-            query1.gt(TAlarmRecord::getOccurrenceTime, date_start);
-            query1.le(TAlarmRecord::getOccurrenceTime, date_end);
+//            query1.gt(TAlarmRecord::getOccurrenceTime, date_start);
+//            query1.le(TAlarmRecord::getOccurrenceTime, date_end);
+            query1.gt(TAlarmRecord::getCreateDate, date_start);
+            query1.le(TAlarmRecord::getCreateDate, date_end);
             List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
             List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
             if (alarmRecordList.size() > 0) {
             if (alarmRecordList.size() > 0) {
                 equipmentDTO.setHasTodayAlarm(true);
                 equipmentDTO.setHasTodayAlarm(true);