From 3403a2462434da327d89311b4b9a75ab7a9b5c0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 十一月 2024 18:38:22 +0800
Subject: [PATCH] OSD宇视bug，工单删除、工单导出时间bug等等
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 170 insertions(+), 35 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..86f83a0 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;
@@ -104,12 +114,23 @@
private RedisCache redisCache;
@Override
- @Transactional(rollbackFor = Exception.class)
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ //閬垮厤鍧�(浜嬪姟鍔犻攣浼氬け鏁堛�佹柟娉曞唴閮ㄨ皟鐢ㄤ簨鍔′細澶辨晥)
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ return self.batchAddWorkOrder(workOrderList);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean batchAddWorkOrder(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 +182,10 @@
willAddErrorType.add(workOrderErrorType);
}
}
- databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ //閬垮厤浠ｄ笅鍙戠殑宸ュ崟鐩存帴鍙樻垚涓嬪彂
+ if(!databaseWorkOrder.getStatus().equals(WorkOrderStatusEnum.WAIT_DISTRIBUTE)) {
+ databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ }
databaseWorkOrder.setUpdateTime(now);
willUpdateStatusWorkOrderList.add(databaseWorkOrder);
updateNum++;
@@ -199,9 +223,12 @@
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)
+ .isNotNull(YwPoint::getUnitId)
.list();
Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
// 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
@@ -296,7 +323,6 @@
log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
return Boolean.TRUE;
}
-
/**
* 娣诲姞
*
@@ -321,19 +347,26 @@
return Result.error("宸ュ崟姝ｅ湪娣诲姞锛岃绋嶅悗鍐嶈瘯");
}
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 +469,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 +486,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;
+ }
+ // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧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);
@@ -506,6 +568,9 @@
*/
@Override
public Result removeById(String id) {
+ WorkOrder workOrder = baseMapper.selectById(id);
+ String workOrderNo = workOrder.getWorkOrderNo();
+ workOrderDistributeRecordMapper.deleteByWorkOrder(workOrderNo);
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -521,9 +586,11 @@
@Override
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
- query.setUnitId(SecurityUtils.getUnitId());
- query.setStart(DateUtils.getDayStart(query.getStart()));
- query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if(query.getUnitId()==null) {
+ query.setUnitId(SecurityUtils.getUnitId());
+ }
+ if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.page(page, query);
if (!CollectionUtils.isEmpty(page.getRecords())) {
page.getRecords().stream().forEach(item -> {
@@ -541,6 +608,8 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
}
@@ -768,6 +837,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);
@@ -968,21 +1038,86 @@
@Override
public List<WorkOrderVO> export (WorkOrderExportQuery query){
query.setUnitId(SecurityUtils.getUnitId());
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if (query.getStart() == null) {
- query.setStart(format.format(DateUtils.getDayStart(new Date())));
- } else {
- query.setStart(query.getStart() + " 00:00:00");
- }
- if (query.getEnd() == null) {
- query.setStart(format.format(DateUtils.getDayEnd(new Date())));
- } else {
- query.setEnd(query.getEnd() + " 23:59:59");
- }
+ if (query.getStart() != null) query.setStart(query.getStart() + " 00:00:00");
+ if (query.getEnd() != null) query.setEnd(query.getEnd() + " 23:59:59");
- List<WorkOrderVO> export = baseMapper.export(query);
-
- System.out.println(export);
- return export;
+ return baseMapper.export(query);
}
+
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ *
+ * @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