From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null,为前端添加数据默认为0

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |  199 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 181 insertions(+), 18 deletions(-)

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 81b9299..80dd2b3 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
@@ -35,6 +35,7 @@
 import com.ycl.utils.http.HttpUtils;
 import com.ycl.utils.redis.RedisCache;
 import com.ycl.utils.uuid.IdUtils;
+import constant.ApiConstants;
 import constant.Constants;
 import constant.RedisConstant;
 import enumeration.ErrorType;
@@ -59,6 +60,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import pojo.CascadeOption;
+import utils.file.FileUtils;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -79,6 +81,7 @@
 public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
 
     private final YwPointService ywPointService;
+    private final YwPointMapper ywPointMapper;
     private final TMonitorMapper monitorMapper;
     private final DynamicColumnMapper dynamicColumnMapper;
     private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
@@ -213,6 +216,7 @@
         }
         List<String> willAddSerialNumber = waitAddList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
         //鍙敓鎴愯�冩牳璁惧銆佷笖鏈夎繍缁村崟浣嶇殑宸ュ崟
+
         List<YwPoint> pointList = new LambdaQueryChainWrapper<>(ywPointService.getBaseMapper())
                 .select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getImportantCommandImageTag)
                 .in(YwPoint::getSerialNumber, willAddSerialNumber)
@@ -285,6 +289,7 @@
             }
             log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}", workOrder);
         }
+
         redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
         redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
         // 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
@@ -348,15 +353,15 @@
         List<WorkOrderYwConditionRecord> willAddMsg = new ArrayList<>(48);
         // 鍗冲皢瑕佹坊鍔犵殑閿欒绫诲瀷
         List<WorkOrderErrorType> willAddErrorType = new ArrayList<>(96);
-        if(!CollectionUtils.isEmpty(inDatabaseWorkOrderList)){
+        if (!CollectionUtils.isEmpty(inDatabaseWorkOrderList)) {
             WorkOrder workOrderInDB = inDatabaseWorkOrderList.get(0);
             List<String> errorNameList = workOrderInDB.getErrorTypeList();
             List<String> errorTypes = entity.getErrorTypeList();
-            if(errorNameList.containsAll(errorTypes)){
+            if (errorNameList.containsAll(errorTypes)) {
                 return Result.error("宸叉湁鍚岀鏁呴殰绫诲瀷宸ュ崟");
-            }else {
+            } else {
                 for (String errorType : errorTypes) {
-                    if(!errorNameList.contains(errorType)){
+                    if (!errorNameList.contains(errorType)) {
                         // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨柊澧炰竴涓敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
                         WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
                         workOrderErrorType.setWorkOrderNo(workOrderInDB.getWorkOrderNo());
@@ -394,7 +399,7 @@
                 }
             }
             return Result.ok("娣诲姞鎴愬姛");
-        }else {
+        } else {
             //鏁版嵁搴撴病鏈夋鍦ㄨ繘琛岀殑宸ュ崟
             //鏌edis浠婃棩宸ュ崟鏁伴噺
             int workOrderNum = 0;
@@ -421,7 +426,7 @@
             workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
             if (baseMapper.insert(entity) > 0) {
                 return Result.ok("娣诲姞鎴愬姛");
-            }else {
+            } else {
                 return Result.error("娣诲姞澶辫触");
             }
         }
@@ -470,10 +475,25 @@
                 UrgentLevelEnum.WARNING,
                 workOrder.getWorkOrderNo());
         notifyService.save(notify);
+        List<WorkOrderVO> workOrderVOS = workOrderErrorTypeMapper.getErrorListByNumbers(Arrays.asList(workOrder.getWorkOrderNo()));
+
         // 鍚屾鐐逛綅鐘舵��
         if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
             ywPointService.updateRecovery(Collections.singletonList(workOrder.getSerialNumber()), 0);
+            //濡傛灉宸ュ崟涓虹绾垮伐鍗曢偅涔堜慨鏀圭偣浣峱ingOnline涓哄湪绾�
+            if (!CollectionUtils.isEmpty(workOrderVOS)) {
+                List<String> ips = new ArrayList<>();
+                for (WorkOrderVO workOrderVO : workOrderVOS) {
+                    if(ErrorType.DEVICE_OFFLINE.getValue().equals(workOrderVO.getErrorType())){
+                        ips.add(workOrderVO.getIp());
+                    }
+                }
+                if(!CollectionUtils.isEmpty(ips)) {
+                    monitorMapper.batchUpdateOnline(ips, new Date(), ApiConstants.UY_OnlineSite_Online);
+                }
+            }
         }
+
         return Result.ok("鎿嶄綔鎴愬姛");
     }
 
@@ -513,11 +533,30 @@
                     workOrder.getWorkOrderNo());
             notifies.add(notify);
         }
