地图模糊查询添加

common-lib/src/main/java/com/mortals/xhx/feign/sms/ISmsSetFeign.java

 package com.mortals.xhx.feign.sms;
+
+import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.sms.SmsSetPdu;
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.common.Rest;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 /**
  * 短信设置 Feign接口

device-manager-ui/admin/src/views/device/list.vue

@@ -197,7 +197,7 @@ export default {
         this.$message.error(error.message);
       });
 
-    // this.$router.push({ query: { } });
+     this.$router.push({ query: {siteId:this.siteId } });
   },
   methods: {
     switchMap(){

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -419,7 +419,7 @@ public class DeviceApiController {
         deviceEntity.setDeviceCode(req.getDeviceCode());
 
         deviceEntity.setEnabled(YesNoEnum.YES.getValue());
-        deviceEntity.setDeviceStatus(DeviceStatusEnum.未激活.getValue());
+       // deviceEntity.setDeviceStatus(DeviceStatusEnum.未激活.getValue());
 
         deviceEntity.setSource(req.getSource());
     }

device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java

@@ -79,7 +79,7 @@ public interface ErrorCode {
     public static final String CARADD_MEMBERS="该司机已有绑定车辆，不能绑定多个";
 
     public static final int DEVICE_CODE_IS_EMPTY = 1001;
-    public static final String DEVICE_CODE_IS_EMPTY_CONTENT = "当前设备编码不存在！";
+    public static final String DEVICE_CODE_IS_EMPTY_CONTENT = "当前设备编码为空！";
 
     public static final int DEVICE_CODE_IS_EXIST = 1002;
     public static final String DEVICE_CODE_IS_EXIST_CONTENT = "当前设备编码已存在！";