feat(配套模块): 修改导入excel

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -157,7 +157,10 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         //型号 名称
         predicateBuilder.eq(deviceLibrarySelectVo.getModel() != null,"model",deviceLibrarySelectVo.getModel());
         predicateBuilder.eq(deviceLibrarySelectVo.getName() != null,"name",deviceLibrarySelectVo.getName());
-        return deviceLibraryDao.findAll(predicateBuilder.build());
+        List<DeviceLibrary> deviceLibraryList = deviceLibraryDao.findAll(predicateBuilder.build());
+
+        deviceLibraryList.forEach(DeviceLibrary::setConfigName);
+        return deviceLibraryList;
     }
 
     @Override

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -516,7 +516,7 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
 //                file.createNewFile();
                 log.info("创建文件夹");
             }
-            FileOutputStream fileOutputStream = new FileOutputStream(file + uuid + ".xlsx");
+            FileOutputStream fileOutputStream = new FileOutputStream(fileExcel + uuid + ".xlsx");
             workbook.write(fileOutputStream);
             fileOutputStream.close();
             return uuid+ ".xlsx";

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceBillSaveVo.java

 package com.tykj.dev.device.matching.subject.vo;
 
 import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceBill;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,6 +62,8 @@ public class MatchingDeviceBillSaveVo {
         BeanUtils.copyProperties(this, matchingDeviceBillEntity);
         matchingDeviceBillEntity.setBillStatus(2);
         matchingDeviceBillEntity.setDeviceDetail("x");
+        //单独处理单据
+        matchingDeviceBillEntity.setFileRets(FilesUtil.stringFileToList(this.getFileRets()));
         return matchingDeviceBillEntity;
     }
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceSaveVo.java

@@ -93,6 +93,7 @@ public class MatchingDeviceSaveVo {
     private String signDate;
 
     @ApiModelProperty(value = "备注")
+    @Excel(name = "备注")
     private String remake;
 
 //    @NotNull(message = "type不能为空")
@@ -143,7 +144,9 @@ public class MatchingDeviceSaveVo {
         matchingDeviceLibraryEntity.setLifeStatus(2);
         matchingDeviceLibraryEntity.setDeviceId(0);
         matchingDeviceLibraryEntity.setLocationUnitId(this.createUnitId);
-        matchingDeviceLibraryEntity.setSignDate(DateUtil.string2LocalDate(this.signDate));
+        if (this.signDate != null && !"".equals(this.signDate)){
+            matchingDeviceLibraryEntity.setSignDate(DateUtil.string2LocalDate(this.signDate));
+        }
         //签订日期进行时间的转换
 //        matchingDeviceLibraryEntity.setSignDate(DateUtil.string2LocalDate(this.signDate));
 //        if (matchingDeviceLibraryEntity.getRfidCardId()==null||"".equals(matchingDeviceLibraryEntity.getRfidCardId())){

dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java

@@ -107,7 +107,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .cors()
                 .and()
                 .authorizeRequests()
-                .antMatchers("/file/**","/actuator/**","/admin/**").permitAll()
+                .antMatchers("/file/**","/actuator/**","/admin/**","/excel/**").permitAll()
                 .antMatchers("/file/llq/**").permitAll()
                 .antMatchers("/login/impersonate*").permitAll()
                 .antMatchers("/logout/impersonate*").permitAll()