luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改yongshuiChart数据转换异常

Browse Source
This commit is contained in:
wyw 2024-09-10 20:45:01 +08:00
parent 9fb8de3e33
commit 26d56dd1f7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.fastbee.common.model.vo.iot.DeviceDetailVo;
import com.fastbee.common.model.vo.iot.QueryLogVo; import com.fastbee.common.model.vo.iot.QueryLogVo;
import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.DateUtils;
import com.fastbee.common.utils.DevParamsUtils; import com.fastbee.common.utils.DevParamsUtils;
import com.fastbee.common.utils.NumberUtils;
import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.StringUtils;
import com.fastbee.data.domain.vo.AnfangInfoVo; import com.fastbee.data.domain.vo.AnfangInfoVo;
import com.fastbee.data.service.devicedetail.IDeviceDetailService; import com.fastbee.data.service.devicedetail.IDeviceDetailService;
@ -377,16 +378,16 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService {
put("name", haiWeiPropertyVo.getNameCn()); put("name", haiWeiPropertyVo.getNameCn());
}}; }};
if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_guanxian")){ if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_guanxian")){
hashMap.put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f? hashMap.put("value", NumberUtils.isNumeric(haiWeiPropertyVo.getValue().toString())?(
"关闭":"开启"); Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"关闭":"开启"):"关闭");
} }
if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_FlowDown")){ if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_FlowDown")){
hashMap.put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f? hashMap.put("value", NumberUtils.isNumeric(haiWeiPropertyVo.getValue().toString())?(
"异常":"正常"); Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"正常":"异常"):"正常");
} }
if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_mCon")){ if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_mCon")){
hashMap.put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f? hashMap.put("value", NumberUtils.isNumeric(haiWeiPropertyVo.getValue().toString())?(
"异常":"正常"); Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"正常":"异常"):"正常");
} }
list.add(hashMap); list.add(hashMap);
} }