+        notifyService.saveBatch(notifies);
         // 鍚屾鐐逛綅鐘舵��
         if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
             ywPointService.updateRecovery(serialNumbers, 0);
+            //绛涢�夊嚭绂荤嚎宸ュ崟ip骞朵慨鏀瑰湪绾跨姸鎬�
+            if (!CollectionUtils.isEmpty(serialNumbers)) {
+                Map<String, List<String>> errorTypes = workOrderErrorTypeMapper.getErrorListByNumbers(workOrderNoList).stream().collect(Collectors.groupingBy(
+                        WorkOrderVO::getIp,
+                        Collectors.mapping(
+                                WorkOrderVO::getErrorType,
+                                Collectors.toList()
+                        )
+                ));
+                List<String> ips = new ArrayList<>();
+                errorTypes.forEach((key, value) -> {
+                    if (!CollectionUtils.isEmpty(value) && value.contains(ErrorType.DEVICE_OFFLINE.getValue())) {
+                        ips.add(key);
+                    }
+                });
+                if(!CollectionUtils.isEmpty(ips)) {
+                    monitorMapper.batchUpdateOnline(ips, new Date(), ApiConstants.UY_OnlineSite_Online);
+                }
+            }
         }
-        notifyService.saveBatch(notifies);
         return Result.ok("鎿嶄綔鎴愬姛");
     }
 
@@ -569,6 +608,30 @@
             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);
         }
     }
@@ -614,9 +677,28 @@
     @Override
     public Result remove(List<String> ids) {
         if (baseMapper.deleteBatchIds(ids) > 0) {
+            //鎵归噺鍒犻櫎鏄惁琚敤鍒�?
+
             return Result.ok("鍒犻櫎鎴愬姛");
         }
         return Result.error("鍒犻櫎澶辫触");
+    }
+
+    /***
+     * 閫氳繃url鍒犻櫎鏈嶅姟鍣ㄥ唴鐨勫浘鐗�
+     * @param url
+     */
+    public void delImgFormClient(String url){
+        //鎻愬彇鏂囦欢鍚�  /profile/2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+        // 杩欓儴鍒�2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+        String imgPath = FileUtils.getImgName(url);
+        if (imgPath.isEmpty()){
+            log.error("url閿欒锛歿}",imgPath);
+        }else{
+            //鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath  + /  + yyyy-MM-dd +
+            String pathName = PlatformConfig.getUploadPath() + "/" + FileUtils.extractDateFromString(url);
+            FileUtils.deleteFile(pathName+"/" + imgPath);
+        }
     }
 
     /**
@@ -631,6 +713,18 @@
         String workOrderNo = workOrder.getWorkOrderNo();
         //鍒犻櫎宸ュ崟瀹℃牳璁板綍
         workOrderAuditingRecordMapper.delete(new QueryWrapper<WorkOrderAuditingRecord>().eq("work_order_no", workOrderNo));
+        //闇�瑕佺墿鐞嗗垹闄ゆ湇鍔″櫒涓殑鍥剧墖
+        //鏌ヨ鍒板伐鍗曠収鐗囬泦鍚�
+        List<String> workOrderImg = workOrderCheckImgMapper
+                .selectList(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo))
+                .stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+        log.error("鍒犻櫎宸ュ崟鍥剧墖闆嗗悎:{}",workOrderImg);
+        log.error("鍒犻櫎璺緞:{}",PlatformConfig.getUploadPath());
+
+        for (String filePath: workOrderImg){
+            delImgFormClient(filePath);
+        }
+
         //鍒犻櫎宸ュ崟鍥剧墖璁板綍
         workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo));
         //鍒犻櫎宸ュ崟涓嬪彂璁板綍
@@ -646,6 +740,9 @@
         return Result.error("鍒犻櫎澶辫触");
     }
 
+
+
+
     /**
      * 鍒嗛〉鏌ヨ
      *
@@ -660,6 +757,20 @@
         }
         if (query.getStart() != null) query.setStart(DateUtils.getDayStart(query.getStart()));
         if (query.getEnd() != null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+        if (query.getErrorType() != null) {
+            List<String> errorTypeList = new ArrayList<>();
+            errorTypeList.add(query.getErrorType());
+            if (ErrorType.ABNORMAL_PIC.getValue().equals(query.getErrorType())) {
+                //List娣诲姞涔嬪墠鍑犵宸ュ崟绫诲瀷
+                errorTypeList.add(ErrorType.SIGNAL_LOSS.getValue());
+                errorTypeList.add(ErrorType.SCREEN_COLOR_DEVIATION.getValue());
+                errorTypeList.add(ErrorType.SNOW_STORM.getValue());
+                errorTypeList.add(ErrorType.STRIPE_INTERFERENCE.getValue());
+                errorTypeList.add(ErrorType.SCREEN_OCCLUSION.getValue());
+                errorTypeList.add(ErrorType.ABNORMAL_CLARITY.getValue());
+            }
+            query.setErrorTypeList(errorTypeList);
+        }
         baseMapper.page(page, query);
         if (!CollectionUtils.isEmpty(page.getRecords())) {
             page.getRecords().stream().forEach(item -> {
@@ -1097,6 +1208,11 @@
     @Override
     public Result detailByNo(String workOrderNo) {
         WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
+        //鎶ョ┖鍘熷洜1. sql 涓� inner join 琛� t_work_order_distribute_record 涓� 鏃犱笌璇ヨ〃鍏宠仈鐨勮褰� wo.work_order_no = dr.work_order_no
+        if(workOrder == null){
+            workOrder = baseMapper.detailByNoButNoDistributeRecord(workOrderNo);
+        }
+
         // 鏄惁鎶ュ
         boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
                 .eq(Report::getSerialNumber, workOrder.getSerialNumber())
@@ -1116,9 +1232,13 @@
         return Result.ok().data(workOrder);
     }
 
+    @Autowired
+    private WorkOrderMapper workOrderMapper;
+
     /**
      * 宸ュ崟瀵煎嚭鐨勯�昏緫
      * 鏍囩锛氬悓涓�涓猧p鏍囩鍚堝湪涓�璧凤紝閽堝绂荤嚎宸ュ崟锛坕p鐩稿悓灏变笉浼氱敓鎴愬伐鍗曪級锛屾柟渚胯繍缁村鐞�
+     *
      * @param query
      * @return
      */
