From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 108 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 82 insertions(+), 26 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..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,22 @@ package com.doumee.cloud.openapi; -import cn.emay.sdk.util.AES; +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.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.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; @@ -34,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; @@ -61,25 +63,48 @@ @LoginNoRequired @ApiOperation("token瑙f瀽") @GetMapping("/water/decodeToken") - public ApiResponse<Map<String,Object>> decodeToken(@RequestParam String token) { - HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest(); - hkBaseTokenRequest.setToken(token); - return ApiResponse.success(this.decodeTokenForHk(hkBaseTokenRequest)); + public Map<String,Object> decodeToken(@RequestParam String token) { + log.info("銆愬畨闃插钩鍙板崟鐐圭櫥褰晅oken瑙f瀽銆�================="+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瑙f瀽===澶辫触锛�"+e.getMessage()); + e.printStackTrace(); + success = Constants.ONE; + }finally { + interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙f瀽",token, + success, JSONObject.toJSONString(result),Constants.ZERO); + } + 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"); 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瑙f瀽澶辫触"); + result.put("code","-1"); + result.put("msg","token鏃犳晥!"); + return result; } - - String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken()); + String userName = DESUtil.verifyHkToken( redisToken);; if(StringUtils.isBlank(userName)){ - throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙f瀽澶辫触"); + result.put("code","-1"); + result.put("msg","token鍙傛暟涓虹┖"); + return result; } //鏌ヨ鐢ㄦ埛淇℃伅鏄惁瀛樺湪 SystemUser systemUser = new SystemUser(); @@ -87,14 +112,19 @@ systemUser.setDeleted(Boolean.FALSE); SystemUser queryBean = systemUserService.findOne(systemUser); if(Objects.isNull(queryBean)){ - throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙f瀽澶辫触"); + 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 +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 @@ -137,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)); } @@ -145,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)); } @@ -179,6 +226,15 @@ @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