From 70dfa087a9f61ecc33f3b5bc618202c2023e38f3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 19 八月 2024 15:45:26 +0800
Subject: [PATCH] 优云接口工单生成
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 212 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 175 insertions(+), 37 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 8485cc6..66e3094 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,26 +8,31 @@
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
-import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
+import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
+import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
+import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
import com.ycl.platform.service.WorkOrderService;
+import com.ycl.platform.service.YwPointService;
import com.ycl.system.Result;
+import com.ycl.system.domain.SysConfig;
+import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
-import constant.PointConfigConstants;
import enumeration.general.*;
import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,10 +43,7 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -50,24 +52,122 @@
* @author xp
* @since 2024-03-05
*/
+@Slf4j
@Service
@RequiredArgsConstructor
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
private final WorkOrderMapper workOrderMapper;
- private final YwUnitMapper ywUnitMapper;
- private final YwPeopleMapper ywPeopleMapper;
+ private final YwPointService ywPointService;
private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
private final WorkOrderAuditingRecordService workOrderAuditingRecordService;
private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
private final NotifyService notifyService;
private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
+ private final TMonitorMapper monitorMapper;
+ private final SysConfigMapper configMapper;
private final String DISTRIBUTE_LOCK_KEY = "distributeLock";
private final static String IMPORTANT = "important";
@Autowired
private RedisCache redisCache;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ int total = workOrderList.size();
+ workOrderList.stream().filter(item -> {
+ return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType());
+ });
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ return Boolean.TRUE;
+ }
+ List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
+ // 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
+ List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(WorkOrder::getId, WorkOrder::getSerialNumber, WorkOrder::getStatus, WorkOrder::getErrorType)
+ .in(WorkOrder::getSerialNumber, serialNumberList)
+ .ne(WorkOrder::getStatus, WorkOrderStatusEnum.AUDITING_SUCCESS)
+ .list();
+ Map<String, WorkOrder> mapping = inDatabaseWorkOrderList.stream().collect((Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder)));
+ List<WorkOrder> waitAddList = new ArrayList<>(48);
+ Integer updateNum = 0;
+ // TODO 鏌ヨ鏄惁鎶ュ杩囷紝鏇存柊鏁呴殰绫诲瀷
+ for (WorkOrder workOrder : workOrderList) {
+ WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
+ if (Objects.nonNull(databaseWorkOrder)) {
+ String errorType = databaseWorkOrder.getErrorType();
+ if (workOrder.getErrorType().equals(errorType)) {
+ // 濡傛灉锛屽浗鏍囩爜銆佹晠闅滅被鍨嬮兘涓�鏍凤紝鍒欒烦杩囦笉澶勭悊
+ continue;
+ } else {
+ // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨洿鏂伴敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
+ errorType = errorType + "," + workOrder.getErrorType();
+ databaseWorkOrder.setErrorType(errorType);
+ databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ Date now = new Date();
+ databaseWorkOrder.setUpdateTime(now);
+ baseMapper.updateById(databaseWorkOrder);
+ updateNum++;
+ // 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣 TODO
+ }
+ } else {
+ workOrder.setCreateTime(new Date());
+ workOrder.setUpdateTime(new Date());
+ waitAddList.add(workOrder);
+ }
+ }
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ 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)
+ .list();
+ Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
+ // 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
+ SysConfig important = configMapper.checkConfigKeyUnique("important.wordkorder.time");
+ SysConfig normal = configMapper.checkConfigKeyUnique("normal.wordkorder.alarm.time");
+ // 濡傛灉鍗冲皢鐢熸垚宸ュ崟锛屼絾鏄澶囧浗鏍囩爜鏌ヤ笉鍒扮偣浣嶏紝鍒欎笉娣诲姞锛�
+ List<WorkOrder> notAddList = new ArrayList<>();
+ for (WorkOrder workOrder : waitAddList) {
+ YwPoint point = pointMapping.get(workOrder.getSerialNumber());
+ if (Objects.isNull(point)) {
+ notAddList.add(workOrder);
+ continue;
+ }
+ workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+ workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
+ if (point.getImportantTag() || point.getImportantCommandImageTag()) {
+ workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue()));
+ } else {
+ workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
+ }
+ }
+ waitAddList.removeAll(notAddList);
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ return Boolean.TRUE;
+ }
+ this.saveBatch(waitAddList);
+ // 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
+ if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) {
+ List<WorkOrderDistributeRecord> distributedRecordList = waitAddList.stream().map(item -> {
+ WorkOrderDistributeRecord workOrderDistributeRecord = new WorkOrderDistributeRecord();
+ workOrderDistributeRecord.setWorkOrderId(item.getId());
+ workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
+ workOrderDistributeRecord.setUserId(1L);
+ Date now = new Date();
+ workOrderDistributeRecord.setCreateTime(now);
+ workOrderDistributeRecord.setUpdateTime(now);
+ return workOrderDistributeRecord;
+ }).collect(Collectors.toList());
+ workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
+ }
+ log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
+ return Boolean.TRUE;
+ }
/**
* 娣诲姞
@@ -80,6 +180,9 @@
entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -95,10 +198,11 @@
public Result update(WorkOrderForm form) {
WorkOrder entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
@@ -126,6 +230,10 @@
UrgentLevelEnum.WARNING,
workOrder.getWorkOrderNo());
notifyService.save(notify);
+ // 鍚屾鐐逛綅鐘舵��
+ if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
+ ywPointService.updateRecovery(Arrays.asList(workOrder.getSerialNumber()), 0);
+ }
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -260,62 +368,53 @@
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.distributePage(page, query);
- page.getRecords().stream().forEach(workOrder -> {
- if (StringUtils.hasText(workOrder.getPointTag()) && workOrder.getPointTag().contains(IMPORTANT)) {
- workOrder.setImportant(Boolean.TRUE);
- }
- });
return Result.ok().data(page).total(page.getTotal());
}
@Override
+ @Transactional
public Result distributeFast(DistributeWorkOrderVO data) {
// 鑾峰彇褰撳墠鏃堕棿
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
+ data.setEnd(now);
switch (data.getFastWay()) {
case LAST_HALF_HOUR:
data.setStart(now.minusMinutes(30));
- data.setEnd(now);
break;
case LAST_HOUR:
data.setStart(now.minusHours(1));
- data.setEnd(now);
break;
case LAST_TWO_HOUR:
data.setStart(now.minusHours(2));
- data.setEnd(now);
break;
case LAST_DAY:
data.setStart(now.minusDays(1));
- data.setEnd(now);
break;
}
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
- List<Integer> ids = new LambdaQueryChainWrapper<>(baseMapper)
+ List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(WorkOrder::getSerialNumber, WorkOrder::getSerialNumber)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
.eq(WorkOrder::getErrorType, data.getErrorType())
.between(WorkOrder::getCreateTime, data.getStart(), data.getEnd())
.orderByDesc(WorkOrder::getCreateTime)
.last("limit " + data.getFastNumLimit())
- .list()
- .stream()
- .map(WorkOrder::getId)
- .toList();
+ .list();
+ List<Integer> ids = list.stream().map(WorkOrder::getId).toList();
+ List<String> serialNumberList = list.stream().map(WorkOrder::getSerialNumber).toList();
- if (ids.isEmpty()) {
- return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�");
- }
- if (!getDistributeLock()) {
- return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
- }
+ if (ids.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
+ if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
try {
new LambdaUpdateChainWrapper<>(baseMapper)
.set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
.in(WorkOrder::getId, ids)
.update();
addDistributeRecord(ids, WorkOrderDistributeWayEnum.FAST_DISTRIBUTE);
+ // 鍚屾鐐逛綅鐘舵��
+ ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + ids.size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
@@ -325,11 +424,10 @@
}
@Override
+ @Transactional
public Result selectedIdsDistribute(DistributeWorkOrderQuery query) {
WorkOrderDistributeWayEnum distributeWayEnum = WorkOrderDistributeWayEnum.SELECTED_DISTRIBUTE;
- if (!getDistributeLock()) {
- return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
- }
+ if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
try {
if (query.getIds().isEmpty()) {
query.setIds(new LambdaQueryChainWrapper<>(baseMapper)
@@ -342,14 +440,15 @@
.collect(Collectors.toList()));
distributeWayEnum = WorkOrderDistributeWayEnum.ALL_DISTRIBUTE;
}
- if (query.getIds().isEmpty()) {
- return Result.error("娌℃湁宸ュ崟寰呬笅鍙�");
- }
+ if (query.getIds().isEmpty()) { return Result.error("娌℃湁宸ュ崟寰呬笅鍙�"); }
new LambdaUpdateChainWrapper<>(baseMapper)
.set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
.in(WorkOrder::getId, query.getIds())
.update();
addDistributeRecord(query.getIds(), distributeWayEnum);
+ // 鍚屾鐐逛綅鐘舵��
+ List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getSerialNumber).toList();
+ ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
@@ -419,4 +518,43 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result screenWorkOrder(ScreenQuery query) {
+ ScreenWorkOrderVO screen = baseMapper.screenWorkOrder(query);
+ return Result.ok().data(screen);
+ }
+
+ @Override
+ public Map<String, Object> home(HomeQuery monitorQuery) {
+ Map<String, Object> dataMap = new HashMap<>();
+ Map<String, Object> data1 = new HashMap<>();
+ Map<String, Object> data2 = new HashMap<>();
+ Map<String, Object> data3 = new HashMap<>();
+ List<Map<String, Object>> home = baseMapper.home(monitorQuery);
+ if (ObjectUtils.isNotEmpty(home)) {
+ for (Map<String, Object> map : home) {
+ if (Objects.nonNull(map.get("dateType")) && StringUtils.hasText(map.get("dateType").toString())) {
+ data1.put(map.get("dateType").toString(), map.get("num1"));
+ data2.put(map.get("dateType").toString(), map.get("num2"));
+ data3.put(map.get("dateType").toString(), map.get("num3"));
+ }
+ }
+ dataMap.put("name", home.get(0).get("name"));
+ }
+ dataMap.put("complete", data1);
+ dataMap.put("waiting", data2);
+ dataMap.put("pending", data3);
+ return dataMap;
+ }
+
+ @Override
+ public WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery) {
+ return baseMapper.workOrderTotal(dashboardQuery);
+ }
+
+ @Override
+ public List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery) {
+ return baseMapper.workOrderRegion(dashboardQuery);
+ }
}
--
Gitblit v1.8.0