调整设备导入

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeviceServiceImpl.java

@@ -497,17 +497,17 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         String assetType = deviceExport.getAssetType();
         Optional<DictionaryTreeVo> assetOptional = dictionaryList.stream().filter(r -> ObjectUtil.equal(r.getName(), assetType)).findFirst();
         if (!assetOptional.isPresent()) {
-            msgList.add("设备大类未填写或填写不正确");
+            msgList.add("设备类别未填写或填写不正确");
         } else {
             device.setAssetType(assetOptional.get().getId().toString());
         }
         String deviceType = deviceExport.getDeviceType();
         if (StringUtils.isEmpty(deviceType)) {
-            msgList.add("设备小类未填写");
+            msgList.add("设备分类未填写");
         } else {
             Optional<DictionaryTreeVo> deviceOptional = dictionaryList.stream().filter(r -> ObjectUtil.equal(r.getName(), deviceType)).findFirst();
             if (!deviceOptional.isPresent()) {
-                msgList.add("设备小类不存在");
+                msgList.add("设备分类不存在");
             } else {
                 device.setDeviceType(deviceOptional.get().getId().toString());
             }

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

@@ -17,13 +17,13 @@ import lombok.Data;
 public class DeviceExport {
     @ExcelProperty(value = "所属机构(必填)", index = 0)
     private String orgName;
-    @ExcelProperty(value = "资产编号", index = 1)
-    private String assetNo;
-    @ExcelProperty(value = "设备名称(必填)", index = 2)
+//    @ExcelProperty(value = "资产编号", index = 1)
+//    private String assetNo;
+    @ExcelProperty(value = "设备名称(必填)", index = 1)
     private String deviceName;
-    @ExcelProperty(value = "设备大类(必填)", index = 3)
+    @ExcelProperty(value = "设备类别(必填)", index = 2)
     private String assetType;
-    @ExcelProperty(value = "设备小类(必填)", index = 4)
+    @ExcelProperty(value = "设备分类(必填)", index = 3)
     private String deviceType;
    /* @ExcelProperty(value = "设备品牌", index = 5)
     private String deviceBrand;