@@ -1129,8 +1249,46 @@
         }
         if (query.getStart() != null) query.setStart(query.getStart() + " 00:00:00");
         if (query.getEnd() != null) query.setEnd(query.getEnd() + " 23:59:59");
+        if (query.getErrorType() != null) {
+            List<String> errorTypeList = new ArrayList<>();
+            errorTypeList.add(query.getErrorType());
+            if (ErrorType.ABNORMAL_PIC.getValue().equals(query.getErrorType())) {
+                //List娣诲姞涔嬪墠鍑犵宸ュ崟绫诲瀷
+                errorTypeList.add(ErrorType.SIGNAL_LOSS.getValue());
+                errorTypeList.add(ErrorType.SCREEN_COLOR_DEVIATION.getValue());
+                errorTypeList.add(ErrorType.SNOW_STORM.getValue());
+                errorTypeList.add(ErrorType.STRIPE_INTERFERENCE.getValue());
+                errorTypeList.add(ErrorType.SCREEN_OCCLUSION.getValue());
+                errorTypeList.add(ErrorType.ABNORMAL_CLARITY.getValue());
+            }
+            query.setErrorTypeList(errorTypeList);
+        }
         List<WorkOrderVO> export = baseMapper.export(query);
-        if(CollectionUtils.isEmpty(export)) return new ArrayList<WorkOrderVO>();
+
+
+        List<String> workOrderNos = export.stream().map(WorkOrderVO::getWorkOrderNo).collect(Collectors.toList());
+        List<WorkOrderVO> auditTimeList = workOrderMapper.getAuditTimeList(workOrderNos);
+        Map<String, List<Date>> auditTimeMap = auditTimeList.stream()
+                .collect(Collectors.groupingBy(
+                        WorkOrderVO::getWorkOrderNo, // 鍒嗙粍鐨勯敭
+                        Collectors.mapping(WorkOrderVO::getAuditTime, Collectors.toList())));
+        if (!CollectionUtils.isEmpty(workOrderNos)){
+           export.forEach(workOrderVO -> {
+               List<Date> auditTimes = auditTimeMap.get(workOrderVO.getWorkOrderNo());
+               if (!CollectionUtils.isEmpty(auditTimes)){
+                   //瀹℃牳閫氳繃鏃堕棿
+                   Date passTime = Collections.max(auditTimes);
+                   ZoneId zoneId = ZoneId.systemDefault();
+                   workOrderVO.setPassTime(passTime.toInstant().atZone(zoneId).toLocalDateTime());
+               }
+           });
+        }
+
+
+
+
+
+        if (CollectionUtils.isEmpty(export)) return new ArrayList<WorkOrderVO>();
         List<String> ips = export.stream().map(WorkOrderVO::getIp).collect(Collectors.toList());
         //鏌ュ嚭鐩稿悓ip鐨勮澶囥�佸苟鏌ュ嚭鏍囩
         List<TMonitorResult> monitorVOS = monitorMapper.getByIp(ips);
