From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 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 1643760..5f591d0 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
@@ -1,28 +1,27 @@
package com.doumee.cloud.openapi;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
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;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
-import java.net.URLDecoder;
import java.util.*;
/**
@@ -31,17 +30,23 @@
*/
@Api(tags = "鎻愪緵瀹夐槻骞冲彴瀵规帴鎺ュ彛锛堟暟鎹ぇ灞忓熀纭�鏁版嵁绛夛級")
@RestController
+@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/hk/api")
public class HkOpenApiController extends BaseController {
@Autowired
private PlatformService platformService;
+ @Autowired
+ private InterfaceLogService interfaceLogService;
@Autowired
private PlatformLogService platformLogService;
@Autowired
private PlatformJobService platformJobService;
+
+ @Autowired
+ private PlatformWarnEventService platformWarnEventService;
@Autowired
private PlatformWaterGasService platformWaterGasService;
@@ -59,17 +64,28 @@
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
public Map<String,Object> decodeToken(@RequestParam String token) {
+ log.info("銆愬畨闃插钩鍙板崟鐐圭櫥褰晅oken瑙ｆ瀽銆�================="+token);
+ int success = Constants.ZERO;
+ Map<String,Object> result = new HashMap<>() ;
try {
- token = URLDecoder.decode(token,"UTF-8");
+ HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
+ hkBaseTokenRequest.setToken(token);
+ result = this.decodeTokenForHk(hkBaseTokenRequest);
+ }catch (BusinessException e){
+ log.error("銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙�===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
}catch (Exception e){
-
+ log.error("銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙ｆ瀽===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙ｆ瀽",token,
+ success, JSONObject.toJSONString(result),Constants.ZERO);
}
- HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
- hkBaseTokenRequest.setToken(token);
- return this.decodeTokenForHk(hkBaseTokenRequest);
+ return result;
}
- public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest){
+ public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest) {
Map<String,Object> result = new HashMap<>();
result.put("code","0");
result.put("msg","success");
@@ -84,7 +100,7 @@
result.put("msg","token鏃犳晥!");
return result;
}
- String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
+ String userName = DESUtil.verifyHkToken( redisToken);;
if(StringUtils.isBlank(userName)){
result.put("code","-1");
result.put("msg","token鍙傛暟涓虹┖");
@@ -123,10 +139,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
@@ -151,7 +184,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));
}
@@ -159,7 +192,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));
}
@@ -193,7 +226,7 @@
@ApiOperation("銆愭湀鍙般�戦璀︿簨浠堕泦鍚堝垪琛�")
@PostMapping("/platform/warningEventList")
public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
- return ApiResponse.success(new ArrayList<>());
+ return ApiResponse.success(platformWarnEventService.findListToHk());
}
@LoginNoRequired
@@ -203,4 +236,5 @@
public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
return ApiResponse.success(platformService.getPlatformStatusList());
}
+
}
--
Gitblit v1.9.3