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<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);