From 3dc714284a95fe9677a964ec039b2b547547e30d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 05 十一月 2024 11:20:37 +0800
Subject: [PATCH] 工单异步获取图片、工单导出时间参数bug

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |  166 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 150 insertions(+), 16 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 dba4383..fe5aea3 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
@@ -3,6 +3,8 @@
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -12,6 +14,7 @@
 import com.ycl.config.ServerConfig;
 import com.ycl.exception.ServiceException;
 import com.ycl.platform.domain.entity.*;
+import com.ycl.platform.domain.excel.PointExport;
 import com.ycl.platform.domain.form.*;
 import com.ycl.platform.domain.query.*;
 import com.ycl.platform.domain.vo.*;
@@ -37,6 +40,8 @@
 import com.ycl.utils.http.HttpUtils;
 import com.ycl.utils.redis.RedisCache;
 import com.ycl.utils.uuid.IdUtils;
+import constant.ApiConstants;
+import constant.CheckConstants;
 import constant.Constants;
 import constant.RedisConstant;
 import enumeration.general.*;
@@ -49,7 +54,9 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -94,6 +101,9 @@
     private final SysConfigMapper configMapper;
     private final ReportMapper reportMapper;
     private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
+    private final WorkOrderWhiteMapper workOrderWhiteMapper;
+    private final DeviceInfoMapper deviceInfoMapper;
+    private final ApplicationContext applicationContext;
     @Value("${rtsp.server:http://127.0.0.1:7788}")
     private String rtspServer;
 
@@ -107,9 +117,14 @@
     @Transactional(rollbackFor = Exception.class)
     public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
         int total = workOrderList.size();
-        workOrderList.stream().filter(item -> {
+        // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
+        List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
+        // 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
+        workOrderList = workOrderList.stream().filter(item -> !serialNumbers.contains(item.getSerialNumber()))
+                        .collect(Collectors.toList());
+        workOrderList = workOrderList.stream().filter(item -> {
             return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
-        });
+        }).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(workOrderList)) {
             return Boolean.TRUE;
         }
@@ -161,7 +176,10 @@
                             willAddErrorType.add(workOrderErrorType);
                         }
                     }
-                    databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+                    //閬垮厤浠d笅鍙戠殑宸ュ崟鐩存帴鍙樻垚涓嬪彂
+                    if(!databaseWorkOrder.getStatus().equals(WorkOrderStatusEnum.WAIT_DISTRIBUTE)) {
+                        databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+                    }
                     databaseWorkOrder.setUpdateTime(now);
                     willUpdateStatusWorkOrderList.add(databaseWorkOrder);
                     updateNum++;
@@ -199,9 +217,11 @@
             return Boolean.TRUE;
         }
         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::getProvinceTag, YwPoint::getImportantCommandImageTag)
                 .in(YwPoint::getSerialNumber, willAddSerialNumber)
+                .eq(YwPoint::getExamineStatus, Boolean.TRUE)
                 .list();
         Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
         // 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
@@ -321,19 +341,26 @@
             return Result.error("宸ュ崟姝e湪娣诲姞锛岃绋嶅悗鍐嶈瘯");
         }
         WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
