From dea580dae4fe148acf766b68fd99f87510164b36 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 12:22:00 +0800
Subject: [PATCH] 录像翻译行政区域
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 12 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..9bbd8f9 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.*;
@@ -94,6 +97,7 @@
private final SysConfigMapper configMapper;
private final ReportMapper reportMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
+ private final WorkOrderWhiteMapper workOrderWhiteMapper;
@Value("${rtsp.server:http://127.0.0.1:7788}")
private String rtspServer;
@@ -107,6 +111,11 @@
@Transactional(rollbackFor = Exception.class)
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
+ // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
+ List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
+ // 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
+ workOrderList.stream().filter(item -> !serialNumbers.contains(item.getSerialNumber()))
+ .collect(Collectors.toList());
workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
});
@@ -321,19 +330,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("娣诲姞澶辫触");
}
/**
@@ -985,4 +1001,79 @@
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