From 607613b5d0e3fd237c04dbd2ae8a65bb143fe598 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 17:17:05 +0800
Subject: [PATCH] chore:立行立改pc端日志接口提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 232 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 1dbffad..6a5a6d9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -6,12 +6,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.config.Interceptor.UserHelper;
+import com.moral.api.controller.LogController;
import com.moral.api.entity.*;
import com.moral.api.exception.BusinessException;
+import com.moral.api.mapper.AllocationLogMapper;
import com.moral.api.mapper.AllocationMapper;
import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.SysDictTypeMapper;
+import com.moral.api.mapper.UserLogMapper;
+import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bean.BaseInvalidEntity;
import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
import com.moral.api.pojo.enums.*;
@@ -20,12 +24,18 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.query.app.AppAllocationFileCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAuthority;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.*;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
+import com.moral.util.WebUtils;
+
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -34,9 +44,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.*;
import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
@Service
@@ -66,6 +80,10 @@
private ResponsibilityUnitService responsibilityUnitService;
@Autowired
private SysDictTypeService sysDictTypeService;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private AllocationLogMapper allocationLogMapper;
/**
* ������������������������������������
@@ -120,7 +138,7 @@
//������
String allocationNum = "JBD-" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
- if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
+ if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -128,8 +146,10 @@
}
//������������������
allocationMapper.insert(allocation);
+ //������������
+ userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(NEW_BUILT.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -499,6 +519,9 @@
allocationExt.setFileChangeList(fileTableService.list(id,FileTableEnum.ALLOCATION_RECTIFICATION.value));
allocationExt.setFileApproveList(fileTableService.list(id,FileTableEnum.ALLOCATION_APPROVE.value));
allocationExt.setApproveList(approveTableService.listAll(id, FileTableEnum.ALLOCATION_FOUNDATION.value));
+ allocationExt.setUnitName(getUnitName(allocationExt.getUnitId()).getUnitName());
+ allocationExt.setEscalationUnitName(getUnitName(allocationExt.getEscalationUnitId()).getUnitName());
+ allocationExt.setPolluteTypeName(responsibilityUnitMapper.selectName(Constants.WU_RAN_LEI_XING,allocationExt.getPolluteType()));
return allocationExt;
}
@@ -522,6 +545,9 @@
allocation.setState(changeCond.getState());
allocation.setChangeTime(new Date());
this.updateById(allocation);
+ //������������
+ Allocation allocation1 = this.getById(changeCond.getAllocationId());
+ userService.pushOneUser(allocation1);
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -687,6 +713,77 @@
return allocationFindVos;
}
+ @Override
+ public Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond) {
+ List<Integer> listUnit = unitResult();
+ Integer integer = unitAreaCode();
+ allocationPageCond.setUnitList(listUnit);
+ allocationPageCond.setStateList(stateAllocationList(allocationPageCond.getState(),integer));
+ Page<AllocationPageExt> extAppPage = this.baseMapper.extAppPage(allocationPageCond.getPage().convertPage(),allocationPageCond);
+ extAppPage.getRecords().forEach(it->{
+ Integer state = it.getState();
+ //������������������������
+ it.setEscalationUnitName(getUnitName(it.getEscalationUnitId()).getUnitName());
+ if (state.equals(AllocationApproveEnum.DRAFT.value)||state.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ if(integer==0||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==2){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else if(state.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ if(integer==2||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==0){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else{
+ it.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ });
+
+ return extAppPage;
+ }
+
+ @Override
+ @Transactional
+ public boolean saveFile(AppAllocationFileCond appAllocationFileCond) {
+ fileTableService.upDateResult(Arrays.asList(appAllocationFileCond.getFile()),appAllocationFileCond.getUserId(), FileTableEnum.APP_ALLOCATION.value);
+ return true;
+ }
+
+ private List<Integer> stateAllocationList(Integer type, Integer integer){
+ List<Integer> integerList = new ArrayList<>();
+ // type 0 ������ 1������ 2��������� 3 ���������
+ if(integer.equals(0)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }
+ }else if(integer.equals(2)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }
+ }else if(integer.equals(1)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(0);
+ }
+ }
+ if(type.equals(3)){
+ integerList.add(AllocationApproveEnum.PASS.value);
+ integerList.add(AllocationApproveEnum.REFUSE.value);
+ }
+ return integerList;
+ }
+
/**
* ���������������
*
@@ -714,9 +811,12 @@
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ /* approveTable.setState(NEW_BUILT);
+ approveTable.setStateName("������");
+ approveTableService.saveResult(approveTable);*/
approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
- approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
}
@@ -762,6 +862,124 @@
}
@Override
+ public AppAuthority authority(String allocationNum,Integer userId) {
+ //������������
+ AppAuthority appAuthority = new AppAuthority();
+ //������������������
+ QxUser user = UserHelper.getCurrentUser();
+ //���������������������
+ LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Allocation::getAllocationNum,allocationNum);
+ wrapper.eq(Allocation::getIsDel,0);
+ wrapper.eq(Allocation::getIsInvalid,0);
+ Allocation allocation = allocationMapper.selectOne(wrapper);
+
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
+ if(CollectionUtils.isNotEmpty(userList)){
+ //���������������������
+ if (allocation.getState()>30){
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ }else {
+ appAuthority.setCode(1);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ return appAuthority;
+ }
+ if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
+ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+ if (code.length() > 6 && allocation.getUnitId().equals(user.getUnitId())) {
+ if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ appAuthority.setCode(1);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ return appAuthority;
+ }else if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ return appAuthority;
+ }else {
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ return appAuthority;
+ }
+ } else if (code.length() <= 6){
+ if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ appAuthority.setCode(1);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ return appAuthority;
+ }else if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ return appAuthority;
+ }else {
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ return appAuthority;
+ }
+ }
+ }
+ //���������������������
+ appAuthority.setCode(3);
+ appAuthority.setName("������������");
+ return appAuthority;
+ }
+
+ /**
+ * ������������������
+ *
+ * @param id
+ * @param unitId
+ */
+ @Override
+ @Transactional
+ public void updataUnit(Integer id, Integer unitId,Integer polluteType) {
+ AllocationLog allocationLog = new AllocationLog();
+ //������������������
+ QxUser user = UserHelper.getCurrentUser();
+ Allocation allocation = allocationMapper.selectById(id);
+ if (!ObjectUtils.isEmpty(unitId)){
+ ResponsibilityUnit unitName1 = getUnitName(allocation.getUnitId());
+ ResponsibilityUnit unitName2 = getUnitName(unitId);
+ allocation.setUnitId(unitId);
+ allocationLog.setContent(unitName1.getUnitName()+"----���������----"+unitName2.getUnitName());
+
+ }
+ if (!ObjectUtils.isEmpty(polluteType)){
+ SysDictData sysDictData1 = sysDictTypeService.listOne(Constants.WU_RAN_LEI_XING,allocation.getPolluteType().toString());
+ SysDictData sysDictData2 = sysDictTypeService.listOne(Constants.WU_RAN_LEI_XING, polluteType.toString());
+ allocation.setPolluteType(polluteType);
+ allocationLog.setPolluteType(sysDictData1.getDataValue()+"----���������----"+sysDictData2.getDataValue());
+ }
+
+ allocationMapper.updateById(allocation);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ allocationLog.setAllocationNum(allocation.getAllocationNum());
+ allocationLog.setIp(WebUtils.getIpAddr(request));
+ allocationLog.setAccountId(user.getUserId());
+ allocationLog.setAccount(user.getAccount());
+ allocationLog.setUserName(user.getUserName());
+ allocationLog.setCreateTime(new Date());
+ allocationLogMapper.insert(allocationLog);
+
+ }
+
+ /**
+ * ������������������
+ *
+ * @param allocationNum
+ * @return
+ */
+ @Override
+ public List<AllocationLog> getLog(String allocationNum) {
+ LambdaQueryWrapper<AllocationLog> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(AllocationLog::getAllocationNum,allocationNum);
+ wrapper.orderByAsc(AllocationLog::getCreateTime);
+ List<AllocationLog> allocationLogs = allocationLogMapper.selectList(wrapper);
+ return allocationLogs;
+ }
+
+ @Override
public List<Integer> unitResult() {
QxUser user = UserHelper.getCurrentUser();
Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
@@ -783,15 +1001,15 @@
if(CollectionUtils.isNotEmpty(userList)){
return 1;
}
- if(Objects.nonNull(user.getUnitId())){
+ if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0) {
String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
- if(code.length()>6){
+ if (code.length() > 6) {
return 0;
- }else {
+ } else {
return 2;
}
}
- return 1;
+ return 0;
}
private boolean escalationType(Integer id){
boolean f = false;
@@ -801,4 +1019,11 @@
}
return f;
}
+
+
+ private ResponsibilityUnit getUnitName(Integer unitId){
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+ return responsibilityUnit;
+ }
+
}
--
Gitblit v1.8.0