From 5ffeb9891c8f164174d25621bbc8b4bf27ada3da Mon Sep 17 00:00:00 2001 From: wuyw <373811525@qq.com> Date: Mon, 19 Aug 2024 21:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=98=80=E9=97=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E3=80=82=E5=86=85=E9=97=A8=E9=94=81=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UploadedPhotosController.java | 1 - .../service/gis/impl/GisDeviceServiceImpl.java | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java index 429e1d4..8052857 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java @@ -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; diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/gis/impl/GisDeviceServiceImpl.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/gis/impl/GisDeviceServiceImpl.java index fae2028..5b3421f 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/service/gis/impl/GisDeviceServiceImpl.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/gis/impl/GisDeviceServiceImpl.java @@ -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 hashMap1 = new HashMap() {{ 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 hashMap1 = new HashMap() {{ 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 hashMap1 = new HashMap() {{ put("upType", 0);