From b43ede1ee201c0d6aaede56e0fa3c4894c892e3c Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 18 四月 2024 10:44:41 +0800
Subject: [PATCH] 工单下发：下发记录增加下发状态
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 224 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 190 insertions(+), 34 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 c64d795..17469e8 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
@@ -1,35 +1,43 @@
package com.ycl.platform.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.vo.DistributeWorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.mapper.*;
+import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.vo.WorkOrderVO;
-import com.ycl.platform.domain.query.WorkOrderQuery;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
-import enumeration.general.FastDistributeTypeEnum;
+import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.redis.RedisCache;
+import enumeration.general.NotifyTypeEnum;
+import enumeration.general.WorkOrderDistributeWayEnum;
import enumeration.general.WorkOrderStatusEnum;
-import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 宸ュ崟 鏈嶅姟瀹炵幇绫�
@@ -46,7 +54,13 @@
private final YwPeopleMapper ywPeopleMapper;
private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
+ private final NotifyService notifyService;
+ private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
+ private final String DISTRIBUTE_LOCK_KEY = "distributeLock";
+
+ @Autowired
+ private RedisCache redisCache;
/**
* 娣诲姞
@@ -56,6 +70,10 @@
@Override
public Result add(WorkOrderForm form) {
WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
+ entity.setWorkOrderNo(DateUtils.dateTimeNow());
+ entity.setCreateTime(DateUtils.getNowDate());
+ entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ entity.setDeleted("0");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -85,23 +103,23 @@
@Transactional(rollbackFor = Exception.class)
public Result auditing(WorkOrderAuditingForm form) {
WorkOrder workOrder = baseMapper.selectById(form.getId());
- if (Objects.isNull(workOrder)) {
- throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
- }
// 宸ュ崟鐘舵��
- if ("pass".equals(form.getAuditingResult())) {
- workOrder.setStatus(WorkOrderStatusEnum.FINISH);
- } else {
- workOrder.setStatus(WorkOrderStatusEnum.AUDITING);
- }
+ workOrder.setStatus(form.getAuditingResult());
baseMapper.updateById(workOrder);
// 娣诲姞涓�鏉″鏍歌褰�
WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
- workOrderAuditingRecord.setAuditingUser(1);
- workOrderAuditingRecord.setResult(form.getAuditingResult());
+ workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
+ workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
workOrderAuditingRecord.setRemark(form.getAuditingRemark());
workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
+ // 娣诲姞鏂伴�氱煡
+ try {
+ Notify notify = new Notify(NotifyTypeEnum.WORK_ORDER, form.getAuditingResult().getDesc(), workOrder.getYwPeopleId(), "0", "0", workOrder.getId());
+ notifyService.save(notify);
+ } catch (Exception e) {
+ return Result.error("瀹℃牳鎴愬姛锛岄�氱煡杩愮淮浜哄憳澶辫触");
+ }
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -113,15 +131,44 @@
throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
}
// 宸ュ崟鐘舵��
-// workOrder.setStatus("commit-condition");
+ workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
baseMapper.updateById(workOrder);
// 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());
- workOrderYwConditionRecord.setCommitUser(1);
+ workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
+ workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ public Result selectYwConditionByYwId(String id) {
+ return Result.ok().data(
+ new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
+ .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
+ .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
+ .last("limit 1")
+ .one());
+ }
+
+ @Override
+ public Result selectYwConditionListByYwId(String id) {
+ return Result.ok().data(
+ new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
+ .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
+ .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
+ .list());
+ }
+
+ @Override
+ public Result selectYwAuditingListByYwId(String id) {
+ return Result.ok().data(
+ new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
+ .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+ .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
+ .list());
}
@Override
@@ -169,7 +216,8 @@
public Result page(WorkOrderQuery query) {
IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
.eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
- .ne(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
+ .eq(StringUtils.hasText(query.getStatus().getValue()), WorkOrder::getStatus, query.getStatus())
+ .eq(StringUtils.hasText(query.getErrorType()), WorkOrder::getErrorType, query.getErrorType())
.between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
WorkOrder::getYwHandleTime,
DateUtils.getDayStart(query.getStart()),
@@ -224,17 +272,125 @@
@Override
public Result distributeFast(DistributeWorkOrderVO data) {
- List<WorkOrder> willDistributeList = new ArrayList<>(32);
- // 濡傛灉鏄嚜瀹氫箟鏃堕棿鑼冨洿
- if (FastDistributeTypeEnum.CUSTOM == data.getFastWay()) {
+ // 鑾峰彇褰撳墠鏃堕棿
+ LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
+ 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)
+ .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();
+
+ 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);
+ return Result.ok("鎴愬姛涓嬪彂" + ids.size() + "鏉″伐鍗�");
+ } catch (Exception e) {
+ return Result.error("鎿嶄綔澶辫触");
+ } finally {
+ distributeUnLock();
+ }
+ }
- new LambdaUpdateChainWrapper<>(baseMapper)
- .set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
- .update();
+ @Override
+ public Result selectedIdsDistribute(DistributeWorkOrderQuery query) {
+ WorkOrderDistributeWayEnum distributeWayEnum = WorkOrderDistributeWayEnum.SELECTED_DISTRIBUTE;
+ if (!getDistributeLock()) {
+ return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
+ }
+ try {
+ if (query.getIds().isEmpty()) {
+ query.setIds(new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
+ .eq(Objects.nonNull(query.getUnitId()), WorkOrder::getUnitId, query.getUnitId())
+ .select(WorkOrder::getId)
+ .list()
+ .stream()
+ .map(WorkOrder::getId)
+ .collect(Collectors.toList()));
+ distributeWayEnum = WorkOrderDistributeWayEnum.ALL_DISTRIBUTE;
+ }
+ 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);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ } catch (Exception e) {
+ return Result.error("鎿嶄綔澶辫触");
+ } finally {
+ distributeUnLock();
+ }
+ }
- return Result.ok("鎿嶄綔鎴愬姛");
+ /**
+ * 鐢宠宸ュ崟涓嬪彂閿�
+ * @return 宸ュ崟涓嬪彂閿佺敵璇风粨鏋�
+ */
+ public synchronized Boolean getDistributeLock() {
+ if (Objects.isNull(redisCache.getCacheObject(DISTRIBUTE_LOCK_KEY))) {
+ redisCache.setCacheObject(DISTRIBUTE_LOCK_KEY, "1");
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * 宸ュ崟涓嬪彂閿侀噴鏀�
+ */
+ public synchronized void distributeUnLock() {
+ redisCache.deleteObject(DISTRIBUTE_LOCK_KEY);
+ }
+
+ /**
+ * 娣诲姞宸ュ崟涓嬪彂璁板綍
+ * @param ids 宸ュ崟id
+ */
+ private void addDistributeRecord(List<Integer> ids, WorkOrderDistributeWayEnum distributeWay) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ workOrderDistributeRecordMapper.insertBatch(
+ ids.stream()
+ .map(id -> new WorkOrderDistributeRecord(id, loginUser.getUserId(), distributeWay))
+ .toList()
+ );
}
/**
--
Gitblit v1.8.0