From 009e3e6fe18e3229ef1a6b2a39c9de57dd9d34bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 31 七月 2024 15:58:38 +0800
Subject: [PATCH] 数据中心响应类调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 321 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 299 insertions(+), 22 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 b0ef736..8485cc6 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,27 +1,48 @@
package com.ycl.platform.service.impl;
-import com.ycl.platform.domain.entity.WorkOrder;
-import com.ycl.platform.mapper.WorkOrderMapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+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.domain.vo.WorkOrderYwConditionRecordVO;
+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.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.WorkOrderForm;
-import com.ycl.platform.domain.vo.WorkOrderVO;
-import com.ycl.platform.domain.query.WorkOrderQuery;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
+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 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 org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+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.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
/**
* 宸ュ崟 鏈嶅姟瀹炵幇绫�
@@ -34,6 +55,19 @@
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
private final WorkOrderMapper workOrderMapper;
+ private final YwUnitMapper ywUnitMapper;
+ private final YwPeopleMapper ywPeopleMapper;
+ private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
+ private final WorkOrderAuditingRecordService workOrderAuditingRecordService;
+ private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
+ private final NotifyService notifyService;
+ private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
+
+ private final String DISTRIBUTE_LOCK_KEY = "distributeLock";
+ private final static String IMPORTANT = "important";
+
+ @Autowired
+ private RedisCache redisCache;
/**
* 娣诲姞
@@ -43,6 +77,9 @@
@Override
public Result add(WorkOrderForm form) {
WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
+ entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+ entity.setCreateTime(DateUtils.getNowDate());
+ entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -66,6 +103,119 @@
return Result.ok("淇敼鎴愬姛");
}
return Result.error("淇敼澶辫触");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result auditing(WorkOrderAuditingForm form) {
+ WorkOrder workOrder = baseMapper.selectById(form.getId());
+ // 宸ュ崟鐘舵��
+ workOrder.setStatus(form.getAuditingResult());
+ baseMapper.updateById(workOrder);
+ // 娣诲姞涓�鏉″鏍歌褰�
+ WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
+ workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
+ workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
+ workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
+ workOrderAuditingRecord.setRemark(form.getAuditingRemark());
+ workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
+ // 娣诲姞鏂伴�氱煡
+ Notify notify = Notify.genEntityByUnit(NotifyTypeEnum.WORK_ORDER,
+ form.getAuditingResult().getDesc(),
+ workOrder.getUnitId(),
+ UrgentLevelEnum.WARNING,
+ workOrder.getWorkOrderNo());
+ notifyService.save(notify);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result batchAuditing(WorkOrderBatchAuditingForm form) {
+ // 鏍规嵁鏁呴殰绫诲瀷鑾峰彇鍒楄〃
+ List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())
+ .in(WorkOrder::getErrorType, form.getErrorTypes())
+ .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo)
+ .list();
+ if (list.isEmpty()) {
+ return Result.error("娌℃湁宸ュ崟鍙互瀹℃牳");
+ }
+ List<Integer> ids = list.stream().map(WorkOrder::getId).collect(Collectors.toList());
+ // 宸ュ崟鐘舵��
+ LambdaUpdateWrapper<WorkOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ lambdaUpdateWrapper.in(WorkOrder::getId, ids);
+ lambdaUpdateWrapper.set(WorkOrder::getStatus, form.getAuditingResult());
+ baseMapper.update(lambdaUpdateWrapper);
+ // 娣诲姞澶氭潯瀹℃牳璁板綍
+ List<WorkOrderAuditingRecord> workOrderAuditingRecords = new ArrayList<>();
+ for (Integer id : ids) {
+ WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
+ workOrderAuditingRecord.setWorkOrderId(id);
+ workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
+ workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
+ workOrderAuditingRecord.setRemark(form.getAuditingRemark());
+ workOrderAuditingRecords.add(workOrderAuditingRecord);
+ }
+ workOrderAuditingRecordService.saveBatch(workOrderAuditingRecords);
+ // 娣诲姞鏂伴�氱煡
+ List<Notify> notifies = new ArrayList<>();
+ for (WorkOrder workOrder : list) {
+ Notify notify = Notify.genEntityByUnit(NotifyTypeEnum.WORK_ORDER,
+ form.getAuditingResult().getDesc(),
+ workOrder.getUnitId(),
+ UrgentLevelEnum.WARNING,
+ workOrder.getWorkOrderNo());
+ notifies.add(notify);
+ }
+ notifyService.saveBatch(notifies);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result ywCondition(WorkOrderYWConditionForm form) {
+ WorkOrder workOrder = baseMapper.selectById(form.getId());
+ if (Objects.isNull(workOrder)) {
+ throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
+ }
+ // 宸ュ崟鐘舵��
+ workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
+ workOrder.setYwHandleTime(LocalDateTime.now());
+ baseMapper.updateById(workOrder);
+ // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
+ WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
+ workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());
+ workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
+ workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
+ workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
+ workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ public Result selectYwConditionByYwId(Integer id) {
+ List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+ return Result.ok().data(ywConditionList);
+ }
+
+ @Override
+ public Result selectYwAuditingListByYwId(String id) {
+ return Result.ok().data(
+ new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
+ .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+ .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
+ .list());
+ }
+
+ @Override
+ public Result ywResult(WorkOrderYWResultForm form) {
+ return null;
+ }
+
+ @Override
+ public Result checkResult(WorkOrderCheckResultForm form) {
+ return null;
}
/**
@@ -101,17 +251,144 @@
*/
@Override
public Result page(WorkOrderQuery query) {
+ IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ baseMapper.page(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
- IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
+ @Override
+ 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
+ public Result distributeFast(DistributeWorkOrderVO data) {
+ // 鑾峰彇褰撳墠鏃堕棿
+ 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)
- .page(PageUtil.getPage(query, WorkOrder.class));
+ .last("limit " + data.getFastNumLimit())
+ .list()
+ .stream()
+ .map(WorkOrder::getId)
+ .toList();
- List<WorkOrderVO> vos = page.getRecords().stream()
- .map(
- entity -> WorkOrderVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ 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();
+ }
+ }
+
+ @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("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
+ } catch (Exception e) {
+ return Result.error("鎿嶄綔澶辫触");
+ } finally {
+ distributeUnLock();
+ }
+ }
+
+ /**
+ * 鐢宠宸ュ崟涓嬪彂閿�
+ * @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