From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] （部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，
---
ycl-server/src/main/java/com/ycl/task/DeleteWorkOrderImgTask.java | 11 +++--
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 2 +
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 63 +++++++++++++++++++------------
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 2 +
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 1
5 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
index a233dea..83a5d7e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
@@ -78,12 +78,14 @@
/**
* 鐢熸晥鏃堕棿
*/
+ @Excel(name = "寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginCreateTime;
/**
* 澶辨晥鏃堕棿
*/
+ @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index d367241..4b06f6c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -342,6 +342,7 @@
item.setResultStr(records.get(0).getResult() ? "閫氳繃" : "鏈�氳繃");
item.setResultRemark(records.get(0).getResultRemark());
item.setAuditingTime(records.get(0).getCreateTime());
+
} else {
item.setResultStr("瀹℃牳涓�");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index e022a25..d557e97 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.util.StringUtil;
import com.ycl.config.PlatformConfig;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
@@ -30,6 +31,7 @@
import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
+import com.ycl.task.DeleteWorkOrderImgTask;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.http.HttpUtils;
@@ -106,6 +108,8 @@
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private DeleteWorkOrderImgTask deleteWorkOrderImgTask;
@Override
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
@@ -609,33 +613,41 @@
img.setWorkOrderNo(workOrder.getWorkOrderNo());
img.setImgUrl(frameImg);
img.setCreateTime(new Date());
- //鍒ゆ柇璇ュ伐鍗曠殑鍥剧墖鏄惁宸茬粡澶т簬5寮犱簡
- LambdaQueryChainWrapper<WorkOrderCheckImg> qw = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper);
-
- //鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
- List<WorkOrderCheckImg> workOrderList = workOrderCheckImgMapper.selectList(
- new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
- .eq(WorkOrderCheckImg::getWorkOrderNo, workOrder.getWorkOrderNo())
- .orderByDesc(WorkOrderCheckImg::getCreateTime)
- );
//淇濈暀鏈�鏂扮殑5寮�
- if (workOrderList.size()>=5){
- List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
- List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
- //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
-
-// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
- for (String filePath: imgList){
- delImgFormClient(filePath);
- }
- workOrderCheckImgMapper.deleteBatchIds(idList);
-
- }
-
-
workOrderCheckImgMapper.insert(img);
}
}
+
+ /**
+ * 娓呯悊宸ュ崟鍥剧墖
+ * */
+ public void clearWorkOrderImg(String workOrderNo) {
+ //鍒ゆ柇璇ュ伐鍗曠殑鍥剧墖鏄惁宸茬粡澶т簬5寮犱簡
+ //鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
+ if (StringUtil.isEmpty(workOrderNo)) {
+ return;
+ }
+ List<WorkOrderCheckImg> workOrderList = new LambdaQueryChainWrapper<WorkOrderCheckImg>(workOrderCheckImgMapper)
+ .select()
+ .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
+ .orderByDesc(WorkOrderCheckImg::getCreateTime)
+ .list();
+ if (workOrderList.size()>=5){
+ List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+ List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
+ //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
+
+// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
+ log.error("鍒犻櫎宸ュ崟鐓х墖闆嗗悎url:{}",imgList);
+ log.error("鍒犻櫎宸ュ崟瀛樺偍鏁版嵁闆嗗悎id:{}",idList);
+ for (String filePath: imgList){
+ delImgFormClient(filePath);
+ }
+ workOrderCheckImgMapper.deleteBatchIds(idList);
+ }
+
+ }
+
@Override
public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
@@ -697,7 +709,8 @@
log.error("url閿欒锛歿}",imgPath);
}else{
//鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath + / + yyyy-MM-dd +
- String pathName = PlatformConfig.getUploadPath() + "/" + FileUtils.extractDateFromString(url);
+ String pathName = DeleteWorkOrderImgTask.imgSaveBasePath + "/" + FileUtils.extractDateFromString(url);
+ log.error("鍒犻櫎宸ュ崟鍥剧墖闆嗗悎{}",pathName+"/" + imgPath);
FileUtils.deleteFile(pathName+"/" + imgPath);
}
}
@@ -1231,6 +1244,8 @@
List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo());
List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
workOrder.setErrorTypeList(errList);
+ //璇︽儏鏃跺啀娆℃竻鐞�
+ clearWorkOrderImg(workOrderNo);
// 妫�娴嬪浘鐗�
List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
.eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
diff --git a/ycl-server/src/main/java/com/ycl/task/DeleteWorkOrderImgTask.java b/ycl-server/src/main/java/com/ycl/task/DeleteWorkOrderImgTask.java
index 4eceead..d49887c 100644
--- a/ycl-server/src/main/java/com/ycl/task/DeleteWorkOrderImgTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/DeleteWorkOrderImgTask.java
@@ -17,26 +17,29 @@
@Component("DeleteWorkOrderImgTask")
public class DeleteWorkOrderImgTask {
private final ISysConfigService configService;
-
+ public static String imgSaveBasePath = "/opt/zgyw/uploadPath";
public void delWorkOrderImg() {
+
String basePath = PlatformConfig.getUploadPath();
log.info("寮�濮嬪垹闄ゅ伐鍗曠収鐗�");
- log.info("鍒犻櫎涓昏矾寰勶細{}",basePath); // /opt/zgyw/uploadPath
+ log.info("鍒犻櫎涓昏矾寰勶細{}",basePath); // /opt/zgyw/uploadPath/upload
+ log.info("闈欐�佽缃湴鍧�锛歿}",imgSaveBasePath);
//瀛楀吀鏌ヨ闇�瑕佸垹闄ゆ椂闂村湪鍑犱釜鏈堝墠鐨勭収鐗�
String dictLabel = configService.selectConfigByKey("del.workorder.time");
log.info("娓呯悊鏃堕棿:{}鏈�",dictLabel);
if (StringUtils.isEmpty(dictLabel)) {
log.info("鏈缃垹闄ゆ椂闂磋寖鍥�");;
dictLabel = "6";
+ log.info("榛樿6鏈堝墠鐨勫浘鐗�");
}
- log.info("榛樿6鏈堝墠鐨勫浘鐗�");
+
//鑾峰緱褰撳墠鏃堕棿
LocalDate nowDate = LocalDate.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
//璁＄畻 锛� 鏈堝墠鐨勬棩鏈� 锛� 鐢ㄥ瓧鍏稿瓨鍏ョ郴缁熶腑
LocalDate sixMonthAgo = nowDate.minusMonths(Long.parseLong(dictLabel));
//璇诲彇鏈嶅姟鍣ㄤ腑鐨勬枃浠跺す鍚�
- File directory = new File(basePath);
+ File directory = new File(imgSaveBasePath);
//妫�娴嬭矾寰勫瓨鍦� 骞朵笖鏄竴涓洰褰�
if (directory.exists() && directory.isDirectory()) {
//鑾峰緱 鐩綍闆嗗悎
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 732099c..92adff2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -16,6 +16,8 @@
<result column="report_content" property="reportContent" />
<result column="report_materials" property="reportMaterials" />
<result column="error_type" property="errorType" />
+ <result column="begin_create_time" property="beginCreateTime"/>
+ <result column="end_create_time" property="endCreateTime"/>
</resultMap>
<select id="page" resultType="com.ycl.platform.domain.vo.ReportVO">
--
Gitblit v1.8.0