From 92dac89fb1ff9ae8078bb4c0d5e3b5c8e6351ebb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 04 三月 2023 13:31:11 +0800
Subject: [PATCH] 油烟优化

---
 ycl-smoke/pom.xml                                                                |   86 ++++++++++++++++
 ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java                    |  103 +++++++++++++++-----
 ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java |   40 +++----
 ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java            |    4 
 ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java      |   16 +-
 ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsDetectorDaily.java               |    4 
 6 files changed, 190 insertions(+), 63 deletions(-)

diff --git a/ycl-smoke/pom.xml b/ycl-smoke/pom.xml
index 1ac7708..d4636e8 100644
--- a/ycl-smoke/pom.xml
+++ b/ycl-smoke/pom.xml
@@ -38,14 +38,96 @@
         </dependency>
     </dependencies>
 
+    <!--    <build>-->
+    <!--        <finalName>ycl-smoke</finalName>-->
+    <!--        <plugins>-->
+    <!--            <plugin>-->
+    <!--                <groupId>org.springframework.boot</groupId>-->
+    <!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+    <!--            </plugin>-->
+    <!--        </plugins>-->
+    <!--    </build>-->
+
     <build>
-        <finalName>ycl-smoke</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- 濡傛灉瑕佹妸渚濊禆涓�璧锋墦鍖�,娉ㄩ噴涓嬮潰configuration -->
+                <configuration>
+                    <layout>ZIP</layout>
+                    <includes>
+                        <!--灏嗕緷璧栧墧闄�,鍙紪璇戞墦鍖呮湰椤圭洰-->
+                        <include>
+                            <groupId>nothing</groupId>
+                            <artifactId>nothing</artifactId>
+                        </include>
+                    </includes>
+                </configuration>
+            </plugin>
+
+
+            <!-- 璺宠繃Test娴嬭瘯鎵撳寘 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                </configuration>
+                <!--鎵цpackage鏃惰嚜鍔ㄥ皢渚濊禆澶嶅埗鍑烘潵鍒�/lib涓�-->
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.20</version>
+                        </path>
+                    </annotationProcessorPaths>
+
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            lombok.launch.AnnotationProcessorHider$AnnotationProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <!--                            <mainClass>your.class</mainClass>-->
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java b/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
index 3939151..f3099e5 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
@@ -28,45 +28,45 @@
     private RedisService redisService;
 
     @PostMapping(value = "/listAlarmMsg")
