From 3ea5f033f6f51ffca9f8807c062e36ccafcf2cfb Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 09:50:06 +0800
Subject: [PATCH] 配置文件
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 218 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 195 insertions(+), 23 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 67468d3..7ca3bc4 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -5,27 +5,36 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.project.common.annotation.DataScope;
-import com.project.common.constant.CheckLevelCodeConstants;
-import com.project.common.core.domain.entity.SysRole;
import com.project.common.core.domain.entity.SysUser;
-import com.project.common.exception.base.BaseException;
+import com.project.common.enums.OrderPre;
+import com.project.common.sms.YPSmsApi;
+import com.project.common.utils.DateUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceCheckLog;
import com.project.enforce.domain.EnforceOrder;
+import com.project.enforce.domain.EnforcePeer;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
+import com.project.enforce.service.IEnforceCheckLogService;
import com.project.enforce.service.IEnforceOrderService;
+import com.project.enforce.service.IEnforcePeerService;
import com.project.system.service.ISysDeptService;
+import com.project.system.service.ISysOrderNoService;
+import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 鎵ф硶鍗昐ervice涓氬姟灞傚鐞�
@@ -36,15 +45,27 @@
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class EnforceOrderServiceImpl extends ServiceImpl<EnforceOrderMapper, EnforceOrder> implements IEnforceOrderService {
+ private final ISysUserService userService;
private final ISysDeptService deptService;
-
+ private final ISysOrderNoService orderNoService;
+ private final IEnforcePeerService peerService;
+ private final IEnforceCheckLogService checkLogService;
@Override//鍒楄〃鏌ヨ
- @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_user_id")
+ @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override//鎵ф硶涓婃姤鍒楄〃
+ @DataScope(deptAlias = "execute_dept_id", userAlias = "execute_id")
+ public List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo) {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -53,29 +74,38 @@
public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- if (!"01".equals(loginUser.getUserType())) {
- throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
- }
- List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
- if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
- bo.setCheckLevel(null);
- } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
- bo.setCheckLevel(0);
- } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
- bo.setCheckLevel(1);
+ bo.setCheckIds(loginUser.getPhonenumber());
+ List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
+ if (StringUtils.isNotEmpty(deptIds)){
+ bo.setApplyDeptIds(deptIds);
} else {
- throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ bo.setApplyDeptIds(null);
}
- bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(loginUser.getDeptId()));
-
return this.baseMapper.selectCheckList(bo);
+ }
+
+ @Override
+ public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
+ {
+ bo.setUserId(SecurityUtils.getUserId());
+ return this.baseMapper.selectCheckedList(bo);
+ }
+
+ @Override//淇℃伅鍏紡鍒楄〃
+ public List<EnforceOrderVo> showList()
+ {
+ List<EnforceOrder> list = this.list(lq().eq(EnforceOrder::getIsShow, 1));
+ return Convert.toList(EnforceOrderVo.class, list);
}
@Override//id鏌ヨ
public EnforceOrderVo queryById(Long orderId)
{
EnforceOrder db = this.baseMapper.selectById(orderId);
- return Convert.convert(EnforceOrderVo.class , db);
+ EnforceOrderVo vo = Convert.convert(EnforceOrderVo.class, db);
+ List<EnforcePeer> peers = peerService.list(peerService.lq().eq(EnforcePeer::getOrderId, orderId).eq(EnforcePeer::getPeerType,2));
+ vo.setPeers(peers);
+ return vo;
}
@@ -84,8 +114,33 @@
public Boolean insertByBo(EnforceOrderBo bo)
{
EnforceOrder add = Convert.convert(EnforceOrder.class, bo);
+ add.setCheckLevel(0);
validEntityBeforeSave(add);
- return this.save(add);
+ List<String> phones = getCheckPhones(add.getCheckLevel(), add.getApplyDeptId());
+ if (StringUtils.isNotEmpty(phones)){
+ String checkPhones = StringUtils.join(phones, ",");
+ add.setCheckIds(checkPhones);
+ }
+ this.save(add);
+ bo.getPeers().add(0,new EnforcePeer()
+ .setPeerType(1)
+ .setPeerId(add.getApplyId())
+ .setPeerUser(add.getApplyUser())
+ .setPeerPhone(add.getApplyPhone())
+ .setPeerDeptId(add.getApplyDeptId())
+ .setPeerDeptName(add.getApplyDeptName())
+ );
+ //澶勭悊鎵ф硶浜哄憳淇℃伅
+ for (EnforcePeer peer : bo.getPeers())
+ {
+ peer.setOrderId(add.getOrderId());
+ peer.setPeerDeptName(deptService.getDeptAllName(peer.getPeerDeptId()));
+ }
+ boolean savePeers = peerService.saveOrUpdateBatch(bo.getPeers());
+ if (savePeers && StringUtils.isNotEmpty(phones)) {
+ sendApplyMsg(phones, add.getApplyUser());
+ }
+ return savePeers;
}
@Override//淇敼
@@ -107,15 +162,100 @@
return this.removeByIds(ids);
}
+ @Override
+ public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId)
+ {
+ return getCheckPhones(checkLevel, applyDeptId, 0);
+ }
+
+ @Override
+ public List<OrderNodeVo> orderNodeList(Long orderId)
+ {
+ List<OrderNodeVo> vos = new ArrayList<>();
+ EnforceOrder order = this.getById(orderId);
+ List<EnforceCheckLog> checkLogs = checkLogService.list(checkLogService.lq()
+ .eq(EnforceCheckLog::getOrderId, orderId).orderByAsc(EnforceCheckLog::getCheckTime)
+ );
+ if (order.getApplyTime()!=null){
+ vos.add(new OrderNodeVo("鎻愪氦鐢宠",order.getApplyUser(),order.getApplyTime(), null));
+ }
+ if (StringUtils.isNotEmpty(checkLogs)){
+ for (EnforceCheckLog checkLog : checkLogs) {
+ if (checkLog.getCheckStatus()>0){
+ vos.add(new OrderNodeVo("瀹℃壒閫氳繃",checkLog.getCheckUser(),checkLog.getCheckTime(), null));
+ } else {
+ vos.add(new OrderNodeVo("瀹℃壒鎷掔粷",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
+ }
+ }
+ }
+ if (order.getInTime()!=null){
+ vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
+ }
+ if (order.getExecuteTime()!=null){
+ vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
+ }
+
+ return vos;
+ }
+
+ @Override//鎵爜缁撴灉
+ public List<EnforceOrderVo> getScanList(String companyCode)
+ {
+ Long userId = SecurityUtils.getUserId();
+ return this.baseMapper.selectScanList(companyCode, userId);
+ }
+
+ @Override//纭鎵爜鎵ф硶
+ @Transactional
+ public Boolean doScanOrder(Long orderId)
+ {
+ EnforceOrder order = this.getById(orderId);
+ order.setOrderStatus(3);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ order.setExecuteId(user.getUserId());
+ order.setExecuteUser(user.getNickName());
+ order.setExecutePhone(user.getRecommendPhone());
+ order.setExecuteDeptId(user.getDeptId());
+ order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
+ order.setInTime(DateUtils.getNowDate());
+ return this.updateById(order);
+ }
+
//-------------------------------------------------------------------------------------
+
+
+ /**
+ * 鍙戦�佸鎵圭煭淇�
+ * @param phones 鎵嬫満鍙�
+ * @param applyUser 鐢宠浜�
+ */
+ @Async
+ public void sendApplyMsg(List<String> phones, String applyUser)
+ {
+ String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser));
+ phones.forEach(phone-> YPSmsApi.sendSms(phone, applyMsg));
+ }
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceOrder entity)
{
if (entity.getOrderId()==null){
+ String orderNo = orderNoService.getOrderNo(OrderPre.ZFD.getIndex());
+ entity.setOrderNo(orderNo);
entity.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(entity.getApplyDeptId()));
+ entity.setApplyTime(DateUtils.getNowDate());
}
+ if (StringUtils.isEmpty(entity.getApplyDeptName()) && entity.getApplyDeptId()!=null){
+ entity.setApplyDeptName(deptService.getDeptAllName(entity.getApplyDeptId()));
+ }
+ if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptId()!=null){
+ entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
+ }
+ if (StringUtils.isEmpty(entity.getCheckDeptName()) && entity.getCheckDeptId()!=null){
+ entity.setCheckDeptName(deptService.getDeptAllName(entity.getCheckDeptId()));
+ }
+
}
//鑾峰彇鏌ヨ鍙傛暟
@@ -132,13 +272,17 @@
qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
- qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.like(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.like(StringUtils.isNotEmpty(bo.getEnforceContent()), "enforce_content", bo.getEnforceContent());
+ qw.eq(StringUtils.isNotEmpty(bo.getEnforceType()), "enforce_type", bo.getEnforceType());
qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());
qw.eq(StringUtils.isNotEmpty(bo.getApplyPhone()), "apply_phone", bo.getApplyPhone());
qw.eq(bo.getApplyDeptId() != null, "apply_dept_id", bo.getApplyDeptId());
qw.like(StringUtils.isNotEmpty(bo.getApplyDeptName()), "apply_dept_name", bo.getApplyDeptName());
qw.eq(bo.getApplyTime() != null, "apply_time", bo.getApplyTime());
+ qw.eq(bo.getPlanTime() != null, "plan_time", bo.getPlanTime());
+ qw.eq(bo.getInTime() != null, "in_time", bo.getInTime());
qw.eq(bo.getUserNum() != null, "user_num", bo.getUserNum());
qw.eq(bo.getWarnStatus() != null, "warn_status", bo.getWarnStatus());
qw.eq(StringUtils.isNotEmpty(bo.getWarnReason()), "warn_reason", bo.getWarnReason());
@@ -171,4 +315,32 @@
}
return qw;
}
+
+
+ /**
+ * 鑾峰彇瀹℃壒浜篿d
+ * @param checkLevel 瀹℃壒绾у埆锛氶粯璁�0
+ * @param deptId 鐢宠閮ㄩ棬id
+ */
+ private List<String> getCheckPhones(Integer checkLevel, Long deptId, int current)
+ {
+ if (checkLevel==3){
+ if (current==1){
+ return null;
+ }
+ checkLevel = 0;
+ deptId = deptService.selectDeptById(deptId).getParentId();
+ current++;
+ getCheckPhones(checkLevel, deptId, current);
+ }
+ checkLevel++;
+ String checkKey = "check_enforce_";
+ List<String> phones = userService.getPhonesByRoleKey(checkKey + checkLevel, deptId);
+ if (StringUtils.isNotEmpty(phones)){
+ return phones;
+ }
+ return getCheckPhones(checkLevel, deptId, current);
+ }
+
+
}
--
Gitblit v1.9.1