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

修改设备运行数据，阀门状态。内门锁状态

Browse Source
This commit is contained in:
wuyw 2024-08-19 21:14:27 +08:00
parent 54958fe14c
commit 5ffeb9891c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java
View File

@ -16,7 +16,6 @@ import com.fastbee.iot.model.anfang.UploadedPhotos;
import com.fastbee.iot.service.impl.DeviceServiceImpl;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

14
fastbee-open-api/src/main/java/com/fastbee/data/service/gis/impl/GisDeviceServiceImpl.java
View File

@ -245,24 +245,24 @@ public class GisDeviceServiceImpl implements IGisDeviceService {
put("name", haiWeiPropertyVo.getNameCn());
}};
rMap.put("xiangmen", hashMap1);
} else if (haiWeiPropertyVo.getNameEn().equals("内门上锁")) {
} else if (haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_lock1Con")) {
HashMap<Object, Object> hashMap1 = new HashMap<Object, Object>() {{
put("upType", 0);
put("identifier", "三菱FX2N_1_lock1Con");
put("unit", "");
put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"正常":"异常");
put("name", haiWeiPropertyVo.getNameCn());
put("name", "内门上锁");
}};
rMap.put("三菱FX2N_1_lock1Con", hashMap1);
} else if (haiWeiPropertyVo.getNameEn().equals("内门下锁")) {
rMap.put("内门上锁", hashMap1);
} else if (haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_lock2Con")) {
HashMap<Object, Object> hashMap1 = new HashMap<Object, Object>() {{
put("upType", 0);
put("identifier", "三菱FX2N_1_lock2Con");
put("unit", "");
put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"正常":"异常");
put("name", haiWeiPropertyVo.getNameCn());
put("name", "内门下锁");
}};
rMap.put("三菱FX2N_1_lock2Con", hashMap1);
rMap.put("内门下锁", hashMap1);
}
}
} else {
@ -342,7 +342,7 @@ public class GisDeviceServiceImpl implements IGisDeviceService {
hashMap1.put("value", "正常");
}
}
rMap.put("阀门状态", hashMap1);
rMap.put("水表状态", hashMap1);
}else{
HashMap<Object, Object> hashMap1 = new HashMap<Object, Object>() {{
put("upType", 0);