资产关联临时修改

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

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.Constants;
-import com.xunmei.common.core.constant.DictConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.device.domain.SysMultiLayerDictionary;
 import com.xunmei.common.core.domain.device.vo.DictionaryTreeVo;
@@ -21,11 +20,9 @@ import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.redis.utils.RedisUtils;
-import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.RemoteProtectionService;
 import com.xunmei.system.api.domain.SysDevice;
-import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.dto.ProtectionDTO;
 import com.xunmei.system.api.dto.SysDeviceInnerListDto;
@@ -265,9 +262,9 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         if (null != sysDevice1) {
             throw new RuntimeException("设备名称重复");
         }
-        if (!checkAssetNoRepeat(sysDevice.getOrgId(), sysDevice.getAssetNo(), null)) {
+        /*if (!checkAssetNoRepeat(sysDevice.getOrgId(), sysDevice.getAssetNo(), null)) {
             throw new RuntimeException("资产编号重复");
-        }
+        }*/
         int insert = sysDeviceMapper.insert(sysDevice);
         //如果已经存在了主机同步上来的子系统,那么设备新增的就不能再同步到子系统表去
         final int exitDevice = remoteProtectionService.checkExitDevice(sysOrg.getId(), null, SecurityConstants.INNER);
@@ -339,9 +336,9 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
      */
     @Override
     public int updateSysDevice(SysDevice sysDevice) {
-        if (!checkAssetNoRepeat(sysDevice.getOrgId(), sysDevice.getAssetNo(), sysDevice.getId())) {
+        /*if (!checkAssetNoRepeat(sysDevice.getOrgId(), sysDevice.getAssetNo(), sysDevice.getId())) {
             throw new RuntimeException("资产编号重复");
-        }
+        }*/
         sysDevice.setUpdateTime(DateUtils.getNowDate());
         sysDevice.setUpdateBy(SecurityUtils.getUsername());
         SysOrg sysOrg = orgService.selectSysOrgById(sysDevice.getOrgId());
@@ -476,7 +473,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
             device.setOrgPath(orgVO.getPath());
         }
 
-        String assetNo = deviceExport.getAssetNo();
+       /* String assetNo = deviceExport.getAssetNo();
         if (StringUtils.isEmpty(assetNo)) {
             msgList.add("资产编号为空");
         } else {
@@ -485,7 +482,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
             } else {
                 device.setAssetNo(assetNo);
             }
-        }
+        }*/
 
         String deviceName = deviceExport.getDeviceName();
         if (StringUtils.isEmpty(deviceName)) {
@@ -595,7 +592,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
             } catch (Exception e) {
                 msgList.add("投产时间格式错误");
             }
-        }*/
+        }
         String deviceStatus = deviceExport.getDeviceStatus();
         if (StringUtils.isEmpty(deviceStatus)) {
             msgList.add("资产状态未填写");
@@ -607,7 +604,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
             } else {
                 msgList.add("资产状态填写错误");
             }
-        }
+        }*/
         if (msgList.isEmpty()) {
             result.add(device);
         } else {

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -18,7 +17,7 @@ import lombok.Data;
 public class DeviceExport {
     @ExcelProperty(value = "所属机构(必填)", index = 0)
     private String orgName;
-    @ExcelProperty(value = "资产编号(必填)", index = 1)
+    @ExcelProperty(value = "资产编号", index = 1)
     private String assetNo;
     @ExcelProperty(value = "设备名称(必填)", index = 2)
     private String deviceName;
@@ -26,7 +25,7 @@ public class DeviceExport {
     private String assetType;
     @ExcelProperty(value = "设备分类(必填)", index = 4)
     private String deviceType;
-    @ExcelProperty(value = "设备品牌", index = 5)
+   /* @ExcelProperty(value = "设备品牌", index = 5)
     private String deviceBrand;
     @ExcelProperty(value = "设备型号", index = 6)
     private String deviceModel;
@@ -40,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;
 }