修改

soc-modules/soc-modules-core/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 服务注册地址
-        server-addr: 10.87.10.54:8848
+        server-addr: 10.87.21.102:8848
       config:
         namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 配置中心地址
-        server-addr: 10.87.10.54:8848
+        server-addr: 10.87.21.102:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeviceController.java

@@ -230,10 +230,12 @@ public class SysDeviceController extends BaseController {
                                 throw new RuntimeException("设备" + d.getDeviceName() + "关联主机不正确");
                             }
                         }
-                        if (d.getDefinition().equals("是")){
-                            sysDevice.setDefinition("1");
-                        }else {
-                            sysDevice.setDefinition("0");
+                        if(null!=d.getDefinition()){
+                            if (d.getDefinition().equals("是")){
+                                sysDevice.setDefinition("1");
+                            }else {
+                                sysDevice.setDefinition("0");
+                            }
                         }
                         if (d.getAssetType().equals("消防类")) {
                             if (null == d.getCheckTime()) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/UserExport.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Data//导出
 @ColumnWidth(15) //列宽,最大值为255
 @HeadRowHeight(16) //表头行高
 @ContentRowHeight(16) //数据行高

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/UserImport.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @author :LuoWei
  * @date : 2023/11/15
  */
-@Data
+@Data//导出
 @ColumnWidth(15) //列宽,最大值为255
 @HeadRowHeight(16) //表头行高
 @ContentRowHeight(16) //数据行高
@@ -29,16 +29,14 @@ public class UserImport {
     private String orgName;
     @ExcelProperty(value = "用户角色", index = 4)
     private String roleNames;
-    @ExcelProperty(value = "手机号码", index = 5)
-    private String phone;
-    @ExcelProperty(value = "性别", index = 6)
-    private String gender;
-    @ExcelProperty(value = "账号状态", index = 7)
+    @ExcelProperty(value = "账号状态", index = 5)
     private String isLock;
-    @ExcelProperty(value = "安保部门从业人员", index = 8)
+    @ExcelProperty(value = "安保部门从业人员", index = 6)
     private String isManage;
-    @ExcelProperty(value = "登录IP", index = 9)
-    private String lastIp;
-    @ExcelProperty(value = "登录时间", index = 10)
-    private Date lastTime;
+    @ExcelProperty(value = "手机号码", index = 7)
+    private String phone;
+    @ExcelProperty(value = "性别", index = 8)
+    private String gender;
+
+
 }