diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java index 616861d..8ce658a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java @@ -211,7 +211,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 if (values != null) { String val = values.toString(); if (StringUtils.isNotBlank(val)) { - PollutionEnum pollutionEnum = PollutionEnum.catchMessage(field.getName()); + PollutionEnum pollutionEnum = PollutionEnum.catchPollution(field.getName()); CommonDataTrans e4 = new CommonDataTrans();//温度 String iconFinalName = pollutionEnum.getIconName(); @@ -410,7 +410,7 @@ w * @param pageNo 非必传,虫情孢子类,杀虫灯传入 if (values != null) { String val = values.toString(); if (StringUtils.isNotBlank(val)) { - PollutionEnum pollutionEnum = PollutionEnum.catchMessage(field.getName()); + PollutionEnum pollutionEnum = PollutionEnum.catchPollution(field.getName()); CommonDataTrans e4 = new CommonDataTrans();//温度 String iconFinalName = pollutionEnum.getIconName(); diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java index 0c8fc53..c0e916e 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java @@ -11,10 +11,7 @@ import org.jeecg.common.vo.inner.TransSurvObjVo; import org.jeecg.common.vo.inner.TransZhiBiaoVo; import org.jeecg.common.vo.iot.common.Result; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -42,5 +39,5 @@ public interface ZhAdminFeignClient { * @return */ @PostMapping("/appmana/inner/api/deviceNewestData") - VOTransData deviceNewestData(String deployId); + VOTransData deviceNewestData(@RequestParam String deployId); }