完善

platform-rest/src/main/java/com/platform/rest/controller/upms/SysFileController.java

@@ -152,7 +152,7 @@ public class SysFileController {
             fileVO.setFileName(fileFullName.substring(0, endIndex));
             fileVO.setFileFormat(fileFullName.substring(endIndex + 1));
             String fileType = fileFullName.substring(endIndex);
-            String path = CommonConstants.RESOURCE_PREFIX + "/" + fileVO.getFileFormat() + "/" + DateUtil.formatDate(new Date()) + "/" + IdGeneratorUtils.getObjectId() + "/";
+            String path = CommonConstants.RESOURCE_PREFIX + "/" + IdGeneratorUtils.getObjectId() + "/";
             String filePath = UPLOAD_ROOT_FOLDER + path;
             fileVO.setUrl(path + fileFullName);
             fileVO.setFileFormat(fileType);

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.cache.ConfigCache;
 import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
@@ -20,21 +19,15 @@ import com.platform.dao.dto.check.CheckProjectPlanRelationDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.entity.check.*;
 import com.platform.dao.entity.sb.SbInfo;
-import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.entity.upms.SysConfig;
 import com.platform.dao.entity.upms.SysFile;
-import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.check.*;
-import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.vo.SysUserVO;
 import com.platform.dao.vo.query.check.*;
-import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.report.CheckJobReportVO;
 import com.platform.dao.vo.report.CheckJobReportWeekHoursVO;
-import com.platform.dao.vo.report.RepairReport24VO;
-import com.platform.dao.vo.report.RepairReportMttr;
 import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.dao.vo.tuicalendar.ScheduleInfo;
 import com.platform.dao.vo.tuicalendar.TuiCalendar;
@@ -43,8 +36,8 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.check.CheckJobService;
 import com.platform.service.sb.SbInfoService;
 import com.platform.service.upms.SysConfigService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.upms.SysUserDeptService;
-import com.platform.service.util.SysFileUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,8 +45,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
 import java.time.DayOfWeek;
@@ -81,9 +72,8 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     private SysUserDeptService sysUserDeptService;
     private SbInfoService sbInfoService;
     private SysConfigService sysConfigService;
-    private final SysFileMapper sysFileMapper;
+    private final SysFileService sysFileService;
     private CheckStandardMapper checkStandardMapper;
-    private CheckJobMapper checkJobMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -1008,7 +998,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
 
         Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
         weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getStandardId());
