From 9cf8c1d147e558c9a89b4ef14e79ea79902a7d9d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 12 十月 2024 18:25:16 +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 | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 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 c2292a7..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
@@ -1,23 +1,16 @@
package com.doumee.cloud.openapi;
-import cn.emay.sdk.util.AES;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.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;
@@ -26,6 +19,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import java.net.URLDecoder;
import java.util.*;
/**
@@ -47,6 +41,9 @@
private PlatformJobService platformJobService;
@Autowired
+ private PlatformWarnEventService platformWarnEventService;
+
+ @Autowired
private PlatformWaterGasService platformWaterGasService;
@Autowired
@@ -61,25 +58,37 @@
@LoginNoRequired
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
- public ApiResponse<Map<String,Object>> decodeToken(@RequestParam String token) {
+ 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 ApiResponse.success(this.decodeTokenForHk(hkBaseTokenRequest));
+ return this.decodeTokenForHk(hkBaseTokenRequest);
}
-
public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest){
+ Map<String,Object> result = new HashMap<>();
+ result.put("code","0");
+ result.put("msg","success");
if(Objects.isNull(hkBaseTokenRequest)||StringUtils.isBlank(hkBaseTokenRequest.getToken())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"token鍙傛暟涓虹┖");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
String redisToken = (String) redisTemplate.opsForValue().get(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(redisToken)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鏃犳晥!");
+ return result;
}
-
String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(userName)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
//鏌ヨ鐢ㄦ埛淇℃伅鏄惁瀛樺湪
SystemUser systemUser = new SystemUser();
@@ -87,14 +96,19 @@
systemUser.setDeleted(Boolean.FALSE);
SystemUser queryBean = systemUserService.findOne(systemUser);
if(Objects.isNull(queryBean)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
if(Constants.equalsInteger(queryBean.getStatus(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鐢ㄦ埛宸茬鐢�");
+ result.put("code","-2");
+ result.put("msg","鐢ㄦ埛宸茬鐢�");
+ return result;
}
redisTemplate.delete(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
- Map<String,Object> result = new HashMap<>();
- result.put("userId",userName);
+ Map<String,Object> data = new HashMap<>();
+ data.put("userId",userName);
+ result.put("data",data);
return result;
}
@@ -109,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
@@ -137,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));
}
@@ -145,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));
}
@@ -179,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