-        entity.setCreateTime(DateUtils.getNowDate());
-        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
-        Date now = new Date();
-        entity.setCreateTime(now);
-        entity.setUpdateTime(now);
-        entity.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
-        entity.setErrorType(String.join(",", form.getErrorType()));
-        List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
-        workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
-        if (baseMapper.insert(entity) > 0) {
-            return Result.ok("娣诲姞鎴愬姛");
+        // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
+        List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
+        // 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
+         if (serialNumbers.contains(entity.getSerialNumber())){
+            return Result.error("璇ヨ澶囧湪鐧藉悕鍗曚腑锛屼笉鑳芥坊鍔犲伐鍗�");
+        }else {
+            entity.setCreateTime(DateUtils.getNowDate());
+            entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+            Date now = new Date();
+            entity.setCreateTime(now);
+            entity.setUpdateTime(now);
+            entity.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
+            entity.setErrorType(String.join(",", form.getErrorType()));
+            List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
+            workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
+            if (baseMapper.insert(entity) > 0) {
+                return Result.ok("娣诲姞鎴愬姛");
+            }
+            return Result.error("娣诲姞澶辫触");
         }
-        return Result.error("娣诲姞澶辫触");
     }
 
     /**
@@ -436,6 +463,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result ywCondition(WorkOrderYWConditionForm form) {
+
         WorkOrder workOrder = baseMapper.selectById(form.getId());
         if (Objects.isNull(workOrder)) {
             throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
@@ -452,9 +480,37 @@
         workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
         workOrderYwConditionRecord.setSysMsg(Boolean.FALSE);
         workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+        //寮傛鑾峰彇鍥剧墖
+        WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+        self.getImage(workOrder);
         return Result.ok("鎿嶄綔鎴愬姛");
     }
 
+    @Async("threadPoolTaskExecutor")
+    public void getImage(WorkOrder workOrder) {
+        List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
+                .orderByDesc(DeviceInfo::getUpdateTime)
+                .last("limit 1")
+                .list();
+        if (CollectionUtils.isEmpty(gbDevices)) {
+            return;
+        }
+        // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠h〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
+        String frameImg = null;
+        try {
+            log.info("鍥芥爣骞冲彴:{},璁惧缂栫爜:{},宸ュ崟鍙�:{}",gbDevices.get(0).getDeviceId(), workOrder.getSerialNumber(), workOrder.getWorkOrderNo());
+            frameImg = this.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), workOrder.getSerialNumber(), workOrder.getWorkOrderNo());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (StringUtils.hasText(frameImg)) {
+            WorkOrderCheckImg img = new WorkOrderCheckImg();
+            img.setWorkOrderNo(workOrder.getWorkOrderNo());
+            img.setImgUrl(frameImg);
+            img.setCreateTime(new Date());
+            workOrderCheckImgMapper.insert(img);
+        }
+    }
     @Override
     public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
         List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
@@ -768,6 +824,7 @@
     @Override
     public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception {
         String url = String.format(this.rtspServer + "/api/play/start/img/%s/%s", deviceId, channelId);
+        log.info("璁块棶璺緞{}",url);
         String result = HttpUtils.sendGet(url);
         log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + result);
         WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
@@ -975,7 +1032,7 @@
             query.setStart(query.getStart() + " 00:00:00");
         }
         if (query.getEnd() == null) {
-            query.setStart(format.format(DateUtils.getDayEnd(new Date())));
+            query.setEnd(format.format(DateUtils.getDayEnd(new Date())));
         } else {
             query.setEnd(query.getEnd() + " 23:59:59");
         }
@@ -985,4 +1042,81 @@
         System.out.println(export);
         return export;
     }
+
+    /**
+     * 宸ュ崟鐧藉悕鍗曞垪琛�
+     *
+     * @param query 鏌ヨ
+     * @return {@link List }<{@link WorkOrderWhite }>
+     * @author
+     */
+    @Override
+    public Result selectWorkOrderWhiteList(WorkOrderWhiteQuery query) {
+        IPage<WorkOrderWhite> page = PageUtil.getPage(query, WorkOrderWhite.class);
+        workOrderWhiteMapper.page(page, query);
+        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    }
+
+    /**
+     * 娣诲姞宸ュ崟鐧藉悕鍗�
+     *
+     * @param workOrderWhite 鐧借壊宸ュ崟
+     * @return {@link Result }
+     * @author
+     */
+    @Override
+    public Result addWorkOrderWhite(WorkOrderWhite workOrderWhite) {
+        // 閫氳繃璁惧缂栫爜鏌ヨ璁惧淇℃伅
+        YwPoint ywPoint = ywPointService.selectBySerialNumber(workOrderWhite.getSerialNumber());
+        // 鏂板鐧藉悕鍗曡澶囪褰�
+        if (ywPoint == null){
+            return Result.error("璁惧涓嶅瓨鍦�");
+        }
+        // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄨ鐧藉悕鍗�
+        WorkOrderWhite flag = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber());
+        if (flag != null) {
+            return Result.error("璇ヨ澶囧凡瀛樺湪鐧藉悕鍗�");
+        } else {
+            workOrderWhite.setPointName(ywPoint.getPointName());
+            workOrderWhite.setCreateBy(SecurityUtils.getUsername());
+            workOrderWhiteMapper.insert(workOrderWhite);
+            return Result.ok();
+        }
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�
+     *
+     * @param ids ids
+     * @author
+     */
+    @Override
+    public Result batchDeleteWorkOrderWhite(List<String> ids) {
+        workOrderWhiteMapper.batchDelete(ids);
+        return Result.ok();
+    }
+
+    /**
+     * 鎵归噺瀵煎叆鐧藉悕鍗�
+     *
+     * @param dataList 鏁版嵁鍒楄〃
+     * @author
+     */
+    @Override
+    public void batchImportWhite(List<PointExport> dataList) {
+        // 鑾峰緱鎵�鏈夐渶瑕佹柊澧炵殑鐧藉悕鍗曞璞�
+        List<WorkOrderWhite> whitelist = dataList.stream().map(pointExport ->
+                        new WorkOrderWhite(pointExport.getSerialNumber(), pointExport.getPointName(), SecurityUtils.getUsername()))
+                .collect(Collectors.toList());
+        // 鑾峰緱鎵�鏈夊凡瀛樺湪鐨勭櫧鍚嶅崟璁惧缂栫爜
+        List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
+        // 绛涢�夊嚭鏂板銆佷慨鏀圭殑鐧藉悕鍗曞璞�
+        List<WorkOrderWhite> updateWhiteList = whitelist.stream().filter(white -> serialNumbers.contains(white.getSerialNumber())).collect(Collectors.toList());
+        List<WorkOrderWhite> insertWhiteList = whitelist.stream().filter(white ->!serialNumbers.contains(white.getSerialNumber())).collect(Collectors.toList());
+        // 鏂板/淇敼鐧藉悕鍗曡澶囪褰�
+        updateWhiteList.stream().forEach(white -> workOrderWhiteMapper.updateBySerialNumber(white));
+        insertWhiteList.stream().forEach(white -> workOrderWhiteMapper.insert(white));
+    }
+
+
 }

--
Gitblit v1.8.0