完善

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -20,9 +20,7 @@ import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.part.PartInfoDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
-import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
-import com.platform.dao.dto.store.SpareRestoreDetailDTO;
 import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.dto.workplace.WorkplaceBacklogDTO;
@@ -31,8 +29,6 @@ import com.platform.dao.entity.firm.FirmProducer;
 import com.platform.dao.entity.part.PartInfo;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.*;
-import com.platform.dao.entity.store.InStoreDetail;
-import com.platform.dao.entity.store.SpareRestoreDetail;
 import com.platform.dao.entity.upms.SysDept;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
@@ -43,7 +39,6 @@ import com.platform.dao.mapper.part.PartInfoMapper;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.*;
 import com.platform.dao.mapper.upms.SysDeptMapper;
-import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.mapper.upms.SysUserDeptMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.mapper.workplace.WorkplaceBacklogUserMapper;
@@ -52,12 +47,8 @@ import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.util.UserUtil;
 import com.platform.dao.vo.SysUserDeptVO;
 import com.platform.dao.vo.SysUserVO;
-import com.platform.dao.vo.export.sb.ExportSbInfoVO;
-import com.platform.dao.vo.export.store.ExportInStoreFormVO;
 import com.platform.dao.vo.query.upms.SysDeptVO;
 import com.platform.dao.vo.sb.*;
-import com.platform.office.poi.excel.ExcelImportUtil;
-import com.platform.office.poi.excel.entity.ImportParams;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.business.ActivitiBusinessService;
 import com.platform.service.check.CheckStandardService;
@@ -65,16 +56,15 @@ import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.part.PartInfoService;
 import com.platform.service.sb.SbInfoService;
 import com.platform.service.sb.SbModelSpareBomService;
-import com.platform.service.sqarepartmanage.SpareTypeService;
 import com.platform.service.upms.SysDeptRelationService;
 import com.platform.service.upms.SysDeptService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.util.CodeFileUtils;
 import com.platform.service.util.ExecuteSql;
-import com.platform.service.util.SysFileUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.exceptions.TooManyResultsException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -84,8 +74,6 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -100,6 +88,7 @@ import java.util.stream.Collectors;
  */
 @AllArgsConstructor
 @Service("sbInfoService")
+@Slf4j
 public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbInfoDTO> implements SbInfoService {
 
     private final Environment environment;
@@ -114,8 +103,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final SbTypeMapper sbTypeMapper;
     private final SbPositionMapper sbPositionMapper;
     private final RepairApplicationFormMapper repairApplicationFormMapper;
-    private final SysFileMapper sysFileMapper;
-
+    private final SysFileService sysFileService;
     private final SysUserDeptService sysUserDeptService;
 
     private final SysDeptService sysDeptService;
@@ -519,11 +507,8 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         setSaveDept(model);
         setSbStatusLogAndStopLogIgnore(model);
         super.modModelByDTO(model);
-        // 保存文件
+        // 保存图片
         this.saveImageFile(model);
-        this.saveUseFile(model);
-        this.saveRepairFile(model);
-        this.saveRecheckFile(model);
     }
 
     @Override
@@ -942,15 +927,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
      * @param model
      */
     private void saveRepairFile(SbInfoDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getRepairFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.SB_WX_FILE.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getRepairFileList(), model.getId(), SysFileTypeEnum.SB_WX_FILE.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.SB_WX_FILE.getValue(), model.getRepairFileList());
     }
 
     /**
@@ -959,15 +936,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
      * @param model
      */
     private void saveUseFile(SbInfoDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getUseFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.SB_USE_FILE.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getUseFileList(), model.getId(), SysFileTypeEnum.SB_USE_FILE.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.SB_USE_FILE.getValue(), model.getUseFileList());
     }
 
     /**
@@ -976,16 +945,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
      * @param model
      */
     private void saveRecheckFile(SbInfoDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getRecheckFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.SB_WB_FILE.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getRecheckFileList(), model.getId(), SysFileTypeEnum.SB_WB_FILE.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.SB_WB_FILE.getValue(), model.getRecheckFileList());
     }
 
     /**
@@ -994,15 +954,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
      * @param model
      */
     private void saveImageFile(SbInfoDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getSbFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.SB_IMG.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getSbFileList(), model.getId(), SysFileTypeEnum.SB_IMG.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.SB_IMG.getValue(), model.getSbFileList());
     }
 
     @Override
