Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
zy 2025-11-24 12:44:58 +08:00
parent a26e53f053
commit efe555c1d5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java
View File

@ -211,7 +211,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
if (values != null) { if (values != null) {
String val = values.toString(); String val = values.toString();
if (StringUtils.isNotBlank(val)) { if (StringUtils.isNotBlank(val)) {
PollutionEnum pollutionEnum = PollutionEnum.catchMessage(field.getName()); PollutionEnum pollutionEnum = PollutionEnum.catchPollution(field.getName());
CommonDataTrans e4 = new CommonDataTrans();//温度 CommonDataTrans e4 = new CommonDataTrans();//温度
String iconFinalName = pollutionEnum.getIconName(); String iconFinalName = pollutionEnum.getIconName();
@ -410,7 +410,7 @@ w * @param pageNo 非必传，虫情孢子类，杀虫灯传入
if (values != null) { if (values != null) {
String val = values.toString(); String val = values.toString();
if (StringUtils.isNotBlank(val)) { if (StringUtils.isNotBlank(val)) {
PollutionEnum pollutionEnum = PollutionEnum.catchMessage(field.getName()); PollutionEnum pollutionEnum = PollutionEnum.catchPollution(field.getName());
CommonDataTrans e4 = new CommonDataTrans();//温度 CommonDataTrans e4 = new CommonDataTrans();//温度
String iconFinalName = pollutionEnum.getIconName(); String iconFinalName = pollutionEnum.getIconName();

7
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java
View File

@ -11,10 +11,7 @@ import org.jeecg.common.vo.inner.TransSurvObjVo;
import org.jeecg.common.vo.inner.TransZhiBiaoVo; import org.jeecg.common.vo.inner.TransZhiBiaoVo;
import org.jeecg.common.vo.iot.common.Result; import org.jeecg.common.vo.iot.common.Result;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List; import java.util.List;
@ -42,5 +39,5 @@ public interface ZhAdminFeignClient {
* @return * @return
*/ */
@PostMapping("/appmana/inner/api/deviceNewestData") @PostMapping("/appmana/inner/api/deviceNewestData")
VOTransData deviceNewestData(String deployId); VOTransData deviceNewestData(@RequestParam String deployId);
} }