From c5cc7da07c7f202f336468c0cd0d2789b4775b03 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 09 十月 2024 11:31:15 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 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..f1f9590 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瑙f瀽") @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()); @@ -187,6 +193,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