@@ -1348,10 +1300,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             SbInfoVO parentVo = mapper.getById(vo.getParentId());
             vo.setParentSbName(parentVo.getName());
         }
-
-        Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-        weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getId());
-        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekend);
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(vo.getId(), null);
         List<SysFile> repairFileList = ListUtils.newArrayList();
         List<SysFile> useFileList = ListUtils.newArrayList();
         List<SysFile> recheckFileList = ListUtils.newArrayList();

platform-service/src/main/java/com/platform/service/upms/SysFileService.java

@@ -1,5 +1,6 @@
 package com.platform.service.upms;
 
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.upms.SysFileDTO;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.service.base.IBaseService;
@@ -57,4 +58,14 @@ public interface SysFileService extends IBaseService<SysFile, SysFileDTO> {
      * @param file
      */
     void delFile(File file);
+
+    void saveFile(String targetId, Integer type, List<SysFile> sysFileList);
+    /**
+     * 列表
+     *
+     * @param targetId
+     * @param type
+     * @return
+     */
+    List<SysFile> getListByTargetAndType(String targetId, Integer type);
 }

platform-service/src/main/java/com/platform/service/upms/impl/SysFileServiceImpl.java

@@ -1,14 +1,17 @@
 package com.platform.service.upms.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.SecurityUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.upms.SysFileDTO;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.upms.SysFileService;
+import com.platform.service.util.SysFileUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -78,6 +81,17 @@ public class SysFileServiceImpl extends BaseServiceImpl<SysFileMapper, SysFile,
         return mapper.selectByExample(weekend);
     }
 
+    @Override
+    public List<SysFile> getListByTargetAndType(String targetId, Integer type) {
+        Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
+        WeekendCriteria<SysFile, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andEqualTo(SysFile::getTargetId, targetId);
+        if(type != null){
+            weekendCriteria.andEqualTo(SysFile::getType, type);
+        }
+        return mapper.selectByExample(weekend);
+    }
+
     /**
      * 删除临时文件
      *
@@ -97,4 +111,41 @@ public class SysFileServiceImpl extends BaseServiceImpl<SysFileMapper, SysFile,
         }
         file.delete();
     }
+
+    @Override
+    public void saveFile(String targetId, Integer type, List<SysFile> sysFileList) {
+        Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
+        weekend.weekendCriteria().andEqualTo(SysFile::getType, type).andEqualTo(SysFile::getTargetId, targetId);
+        List<SysFile> sysFiles = mapper.selectByExample(weekend);
+        if (CollectionUtil.isNotEmpty(sysFiles)) {
+            for(SysFile sysFile: sysFiles){
+                log.info("id: " + sysFile.getId());
+                boolean find = false;
+                for(SysFile sysFile2: sysFileList){
+                    if(StringUtils.isNotBlank(sysFile2.getId())){// 新增的
+                        if(sysFile.getId().equals(sysFile2.getId())){
+                            find = true;
+                        }
+                    }
+                }
+                if(!find){// 删除
+                    log.info("删除id: " + sysFile.getId());
+                    mapper.deleteByPrimaryKey(sysFile.getId());
+                }
+            }
+        }
+        List<SysFile> list = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(sysFileList)) {
+            for(SysFile sysFile: sysFileList){
+                if(StringUtils.isBlank(sysFile.getId())){// 新增的
+                    log.info("新增: " + sysFile.getName());
+                    list.add(sysFile);
+                }
+            }
+            if (CollectionUtil.isNotEmpty(list)) {
+                list = SysFileUtils.changeFileList(list, targetId, type);
+                mapper.insertListforComplex(list);
+            }
+        }
+    }
 }