-    public SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto params) {
+    public String getListAlarmMsg(@RequestBody AlarmMsgParamDto params) {
 
         return smokeDetectionService.getListAlarmMsg(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
     @PostMapping(value = "/queryDataDetectorDaily2")
-    public SmokeResultResponseDto<DetectorDailyResponseDto> queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto params) {
+    public String queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto params) {
 
         return smokeDetectionService.queryDataDetectorDaily2(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
     @PostMapping(value = "/queryTenMinData")
-    public SmokeResultResponseDto<List<OdsTenMinData>> queryTenMinData(@RequestBody TenMinParamDto params) {
+    public String queryTenMinData(@RequestBody TenMinParamDto params) {
         return smokeDetectionService.queryTenMinData(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
     @PostMapping(value = "/listDataIntime")
-    public SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto params) {
+    public String listDataIntime(@RequestBody DataIntimeParamDto params) {
         return smokeDetectionService.listDataIntime(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
     @PostMapping(value = "/listLocale")
-    public SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto params) {
+    public String listLocale(@RequestBody LocaleParamDto params) {
         return smokeDetectionService.listLocale(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
     @PostMapping(value = "/queryCustomer")
-    public SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto params) {
+    public String queryCustomer(@RequestBody CustomerParamDto params) {
         return smokeDetectionService.queryCustomer(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
 
     @PostMapping(value = "/listAlarmRecord")
-    public SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto params) {
+    public String getListAlarmRecord(@RequestBody AlarmMsgParamDto params) {
         return smokeDetectionService.getListAlarmRecord(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
     @PostMapping(value = "/listCurAlarm")
-    public SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto params) {
+    public String getListCurAlarm(@RequestBody CurAlarmParamDto params) {
         return smokeDetectionService.getListCurAlarm(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
     }
 
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java
index 005449e..e846fe2 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java
@@ -6,7 +6,7 @@
 
 @Data
 @NoArgsConstructor
-public class SmokeResultResponseDto<T> {
+public class SmokeResultResponseDto {
     @JsonProperty("Msg")
     private String msg;
     /**
@@ -16,5 +16,5 @@
     private Integer status;
 
     @JsonProperty("Data")
-    private T data;
+    private Object data;
 }
\ No newline at end of file
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsDetectorDaily.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsDetectorDaily.java
index 48f1dac..6a38c27 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsDetectorDaily.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsDetectorDaily.java
@@ -60,7 +60,7 @@
      */
     @TableField("acquit_date")
     @JsonProperty("AcquitDate")
-    private LocalDate acquitDate;
+    private String acquitDate;
 
     /**
      * 鍒涘缓鏃ユ湡
@@ -270,7 +270,7 @@
      */
     @TableField("abnormal_off_line")
     @JsonProperty("AbnormalOffline")
-    private BigDecimal abnormalOffLine;
+    private Boolean abnormalOffLine;
 
 
 }
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
index 4b893a0..860a2de 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
@@ -14,43 +14,41 @@
 public interface ISmokeDetectionService {
 
     @PostMapping(value = "/loginAction")
-    SmokeResultResponseDto<LoginResponseDto> loginAction(@RequestBody LoginParamDto paramDto);
+    String loginAction(@RequestBody LoginParamDto paramDto);
 
 
     @PostMapping(value = "/admin/listAlarmMsg")
-    SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto paramDto,
-                                                                @RequestHeader("Auth") String token);
+    String getListAlarmMsg(@RequestBody AlarmMsgParamDto paramDto,
+                           @RequestHeader("Auth") String token);
 
     @PostMapping(value = "/admin/queryDataDetectorDaily2")
-    SmokeResultResponseDto<DetectorDailyResponseDto> queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto paramDto,
-                                                                             @RequestHeader("Auth") String token);
+    String queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto paramDto,
+                                   @RequestHeader("Auth") String token);
 
     @PostMapping(value = "/admin/queryTenMinData")
-    SmokeResultResponseDto<List<OdsTenMinData>> queryTenMinData(@RequestBody TenMinParamDto paramDto,
-                                                                @RequestHeader("Auth") String token);
+    String queryTenMinData(@RequestBody TenMinParamDto paramDto,
+                           @RequestHeader("Auth") String token);
 
     @PostMapping(value = "/admin/listDataIntime")
-    SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
-                                                                             @RequestHeader("Auth") String token);
+    String listDataIntime(@RequestBody DataIntimeParamDto paramDto,
+                          @RequestHeader("Auth") String token);
 
-   @PostMapping(value = "/admin/listLocale")
-   SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
-                                                                            @RequestHeader("Auth") String token);
+    @PostMapping(value = "/admin/listLocale")
+    String listLocale(@RequestBody LocaleParamDto paramDto,
+                      @RequestHeader("Auth") String token);
 
-   @PostMapping(value = "/admin/queryCustomer")
-   SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
-                                                                            @RequestHeader("Auth") String token);
-
+    @PostMapping(value = "/admin/queryCustomer")
+    String queryCustomer(@RequestBody CustomerParamDto paramDto,
+                         @RequestHeader("Auth") String token);
 
 
     @PostMapping(value = "/admin/listAlarmRecord")
-    SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
-                                                                @RequestHeader("Auth") String token);
-
+    String getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
+                              @RequestHeader("Auth") String token);
 
 
     @PostMapping(value = "/admin/listCurAlarm")
-    SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto paramDto,
-                                                                @RequestHeader("Auth") String token);
+    String getListCurAlarm(@RequestBody CurAlarmParamDto paramDto,
+                           @RequestHeader("Auth") String token);
 
 }
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
index b0f0276..3f0f48c 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
@@ -12,6 +12,10 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -20,6 +24,8 @@
     ISmokeDetectionService smokeDetectionService;
 
     IOdsAlarmMsgService alarmMsgService;
+
+    IOdsDetectorDailyService detectorDailyService;
 
     IOdsTenMinDataService tenMinDataService;
 
@@ -76,59 +82,75 @@
         this.curAlarmService = curAlarmService;
     }
 
+    @Autowired
+    public void setDetectorDailyService(IOdsDetectorDailyService detectorDailyService) {
+        this.detectorDailyService = detectorDailyService;
+    }
+
     @Scheduled(cron = "0 0 1 * * ?")   // 姣忓ぉ闆剁偣鎵ц
     // @Scheduled(cron = "0/1 * * * * ?")   // 姣忕鎵ц
     public void alarmMsgTask() {
         try {
             AlarmMsgParamDto paramDto = AlarmMsgParamDto.builder().StartAt(0).Size(100).build();
+            String json = smokeDetectionService.getListAlarmMsg(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
 
-            SmokeResultResponseDto<AlarmMsgResponseDto> responseDto = smokeDetectionService.getListAlarmMsg(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
             if (responseDto.getStatus() == 200) {
-                AlarmMsgResponseDto dto = responseDto.getData();
+                AlarmMsgResponseDto dto = JSON.parseObject(responseDto.getData().toString(), AlarmMsgResponseDto.class);
                 List<OdsAlarmMsg> list = dto.getContent();
                 System.out.println(list.size());
                 list.forEach(o -> {
                     try {
                         alarmMsgService.save(o);
                     } catch (Exception ex) {
-
+                        System.out.printf(ex.getMessage());
                     }
                 });
                 // alarmMsgService.saveBatch(list);
             } else if (responseDto.getStatus() == 114) {
                 login();
                 alarmMsgTask();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
-
+            System.out.printf(ex.getMessage());
         }
     }
 
     @Scheduled(cron = "0 0 1 * * ?")   // 姣忓ぉ闆剁偣鎵ц
-    // @Scheduled(cron = "0/1 * * * * ?")   // 姣忕鎵ц
+//    @Scheduled(cron = "0/1 * * * * ?")   // 姣忕鎵ц
     public void queryDataDetectorDaily2Task() {
         try {
-            AlarmMsgParamDto paramDto = AlarmMsgParamDto.builder().StartAt(0).Size(100).build();
+            LocalDateTime ldt = LocalDateTime.now();
+            ldt = ldt.plusDays(-1);
+            DateTimeFormatter pattern = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
-            SmokeResultResponseDto<AlarmMsgResponseDto> responseDto = smokeDetectionService.getListAlarmMsg(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            DetectorDailyParamDto paramDto = DetectorDailyParamDto.builder().AcquitDate(ldt.format(pattern)).build();
+
+            String json = smokeDetectionService.queryDataDetectorDaily2(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
             if (responseDto.getStatus() == 200) {
-                AlarmMsgResponseDto dto = responseDto.getData();
-                List<OdsAlarmMsg> list = dto.getContent();
-                System.out.println(list.size());
+                DetectorDailyResponseDto dto = JSON.parseObject(responseDto.getData().toString(), DetectorDailyResponseDto.class);
+                List<OdsDetectorDaily> list = dto.getContent();
                 list.forEach(o -> {
                     try {
-                        alarmMsgService.save(o);
+                        detectorDailyService.save(o);
                     } catch (Exception ex) {
 
+                        System.out.printf(ex.getMessage());
                     }
                 });
                 // alarmMsgService.saveBatch(list);
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
 
+            System.out.printf(ex.getMessage());
         }
     }
 
@@ -138,24 +160,27 @@
     public void queryTenMinData() {
         try {
             TenMinParamDto paramDto = TenMinParamDto.builder().build();
+            String json = smokeDetectionService.queryTenMinData(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
 
-            SmokeResultResponseDto<List<OdsTenMinData>> responseDto = smokeDetectionService.queryTenMinData(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
             if (responseDto.getStatus() == 200) {
-                List<OdsTenMinData> list = responseDto.getData();
+                List<OdsTenMinData> list = JSON.parseArray(responseDto.getData().toString(), OdsTenMinData.class);
                 list.forEach(o -> {
                     try {
                         tenMinDataService.save(o);
                     } catch (Exception ex) {
-
+                        System.out.printf(ex.getMessage());
                     }
                 });
                 // alarmMsgService.saveBatch(list);
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
-
+            System.out.printf(ex.getMessage());
         }
     }
 
@@ -166,9 +191,11 @@
         try {
             DataIntimeParamDto paramDto = DataIntimeParamDto.builder().build();
 
-            SmokeResultResponseDto<DataIntimeResponseDto> responseDto = smokeDetectionService.listDataIntime(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            String json = smokeDetectionService.listDataIntime(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
+
             if (responseDto.getStatus() == 200) {
-                DataIntimeResponseDto dataIntimeResponseDto = responseDto.getData();
+                DataIntimeResponseDto dataIntimeResponseDto = JSON.parseObject(responseDto.getData().toString(), DataIntimeResponseDto.class);
                 List<OdsInTime> list = dataIntimeResponseDto.getContent();
                 list.forEach(o -> {
                     try {
@@ -181,6 +208,8 @@
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
             System.out.printf(ex.getMessage());
@@ -193,9 +222,11 @@
         try {
             LocaleParamDto paramDto = LocaleParamDto.builder().build();
 
-            SmokeResultResponseDto<LocaleResponseDto> responseDto = smokeDetectionService.listLocale(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            String json = smokeDetectionService.listLocale(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
+
             if (responseDto.getStatus() == 200) {
-                LocaleResponseDto responseDataDto = responseDto.getData();
+                LocaleResponseDto responseDataDto = JSON.parseObject(responseDto.getData().toString(), LocaleResponseDto.class);
                 List<OdsLocale> list = responseDataDto.getContent();
                 list.forEach(o -> {
                     try {
@@ -209,6 +240,8 @@
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
             System.out.printf(ex.getMessage());
@@ -222,9 +255,11 @@
         try {
             CustomerParamDto paramDto = CustomerParamDto.builder().build();
 
-            SmokeResultResponseDto<CustomerResponseDto> responseDto = smokeDetectionService.queryCustomer(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            String json = smokeDetectionService.queryCustomer(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
+
             if (responseDto.getStatus() == 200) {
-                CustomerResponseDto responseDataDto = responseDto.getData();
+                CustomerResponseDto responseDataDto = JSON.parseObject(responseDto.getData().toString(), CustomerResponseDto.class);
                 List<OdsCustomer> list = responseDataDto.getContent();
                 list.forEach(o -> {
                     try {
@@ -240,6 +275,8 @@
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
             System.out.printf(ex.getMessage());
@@ -252,9 +289,11 @@
         try {
             AlarmMsgParamDto paramDto = AlarmMsgParamDto.builder().build();
 
-            SmokeResultResponseDto<AlarmRecordResponseDto> responseDto = smokeDetectionService.getListAlarmRecord(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            String json = smokeDetectionService.getListAlarmRecord(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
+
             if (responseDto.getStatus() == 200) {
-                AlarmRecordResponseDto responseDataDto = responseDto.getData();
+                AlarmRecordResponseDto responseDataDto = JSON.parseObject(responseDto.getData().toString(), AlarmRecordResponseDto.class);
                 List<OdsAlarmRecord> list = responseDataDto.getContent();
                 list.forEach(o -> {
                     try {
@@ -268,6 +307,8 @@
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
             System.out.printf(ex.getMessage());
@@ -280,9 +321,11 @@
         try {
             CurAlarmParamDto paramDto = CurAlarmParamDto.builder().Typ(2).build();
 
-            SmokeResultResponseDto<CurAlarmResponseDto> responseDto = smokeDetectionService.getListCurAlarm(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            String json = smokeDetectionService.getListCurAlarm(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+            SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
+
             if (responseDto.getStatus() == 200) {
-                CurAlarmResponseDto responseDataDto = responseDto.getData();
+                CurAlarmResponseDto responseDataDto = JSON.parseObject(responseDto.getData().toString(), CurAlarmResponseDto.class);
                 List<OdsCurAlarm> list = responseDataDto.getContent();
                 list.forEach(o -> {
                     try {
@@ -295,6 +338,8 @@
             } else if (responseDto.getStatus() == 114) {
                 login();
                 queryDataDetectorDaily2Task();
+            } else {
+                System.out.printf(responseDto.getData().toString());
             }
         } catch (Exception ex) {
             System.out.printf(ex.getMessage());
@@ -303,10 +348,12 @@
 
     void login() {
         LoginParamDto loginParamDto = LoginParamDto.builder().username("connect_test2").password("test@234").noCode(true).build();
-        SmokeResultResponseDto<LoginResponseDto> responseDto = smokeDetectionService.loginAction(loginParamDto);
+        String json = smokeDetectionService.loginAction(loginParamDto);
+        SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
         if (responseDto.getStatus() == 200) {
-            System.out.println(responseDto.getData().getToken());
-            redisService.set(RedisKey.SMOKE_TOKEN, responseDto.getData().getToken());
+            LoginResponseDto loginResponseDto = JSON.parseObject(responseDto.getData().toString(), LoginResponseDto.class);
+            System.out.println(loginResponseDto.getToken());
+            redisService.set(RedisKey.SMOKE_TOKEN, loginResponseDto.getToken());
         }
     }
 }

--
Gitblit v1.8.0