@@ -1145,7 +1303,7 @@
                 tMonitorResult.setDynamicColumnList(map.get(pointId));
             }
         }
-        export.forEach(result->{
+        export.forEach(result -> {
             StringBuilder dynamicTag = new StringBuilder("");
             Boolean provinceTagVideo = false;
             Boolean provinceTagCar = false;
@@ -1155,18 +1313,23 @@
             Boolean deptTag = false;
             List<String> dynamicTags = new ArrayList<>();
             for (TMonitorResult tagVO : monitorVOS) {
-                if(tagVO.getIp().equals(result.getIp())){
-                    if(tagVO.getProvinceTagVideo()) provinceTagVideo = true;
-                    if(tagVO.getProvinceTagCar()) provinceTagCar = true;
-                    if(tagVO.getProvinceTagFace()) provinceTagFace = true;
-                    if(tagVO.getImportantTag()) importantTag = true;
-                    if(tagVO.getImportantCommandImageTag()) importantCommandImageTag = true;
-                    if(tagVO.getDeptTag()) deptTag = true;
+                //鐪佸巺鏍囩閫氳繃ip鍒ゆ柇 (杩愮淮瑕佹眰)
+                if (tagVO.getIp().equals(result.getIp())) {
+                    if (tagVO.getProvinceTagVideo()) provinceTagVideo = true;
+                    if (tagVO.getProvinceTagCar()) provinceTagCar = true;
+                    if (tagVO.getProvinceTagFace()) provinceTagFace = true;
+                    if (tagVO.getImportantTag()) importantTag = true;
+                    if (tagVO.getImportantCommandImageTag()) importantCommandImageTag = true;
+                    if (tagVO.getDeptTag()) deptTag = true;
+                }
+                //鍔ㄦ�佸垪鏍规嵁鍥芥爣鍒ゆ柇
+                if (tagVO.getNo().equals(result.getSerialNumber())) {
                     //鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
                     if (!CollectionUtils.isEmpty(tagVO.getDynamicColumnList())) {
                         List<DynamicColumnVO> dynamicColumnList = tagVO.getDynamicColumnList();
                         for (DynamicColumnVO dynamicColumnVO : dynamicColumnList) {
-                            if(!dynamicTags.contains(dynamicColumnVO.getColumnValue())) dynamicTags.add(dynamicColumnVO.getColumnValue());
+                            if (!dynamicTags.contains(dynamicColumnVO.getColumnValue()))
+                                dynamicTags.add(dynamicColumnVO.getColumnValue());
                         }
                     }
                 }
@@ -1174,7 +1337,7 @@
             for (String tag : dynamicTags) {
                 dynamicTag.append(tag).append("銆�");
             }
-            StringBuilder tag = new StringBuilder("" + (provinceTagVideo ? "鐪佸巺瑙嗛銆�" : "")+(provinceTagCar ? "鐪佸巺杞﹁締銆�" : "")+(provinceTagFace ? "鐪佸巺浜鸿劯銆�" : "") + (importantTag ? "閲嶇偣鐐逛綅銆�" : "") + (importantCommandImageTag ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (deptTag ? "閮ㄧ骇銆�" : ""));
+            StringBuilder tag = new StringBuilder("" + (provinceTagVideo ? "鐪佸巺瑙嗛銆�" : "") + (provinceTagCar ? "鐪佸巺杞﹁締銆�" : "") + (provinceTagFace ? "鐪佸巺浜鸿劯銆�" : "") + (importantTag ? "閲嶇偣鐐逛綅銆�" : "") + (importantCommandImageTag ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (deptTag ? "閮ㄧ骇銆�" : ""));
             if (tag.toString().endsWith("銆�")) {
                 tag = new StringBuilder(tag.substring(0, tag.length() - 1));
             }

--
Gitblit v1.8.0