注释问题修复

yangys

2025-09-13 083df8d788c95c009a94378e620684eb5de2bd21

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineFileService.java

@@ -11,16 +11,15 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.machinefile.entity.MachineFileChangeHis;
import org.springblade.mdm.machinefile.mapper.MachineFileMapper;
import org.springblade.mdm.machinefile.vo.MachineFileQueryVO;
import org.springblade.mdm.machinefile.vo.MachineAcceptedFileHandleQueryVO;
import org.springblade.mdm.machinefile.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machinefile.vo.MachineAcceptedFileVO;
import org.springblade.mdm.program.vo.CompareDataVO;
import org.springblade.mdm.statreport.vo.MachineFileExceptionQueryVO;
import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -206,4 +205,45 @@

      return vo;
   }

   /**
    * 刷新文件信息，不存在新增，存在则更新
    * @param mf
    */
   public void refreshFileData(MachineFile mf) {
      MachineFile existFileInDb = getExistsFile(mf.getName(),mf.getDirType(),mf.getMachineCode());
      if(existFileInDb == null) {
         save(mf);
      }else{
         log.info("文件在库中已存在:{}",mf.getName());
         existFileInDb.setFileSize(mf.getFileSize());
         existFileInDb.setProgramStatus(mf.getProgramStatus());
         existFileInDb.setFileCreateTime(mf.getFileCreateTime());
         existFileInDb.setFileModifyTime(mf.getFileModifyTime());
         if(!com.alibaba.excel.util.StringUtils.equals(existFileInDb.getMd5(),mf.getMd5())){
            //文件内容发生变化了,设置状态为初始状态
            existFileInDb.setStatus(MachineFile.STATUS_NORMAL);
         }
         existFileInDb.setMd5(mf.getMd5());
         updateById(existFileInDb);
      }
   }

   /**
    * 物理删除文件信息
    * @param id 数据id
    */
   public void deleteById(Long id) {
      baseMapper.deleteById(id);
   }

   /**
    * 异常文件记录查询
    * @param query
    * @return
    */
   @Transactional(readOnly = true)
    public IPage<MachineFile> exceptionFilePageQuery(MachineFileExceptionQueryVO query) {
      return baseMapper.exceptionFilePageQuery(Condition.getPage(query),query);
    }
}