From 2ba93435afce9b04a5247739041902861b20596c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 24 Oct 2023 10:24:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java | 2 +
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java | 2 +
screen-api/src/main/resources/mapper/SysDictTypeMapper.xml | 6 +++
screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java | 2 +
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 67 +++++++++++++++++++--------------
screen-common/src/main/java/com/moral/util/AmendUtils.java | 3 +
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java | 2
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 13 ++++++
8 files changed, 68 insertions(+), 29 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java b/screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java
index c62f910..d1de4f3 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java
@@ -21,4 +21,6 @@
List<SysDictData> selectIdList(@Param("code") String code, @Param("ids") List<String> ids);
+
+ SysDictType selectFind(@Param("name") String name);
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java
index 675faa4..0a3b2c4 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java
@@ -26,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="Allocation - ������������������", description="Allocation - ������������������")
-public class AllocationCheckCond implements Serializable {
+public class AllocationCheckCond implements Serializable {
@ApiModelProperty(value = "������id")
@NotNull(message = "������id���������������")
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
index 7e443a3..0b507d1 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
@@ -38,6 +38,8 @@
@ApiModelProperty(value = "������������id")
private Integer changeType;
+ @ApiModelProperty(value = "������������")
+ private String pollutePosition;
@ApiModelProperty(value = "������������")
private Integer changeDay;
diff --git a/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java b/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
index 932f5df..97a8530 100644
--- a/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
@@ -22,4 +22,6 @@
SysDictData listOne(String code, String dataKey);
List<SysDictData> listWindAll(String code, List<String> dataKey);
+ //������������������������
+ SysDictType slectFind(String name);
}
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 003041c..1dbffad 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
@@ -64,6 +64,8 @@
private AllocationExtensionService allocationExtensionService;
@Autowired
private ResponsibilityUnitService responsibilityUnitService;
+ @Autowired
+ private SysDictTypeService sysDictTypeService;
/**
* ������������������������������������
@@ -280,13 +282,14 @@
escalationTypeList.add(typeMap);
}
//������������������������
+ SysDictType sysDictType = sysDictTypeService.slectFind(Constants.WU_RAN_LEI_XING);
Map<Integer, List<Allocation>> polluteTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getPolluteType()));
Set<Integer> polluteTypes = polluteTypeMap.keySet();
for (Integer polluteType : polluteTypes) {
HashMap<String, Object> typeMap = new HashMap<>();
List<Allocation> allocations1 = polluteTypeMap.get(polluteType);
QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>();
- sysDictDataQueryWrapper.eq("dict_type_id",32);
+ sysDictDataQueryWrapper.eq("dict_type_id",sysDictType.getId());
sysDictDataQueryWrapper.eq("dataKey",polluteType);
SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
typeMap.put("name",sysDictData.getDataValue());
@@ -617,57 +620,65 @@
//������������������
List<Integer> list = unitResult();
if (!ObjectUtils.isEmpty(list)){
- Integer integer = list.get(0);
- if (integer==0){
- return null;
- }else {
- wrapper.in(Allocation::getUnitId,list);
- }
+ wrapper.in(Allocation::getUnitId,list);
}
Integer integer = unitAreaCode();
- //��������������� ���������
- if (integer==0 || integer==1){
+ // ���������
+ if (integer==1){
if (state==3){
- wrapper.in(Allocation::getState,40,50);
- }else if (state==2){
- wrapper.eq(Allocation::getState,30);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
}else if (state==1){
- wrapper.eq(Allocation::getState,20);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value,AllocationApproveEnum.IN_APPROVAL.value);
+ }else {
+ wrapper.eq(Allocation::getState,0);
}
- //������������
- }else if (integer==2){
+ }else if(integer == 0) {
if (state==3){
- wrapper.in(Allocation::getState,40,50);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
}else if (state==2){
- wrapper.eq(Allocation::getState,20);
+ wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
}else if (state==1){
- wrapper.eq(Allocation::getState,30);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value);
+ }
+ }else if(integer == 2){
+ if (state==3){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
+ }else if (state==2){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value);
+ }else if (state==1){
+ wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
}
}
if (!ObjectUtils.isEmpty(startTime) && !ObjectUtils.isEmpty(endTime)){
wrapper.between(Allocation::getEscalationTime,startTime,endTime);
}
wrapper.eq(Allocation::getIsDel,0).eq(Allocation::getIsInvalid,0);
- wrapper.orderByDesc(Allocation::getEscalationTime);
+ wrapper.orderByDesc(Allocation::getEscalationTime,Allocation::getAllocationId);
List<Allocation> allocations = allocationMapper.selectList(wrapper);
for (Allocation allocation : allocations) {
AllocationFindVo allocationFindVo = new AllocationFindVo();
BeanUtils.copyProperties(allocation,allocationFindVo);
Integer state1 = allocationFindVo.getState();
- if (integer==0 || integer==1){
- if (state1==20){
+ if ( integer==2){
+ if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }else if (state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
- }else if (state1==30){
- allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
- }else if (state1==40 ||state1==50){
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
}
- }else {
- if (state1==20){
+ }else if(integer==1){
+ if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)||state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
- }else if (state1==30){
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ }else if(integer==0) {
+ if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
- }else if (state1==40||state1==50){
+ }else if (state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
}
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index 088bc46..c1fb0e1 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -1,11 +1,16 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.SysDictType;
import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.service.SysDictTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.Constants;
+
import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.web.config.QuerydslWebConfiguration;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -21,6 +26,8 @@
@Service
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements SysDictTypeService {
+ @Autowired
+ private SysDictTypeMapper sysDictTypeMapper;
@Override
public List<SysDictData> listAll(String code, String dataKey) {
List<SysDictData> listAll = this.baseMapper.selectCodeList(code,dataKey);
@@ -43,4 +50,10 @@
List<SysDictData> listAll = this.baseMapper.selectIdList(code,dataKey);
return listAll;
}
+
+ @Override
+ public SysDictType slectFind(String name) {
+ SysDictType sysDictType = this.baseMapper.selectFind(name);
+ return sysDictType;
+ }
}
diff --git a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
index e438644..29aebce 100644
--- a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
+++ b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -30,4 +30,10 @@
and t1.is_delete = 0
order by t1.create_time desc
</select>
+
+ <select id="selectFind" resultType="com.moral.api.entity.SysDictType">
+ select * from sys_dict_type
+ where sys_dict_type.name= #{name} AND is_delete = 0
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 3c726b1..ac3c4e0 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -57,6 +57,9 @@
List<Double> data = new ArrayList<>();
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
+ if (ObjectUtils.isEmpty(dataValue.get(Constants.SENSOR_CODE_O3))){
+ continue;
+ }
Double o3 = Double.parseDouble(dataValue.get(Constants.SENSOR_CODE_O3).toString());
//O3���������������
--
Gitblit v1.8.0