From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 146 insertions(+), 24 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 686dbf0..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,26 +1,28 @@
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.service.business.PlatformJobService;
-import com.doumee.service.business.PlatformLogService;
-import com.doumee.service.business.PlatformService;
-import com.doumee.service.business.PlatformWaterGasService;
+import com.doumee.dao.system.model.SystemUser;
+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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
/**
* @author 姹熻箘韫�
@@ -28,11 +30,14 @@
*/
@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;
@@ -41,78 +46,195 @@
private PlatformJobService platformJobService;
@Autowired
+ private PlatformWarnEventService platformWarnEventService;
+
+ @Autowired
private PlatformWaterGasService platformWaterGasService;
+ @Autowired
+ private SystemUserService systemUserService;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private RedisTemplate<String,Object> redisTemplate;
+
+ @LoginNoRequired
+ @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 {
+ 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);
+ }
+ return result;
+ }
+
+ 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())){
+ 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)){
+ result.put("code","-1");
+ result.put("msg","token鏃犳晥!");
+ return result;
+ }
+ String userName = DESUtil.verifyHkToken( redisToken);;
+ if(StringUtils.isBlank(userName)){
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
+ }
+ //鏌ヨ鐢ㄦ埛淇℃伅鏄惁瀛樺湪
+ SystemUser systemUser = new SystemUser();
+ systemUser.setUsername(userName);
+ systemUser.setDeleted(Boolean.FALSE);
+ SystemUser queryBean = systemUserService.findOne(systemUser);
+ if(Objects.isNull(queryBean)){
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
+ }
+ if(Constants.equalsInteger(queryBean.getStatus(),Constants.ONE)){
+ result.put("code","-2");
+ result.put("msg","鐢ㄦ埛宸茬鐢�");
+ return result;
+ }
+ redisTemplate.delete(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
+ Map<String,Object> data = new HashMap<>();
+ data.put("userId",userName);
+ result.put("data",data);
+ return result;
+ }
+
+
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愮敤姘撮噺銆戞湰鏈堛�佷笂鏈堝拰鍘诲勾鍚屾湀")
@PostMapping("/water/dataByMonth")
- @LoginNoRequired
public ApiResponse<WaterByMonthResponse> waterDataByMonth(@RequestBody WaterByMonthRequest param) {
return ApiResponse.success(platformWaterGasService.waterDataByMonth(param));
}
+
+ @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")
- @LoginNoRequired
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
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞寜澶╃粺璁¤繍鍗曡姹傚弬鏁�")
@PostMapping("/platform/orderNumByDate")
- @LoginNoRequired
public ApiResponse<PlatformOrderNumByDateResponse> orderNumByDate(@RequestBody PlatformOrderNumByDateRequest param) {
return ApiResponse.success(platformJobService.orderNumByDate(param));
}
+
+
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙扮姸鎬佹暟閲忕粺璁�")
@PostMapping("/platform/totalNumByStatus")
- @LoginNoRequired
public ApiResponse<PlatformNumByStatusResponse> totalNumByStatus(@RequestBody PlatformNumByStatusRequest param) {
return ApiResponse.success(platformService.getPlatformNumByStatusResponse());
}
+
+
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙板綋鍓嶄綔涓氫俊鎭垪琛�")
@PostMapping("/platform/workingDataList")
- @LoginNoRequired
- public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) {
+ public ApiResponse<List<PlatformDataListResponse>> workingDataList(@RequestBody PlatformDataListRequest param) {
return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
+
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙颁綔涓氳鎯呬俊鎭�")
@PostMapping("/platform/workDataInfo")
- @LoginNoRequired
- public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) {
+ public ApiResponse<PlatformDataInfoResponse> workDataInfo(@RequestBody PlatformDataInfoRequest param) {
return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
+
+
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戝綋鍓嶈溅杈嗙姸鎬佹暟閲忕粺璁�")
@PostMapping("/platform/carStatusNum")
- @LoginNoRequired
public ApiResponse<CarNumByStatusResponse> carStatusNum(@RequestBody CarNumByStatusRequest param) {
return ApiResponse.success(platformJobService.carStatusNum(param));
}
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戣溅杈嗕簨浠跺垪琛ㄦ暟鎹泦鍚堬紙鏈�鏂癗鏉★級")
@PostMapping("/platform/carLogsList")
- @LoginNoRequired
public ApiResponse<List<CarLogsListResponse>> carLogsList(@RequestBody CarLogsListRequest param) {
return ApiResponse.success(platformLogService.getCarLogsListResponse(param));
}
+
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞帓闃熼槦鍒楀垪琛ㄩ泦鍚�")
@PostMapping("/platform/queueList")
- @LoginNoRequired
public ApiResponse<PlatformQueuingListResponse> queueList(@RequestBody PlatformQueuingListRequest param) {
return ApiResponse.success(platformJobService.queueList(param));
}
+ @LoginNoRequired
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戦璀︿簨浠堕泦鍚堝垪琛�")
@PostMapping("/platform/warningEventList")
- @LoginNoRequired
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