-        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(vo.getStandardId(), null);
         List<SysFile> checkImgList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
         sysFiles.forEach(item -> {
@@ -1024,7 +1014,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
 
         Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
         weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getId());
-        List<SysFile> sysFiles2 = sysFileMapper.selectByExample(weekend);
+        List<SysFile> sysFiles2 = sysFileService.getListByTargetAndType(vo.getId(), null);
         List<SysFile> sbFileList = ListUtils.newArrayList();
         sysFiles2.forEach(item -> {
             if (item.getType().equals( SysFileTypeEnum.CHECK_JOB_FILES.getValue())) {
@@ -1110,7 +1100,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         mapper.updateByPrimaryKeySelective(checkJob);
 
         // 提交完成图片信息
-        this.saveFile(dto);
+        sysFileService.saveFile(dto.getId(), SysFileTypeEnum.CHECK_JOB_FILES.getValue(), dto.getImgList());
 
         // 非台时和公里，则需要生成下一次的任务
         List<Integer> statusList = new ArrayList<Integer>();
@@ -1355,18 +1345,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         return mapper.selectCountByExample(weekend);
     }
 
-    private void saveFile(CheckJobDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getImgList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.CHECK_JOB_FILES.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getImgList(), model.getId(),  SysFileTypeEnum.CHECK_JOB_FILES.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
     @Override
     public List<CheckJobReportVO> getMonthReport(CheckJobDTO checkJobDTO, Integer searchYear , LocalDate startMonth, LocalDate endMonth) {
         List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -42,6 +42,7 @@ import com.platform.service.check.CheckStandardService;
 import com.platform.service.check.CheckStandardSpareService;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.part.PartInfoService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.util.SysFileUtils;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -77,7 +78,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
     private CheckStandardSpareService spareService;
     private CheckJobMapper checkJobMapper;
     private PartInfoService partInfoService;
-    private final SysFileMapper sysFileMapper;
+    private final SysFileService sysFileService;
 
     private final SysUserMapper sysUserMapper;
 
@@ -173,8 +174,8 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         }
 
         CheckStandard checkStandard = super.saveModelByDTO(model);
-        this.saveFile(model);
-        this.saveImage(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue(), model.getCheckImgList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.CHECK_STANDARD_FILES.getValue(), model.getCheckFileList());
         // 保存备件
         List<CheckStandardSpareDTO> paramList = model.getDetailList();
         paramList.forEach(item -> {
@@ -247,8 +248,9 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         if(!CollectionUtils.isEmpty(updateDetailList)){
             spareService.updateBatch(updateDetailList);
         }
-        this.saveFile(model);
-        this.saveImage(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue(), model.getCheckImgList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.CHECK_STANDARD_FILES.getValue(), model.getCheckFileList());
+
         // 保存参数
   /*      List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
@@ -257,30 +259,6 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         paramService.saveModelListByDTO(paramList);*/
     }
 
-    private void saveFile(CheckStandardDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getCheckFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.CHECK_STANDARD_FILES.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getCheckFileList(), model.getId(),  SysFileTypeEnum.CHECK_STANDARD_FILES.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
-    private void saveImage(CheckStandardDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getCheckImgList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getCheckImgList(), model.getId(),  SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
     @Override
     public CheckStandard getModelById(Object id) {
         CheckStandard checkStandard = super.getModelById(id);
@@ -296,7 +274,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         }
         Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
         weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, checkStandard.getId());
-        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(checkStandard.getId(), null);
         List<SysFile> checkImgList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
         sysFiles.forEach(item -> {

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -52,6 +52,7 @@ import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.repair.RepairApplicationFormService;
 import com.platform.service.repair.RepairFormService;
 import com.platform.service.sb.SbInfoService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.upms.SysUserService;
 import com.platform.service.util.SysFileUtils;
@@ -88,7 +89,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final SysUserService sysUserService;
     private final SysUserDeptService sysUserDeptService;
     private final SbInfoService sbInfoService;
-    private final SysFileMapper sysFileMapper;
+    private final SysFileService sysFileService;
     private final SysUserMapper userMapper;
     private final RepairFeeMapper repairFeeMapper;
     private final SysUserRoleMapper sysUserRoleMapper;
@@ -318,7 +319,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         BeanUtil.copyProperties(model, vo);
         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> applicationFileList = ListUtils.newArrayList();
         List<SysFile> repairFileList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
@@ -453,7 +454,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         model.setCreatedTime(model.getApplyTime());
         model.setUpdateTime(model.getApplyTime());
         model.setId(IdGeneratorUtils.getObjectId());
-        this.saveFile(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue(), model.getApplicationFileList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue(), model.getRepairFileList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_CHECK_IMGS.getValue(), model.getCheckFileList());
 
         RepairApplicationForm form = BeanConverterUtil.copyObjectProperties(model, RepairApplicationForm.class);
         int result = mapper.insert(form);
@@ -586,59 +589,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             info.setChangeReason("维修停机");
             sbInfoService.updateStatus(info);
         }
-        this.saveFile(model);
-        super.modModelByDTO(model);
-    }
-
-    /**
-     * 保存报修图片
-     *
-     * @param model
-     */
-    private void saveFile(RepairApplicationFormDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getApplicationFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getApplicationFileList(), model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
-    /**
-     * 保存维修图片
-     *
-     * @param model
-     */
-    private void saveRepairFile(RepairApplicationFormDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getRepairFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getRepairFileList(), model.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue(), model.getApplicationFileList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue(), model.getRepairFileList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_CHECK_IMGS.getValue(), model.getCheckFileList());
 
-    /**
-     * 保存验收图片
-     *
-     * @param model
-     */
-    private void saveCheckFile(RepairApplicationFormDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getCheckFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_CHECK_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getCheckFileList(), model.getId(), SysFileTypeEnum.REPAIR_CHECK_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
+        super.modModelByDTO(model);
     }
 
     /**
@@ -788,8 +743,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         applicationForm.setUpdateTime(LocalDateTime.now());
         //applicationForm.setContent(dto.getContent());
         applicationForm.setOutType(dto.getOutType());
-
-        this.saveRepairFile(dto);
+        sysFileService.saveFile(dto.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue(), dto.getRepairFileList());
         super.modModelByPrimaryKey(applicationForm);
 
         // 更新设备状态为使用中

platform-service/src/main/java/com/platform/service/repair/impl/RepairFeeServiceImpl.java

@@ -36,6 +36,7 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.repair.RepairFeeService;
 import com.platform.service.sb.SbInfoService;
 import com.platform.service.upms.SysConfigService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.util.SysFileUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -59,7 +60,8 @@ import java.util.Map;
 @Service("repairFeeService")
 public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, RepairFee, RepairFeeDTO> implements RepairFeeService {
 
-    private final SysFileMapper sysFileMapper;
+
+    private final SysFileService sysFileService;
 
     private final RepairApplicationFormMapper repairApplicationFormMapper;
 
@@ -92,40 +94,16 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
     public RepairFee saveModelByDTO(RepairFeeDTO model) {
         RepairFee result = super.saveModelByDTO(model);
         model.setId(result.getId());
-        this.saveFile(model);
-        this.saveImage(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_FEE_IMGS.getValue(), model.getImageList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_FEE_FILES.getValue(), model.getFileList());
         return result;
     }
 
     @Override
     public void modModelByDTO(RepairFeeDTO model) {
-        this.saveFile(model);
-        this.saveImage(model);
         super.modModelByDTO(model);
-    }
-
-    private void saveFile(RepairFeeDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_FEE_FILES.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getFileList(), model.getId(), SysFileTypeEnum.REPAIR_FEE_FILES.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
-    private void saveImage(RepairFeeDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getImageList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_FEE_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getImageList(), model.getId(), SysFileTypeEnum.REPAIR_FEE_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_FEE_IMGS.getValue(), model.getImageList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_FEE_FILES.getValue(), model.getFileList());
     }
 
     @Override
@@ -133,7 +111,7 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
         RepairFee model = mapper.selectById(id);
         Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
         weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, id);
-        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType((String)id, null);
         List<SysFile> checkImgList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
         sysFiles.forEach(item -> {

platform-service/src/main/java/com/platform/service/repair/impl/RepairReasonServiceImpl.java

@@ -16,6 +16,7 @@ import com.platform.dao.dto.repair.RepairReasonDTO;
 import com.platform.dao.entity.repair.RepairReason;
 import com.platform.dao.mapper.repair.RepairReasonMapper;
 import com.platform.service.repair.RepairReasonService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.util.SysFileUtils;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -34,13 +35,11 @@ import java.util.List;
 @AllArgsConstructor
 @Service("repairReasonService")
 public class RepairReasonServiceImpl extends BaseServiceImpl<RepairReasonMapper, RepairReason, RepairReasonDTO> implements RepairReasonService {
-    private final SysFileMapper sysFileMapper;
+    private final SysFileService sysFileService;
 
     @Override
     public RepairReason getModelById(Object id) {
-        Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-        weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, id);
-        List<SysFile> fileList = sysFileMapper.selectByExample(weekend);
+        List<SysFile> fileList = sysFileService.getListByTargetAndType((String)id, null);
         RepairReason model = super.getModelById(id);
         model.setFileList(fileList);
         return model;
@@ -61,26 +60,16 @@ public class RepairReasonServiceImpl extends BaseServiceImpl<RepairReasonMapper,
         }
         model.setId(IdGeneratorUtils.getObjectId());
         model.setStatus(RepairReasonStatusEnum.NORMAL.getValue());
-        this.saveFile(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_REASON_IMGS.getValue(), model.getFileList());
         return super.saveModelHaveCreateInfo(model);
     }
 
     @Override
     public void modModelByDTO(RepairReasonDTO model) {
         super.modModelByDTO(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_REASON_IMGS.getValue(), model.getFileList());
     }
 
-    private void saveFile(RepairReasonDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_REASON_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getFileList(), model.getId(),  SysFileTypeEnum.REPAIR_REASON_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<RepairReason> weekend = new Weekend<>(RepairReason.class);

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -20,6 +20,7 @@ import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sb.SbInfoService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.upms.SysUserService;
 import com.platform.service.util.SysFileUtils;
 import com.platform.service.wechat.util.WeChatMessageUtil;
@@ -40,7 +41,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
     @Resource
     protected SysUserService sysUserService;
     @Resource
-    private SysFileMapper sysFileMapper;
+    protected SysFileService sysFileService;
 
     @Override
     public RepairApplicationForm callRepair(RepairApplicationFormDTO model) {
@@ -114,7 +115,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         model.setCreatedTime(model.getApplyTime());
         model.setUpdateTime(model.getApplyTime());
         model.setId(IdGeneratorUtils.getObjectId());
-        this.saveFile(model); // 存储报修图片
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue(), model.getApplicationFileList());
         RepairApplicationForm form = BeanConverterUtil.copyObjectProperties(model, RepairApplicationForm.class);
         repairApplicationFormMapper.insert(form);
         return form;
@@ -170,7 +171,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         applicationForm.setUpdateTime(LocalDateTime.now());
         applicationForm.setOutType(dto.getOutType());
         // 保存维修图片
-        saveRepairFile(dto);
+        sysFileService.saveFile(dto.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue(), dto.getRepairFileList());
         repairApplicationFormMapper.updateByPrimaryKeySelective(applicationForm);
         // 更新设备状态为使用中
         SbInfo sbInfo = sbInfoService.getModelById(applicationForm.getSbId());
@@ -270,39 +271,6 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         repairApplicationFormMapper.updateByPrimaryKeySelective(BeanConverterUtil.copyObjectProperties(model, RepairApplicationForm.class));
     }
 
-    /**
-     * 保存维修上传的图片
-     * @param model
-     */
-    private void saveFile(RepairApplicationFormDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getApplicationFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getApplicationFileList(), model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
-    /**
-     * 保存维修图片
-     *
-     * @param model
-     */
-    private void saveRepairFile(RepairApplicationFormDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getRepairFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getRepairFileList(), model.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
     /**
      * 推送站内信和邮箱
      * @param mails

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

@@ -38,6 +38,7 @@ import com.platform.service.check.CheckStandardParamService;
 import com.platform.service.check.CheckStandardService;
 import com.platform.service.part.PartInfoService;
 import com.platform.service.sb.SbMeasureLogService;
+import com.platform.service.upms.SysFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,7 +60,7 @@ import java.util.List;
 @Service("sbMeasureLogService")
 public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper, SbMeasureLog, SbMeasureLogDTO> implements SbMeasureLogService {
     private SbInfoMeasureMapper sbInfoMeasureMapper;
-    private final SysFileMapper sysFileMapper;
+    private final SysFileService sysFileService;
     @Override
     public boolean cascadingDeleteByKey(String id) {
         int result = mapper.deleteByPrimaryKey(id);
@@ -113,7 +114,8 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfoMeasureMapper.updateByPrimaryKey(sbInfo);
 
         // 保存文件
-        this.saveFile(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_IMGS.getValue(), model.getCheckImgList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_FILES.getValue(), model.getCheckFileList());
         // 保存参数
        /* List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
@@ -146,7 +148,8 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfoMeasureMapper.updateByPrimaryKey(sbInfo);
 
         // 保存文件
-        this.saveFile(model);
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_IMGS.getValue(), model.getCheckImgList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_FILES.getValue(), model.getCheckFileList());
         // 保存参数
   /*      List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
@@ -155,34 +158,6 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         paramService.saveModelListByDTO(paramList);*/
     }
 
-    private void saveFile(SbMeasureLogDTO model) {
-        Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-        weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, model.getId());
-        sysFileMapper.deleteByExample(weekend);
-        List<SysFile> checkImgList = model.getCheckImgList();
-        List<SysFile> checkFileList = model.getCheckFileList();
-        List<SysFile> list = ListUtils.newArrayList();
-        if (CollectionUtil.isNotEmpty(checkImgList)) {
-            checkImgList.forEach(item -> {
-                item.setType(SysFileTypeEnum.Sb_MEASURE_IMGS.getValue());
-                item.setId(IdGeneratorUtils.getObjectId());
-                item.setTargetId(model.getId());
-                list.add(item);
-            });
-        }
-        if (CollectionUtil.isNotEmpty(checkFileList)) {
-            checkFileList.forEach(item -> {
-                item.setType(SysFileTypeEnum.Sb_MEASURE_FILES.getValue());
-                item.setId(IdGeneratorUtils.getObjectId());
-                item.setTargetId(model.getId());
-                list.add(item);
-            });
-        }
-        if (CollectionUtil.isNotEmpty(list)) {
-            sysFileMapper.insertListforComplex(list);
-        }
-    }
-
     @Override
     public SbMeasureLog getModelById(Object id) {
         SbMeasureLog checkStandard = super.getModelById(id);
@@ -202,7 +177,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         checkStandard.setSbStatus(sbInfo.getStatus());
         Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
         weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, checkStandard.getId());
-        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(checkStandard.getId(), null);
         List<SysFile> checkImgList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
         sysFiles.forEach(item -> {

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -49,6 +49,7 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.check.CheckStandardService;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sqarepartmanage.SparePartInfoService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.util.CodeFileUtils;
 import com.platform.service.util.SysFileUtils;
 import lombok.AllArgsConstructor;
@@ -86,7 +87,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     private final SbModelSpareBomMapper sbModelSpareBomMapper;
     private final SpareStoreMapper spareStoreMapper;
     private final Environment environment;
-    private final SysFileMapper sysFileMapper;
+    private final SysFileService sysFileService;
     private final SparePartUsedMapper sparePartUsedMapper;
     private CheckJobMapper checkJobMapper;
     private CheckStandardSpareMapper checkStandardSpareMapper;
@@ -721,18 +722,6 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         super.modModelByDTO(model);
     }
 
-    private void saveFile(SparePartInfoDTO model) {
-        if (CollectionUtil.isNotEmpty(model.getApplicationFileList())) {
-            Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
-            weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.SPARE_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
-            sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getApplicationFileList(), model.getId(), SysFileTypeEnum.SPARE_IMGS.getValue());
-            if (CollectionUtil.isNotEmpty(list)) {
-                sysFileMapper.insertListforComplex(list);
-            }
-        }
-    }
-
     /**
      * 导入备件基础信息
      *