资产关联临时修改

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -49,7 +49,7 @@ public class SysDevice extends BaseEntity {
     @ApiModelProperty(value = "设备状态")
     @TableField("device_status")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Integer deviceStatus;
+    private Integer deviceStatus = 1;
 
     @ApiModelProperty(value = "设备型号")
     @TableField("device_model")
@@ -109,7 +109,7 @@ public class SysDevice extends BaseEntity {
     private String definition;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "是否关联登记簿",notes = "0否1是")
+    @ApiModelProperty(value = "是否关联登记簿", notes = "0否1是")
     private Integer inBook;
 
     @TableField(exist = false)

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

@@ -21,9 +21,9 @@ public class DeviceExport {
     private String assetNo;
     @ExcelProperty(value = "设备名称(必填)", index = 2)
     private String deviceName;
-    @ExcelProperty(value = "资产分类(必填)", index = 3)
+    @ExcelProperty(value = "设备大类(必填)", index = 3)
     private String assetType;
-    @ExcelProperty(value = "设备分类(必填)", index = 4)
+    @ExcelProperty(value = "设备小类(必填)", index = 4)
     private String deviceType;
    /* @ExcelProperty(value = "设备品牌", index = 5)
     private String deviceBrand;
@@ -39,7 +39,7 @@ public class DeviceExport {
     @ExcelProperty(value = "保修期限", index = 10)
     private String maintenanceTerm;
     @ExcelProperty(value = "投产时间", index = 11)
-    private String useTime;*/
+    private String useTime;
     @ExcelProperty(value = "资产状态(必填)", index = 12)
-    private String deviceStatus;
+    private String deviceStatus;*/
 }