From eaf4587b47701f3df0559e64362d6ea413d782f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 11 十月 2024 10:41:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index f26fc55..b9135cf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -10,10 +10,7 @@
 import com.doumee.dao.openapi.request.*;
 import com.doumee.dao.openapi.response.*;
 import com.doumee.dao.system.model.SystemUser;
-import com.doumee.service.business.PlatformJobService;
-import com.doumee.service.business.PlatformLogService;
-import com.doumee.service.business.PlatformService;
-import com.doumee.service.business.PlatformWaterGasService;
+import com.doumee.service.business.*;
 import com.doumee.service.system.SystemUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +19,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
+import java.net.URLDecoder;
 import java.util.*;
 
 /**
@@ -43,6 +41,9 @@
     private PlatformJobService platformJobService;
 
     @Autowired
+    private PlatformWarnEventService platformWarnEventService;
+
+    @Autowired
     private PlatformWaterGasService platformWaterGasService;
 
     @Autowired
@@ -58,6 +59,11 @@
     @ApiOperation("token瑙ｆ瀽")
     @GetMapping("/water/decodeToken")
     public Map<String,Object> decodeToken(@RequestParam String token) {
+        try {
+            token = URLDecoder.decode(token,"UTF-8");
+        }catch (Exception e){
+
+        }
         HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
         hkBaseTokenRequest.setToken(token);
         return this.decodeTokenForHk(hkBaseTokenRequest);
@@ -75,7 +81,7 @@
         String redisToken = (String) redisTemplate.opsForValue().get(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
         if(StringUtils.isBlank(redisToken)){
             result.put("code","-1");
-            result.put("msg","token鍙傛暟涓虹┖");
+            result.put("msg","token鏃犳晥!");
             return result;
         }
         String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
@@ -117,10 +123,27 @@
 
     @LoginNoRequired
     @PreventRepeat
+    @ApiOperation("銆愮敤姘撮噺銆戣繎12涓湀鐢ㄦ按閲忎俊鎭垪琛�")
+    @PostMapping("/water/lastMonthsDataList")
+    public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsWaterList() {
+        return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ZERO));
+    }
+
+    @LoginNoRequired
+    @PreventRepeat
     @ApiOperation("銆愮敤姘旈噺銆戞湰鏈堛�佷笂鏈堝拰鍘诲勾鍚屾湀")
     @PostMapping("/gas/dataByMonth")
     public ApiResponse<GasByMonthResponse> gasDataByMonth(@RequestBody GasByMonthRequest param) {
         return ApiResponse.success(platformWaterGasService.gasDataByMonth(param));
+    }
+
+
+    @LoginNoRequired
+    @PreventRepeat
+    @ApiOperation("銆愮敤姘旈噺銆戣繎12涓湀鐢ㄦ皵閲忎俊鎭垪琛�")
+    @PostMapping("/gas/lastMonthsDataList")
+    public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsGasList () {
+        return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ONE));
     }
 
     @LoginNoRequired
@@ -145,7 +168,7 @@
     @PreventRepeat
     @ApiOperation("銆愭湀鍙般�戞湀鍙板綋鍓嶄綔涓氫俊鎭垪琛�")
     @PostMapping("/platform/workingDataList")
-    public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) {
+    public ApiResponse<List<PlatformDataListResponse>> workingDataList(@RequestBody PlatformDataListRequest param) {
         return ApiResponse.success(platformJobService.platformWorkingDataList(param));
     }
 
@@ -153,7 +176,7 @@
     @PreventRepeat
     @ApiOperation("銆愭湀鍙般�戞湀鍙颁綔涓氳鎯呬俊鎭�")
     @PostMapping("/platform/workDataInfo")
-    public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) {
+    public ApiResponse<PlatformDataInfoResponse> workDataInfo(@RequestBody PlatformDataInfoRequest param) {
         return ApiResponse.success(platformJobService.platformWorkingDataList(param));
     }
 
@@ -187,6 +210,14 @@
     @ApiOperation("銆愭湀鍙般�戦璀︿簨浠堕泦鍚堝垪琛�")
     @PostMapping("/platform/warningEventList")
     public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
-        return ApiResponse.success(new ArrayList<>());
+        return ApiResponse.success(platformWarnEventService.findListToHk());
+    }
+
+    @LoginNoRequired
+    @PreventRepeat
+    @ApiOperation("銆愭湀鍙般�戞湀鍙扮姸鎬�")
+    @PostMapping("/platform/getStatusList")
+    public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
+        return ApiResponse.success(platformService.getPlatformStatusList());
     }
 }

--
Gitblit v1.9.3