From 083df8d788c95c009a94378e620684eb5de2bd21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:08:09 +0800
Subject: [PATCH] 注释问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineFileService.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineFileService.java
index b62643e..f0414b3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineFileService.java
+++ b/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);
+ }
}
--
Gitblit v1.9.3