From c64ca12b8679d73fc7f8109f0e08fa8c74352164 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:39 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java | 13 ++++++
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 2
screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java | 8 ++++
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java | 4 ++
screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java | 2 +
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 25 ++++++++++--
screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml | 10 +++++
screen-api/src/main/java/com/moral/api/config/Interceptor/SyncConfiguration.java | 42 +++++++++++++++++++++
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 7 +++
9 files changed, 108 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/config/Interceptor/SyncConfiguration.java b/screen-api/src/main/java/com/moral/api/config/Interceptor/SyncConfiguration.java
new file mode 100644
index 0000000..7f2a3d1
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/config/Interceptor/SyncConfiguration.java
@@ -0,0 +1,42 @@
+package com.moral.api.config.Interceptor;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+@EnableAsync
+public class SyncConfiguration {
+
+ @Bean(name = "asyncPoolTaskExecutor")
+ public ThreadPoolTaskExecutor executor() {
+ ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+ //���������������
+ taskExecutor.setCorePoolSize(10);
+ //������������������������������������,���������������������������������������������������������������������������
+ taskExecutor.setMaxPoolSize(20);
+ //������������
+ taskExecutor.setQueueCapacity(50);
+ //������������������,���������������������������������������������������������������������������������
+ taskExecutor.setKeepAliveSeconds(200);
+ //������������������������������
+ taskExecutor.setThreadNamePrefix("async-");
+ /**
+ * ������������������������������������������������������������������������������maximumPoolSize���������������������������������������������������������
+ * ������������������������������
+ * ThreadPoolExecutor.AbortPolicy:���������������������RejectedExecutionException���������
+ * ThreadPoolExecutor.DiscardPolicy������������������������������������������������
+ * ThreadPoolExecutor.DiscardOldestPolicy���������������������������������������������������������������������������������������
+ * ThreadPoolExecutor.CallerRunsPolicy��������������������������������������������������� execute() ���������������������
+ */
+ taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+ taskExecutor.initialize();
+ return taskExecutor;
+ }
+
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java b/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
index 6dec41c..68b2dd7 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
@@ -22,4 +22,12 @@
* ������������id
*/
List<Integer> selectCodeList(@Param("code") String code,@Param("id") Integer id);
+
+ /**
+ * ������������������������
+ * @param code
+ * @param id
+ * @return
+ */
+ String selectName(@Param("code") String code,@Param("id") Integer id);
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java
index a0fca82..a5b3b7e 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.ext.allocation;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.moral.api.entity.Allocation;
import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
import com.moral.api.pojo.vo.file.FileVo;
@@ -34,4 +35,16 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+
+ //������������������
+ @TableField(exist = false)
+ private String unitName;
+
+ //������������������
+ @TableField(exist = false)
+ private String escalationUnitName;
+ @TableField(exist = false)
+ //������������������
+ private String polluteTypeName;
+
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
index 3b4b5d2..bedf4e4 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
@@ -1,6 +1,7 @@
package com.moral.api.pojo.ext.allocation;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.moral.api.entity.Allocation;
import io.swagger.annotations.ApiModelProperty;
@@ -27,4 +28,7 @@
@ApiModelProperty(value = "������������")
private String stateName;
+
+ //������������������
+ private String escalationUnitName;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
index ddf8f60..64c73f2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -139,6 +139,13 @@
@TableField(exist = false)
private String time;
+ @TableField(exist = false)
+ private String unitName;
+ @TableField(exist = false)
+ private String escalationUnitName;
+ @TableField(exist = false)
+ private String polluteTypeName;
+
public static AllocationVo convert(AllocationExt allocationExt) {
AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
index 4cf58f7..00c0cbb 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
@@ -74,6 +74,8 @@
@ApiModelProperty(value = "������������")
private String stateName;
+ //������������������
+ private String escalationUnitName;
public Integer getResidueDay() {
int day=0;
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 727e797..0b9da91 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
@@ -508,6 +508,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;
}
@@ -708,6 +711,8 @@
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);
@@ -861,8 +866,13 @@
List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
//���������������������
- appAuthority.setCode(1);
- appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ 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){
@@ -877,7 +887,7 @@
appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
return appAuthority;
}else {
- appAuthority.setCode(1);
+ appAuthority.setCode(2);
appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
return appAuthority;
}
@@ -891,7 +901,7 @@
appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
return appAuthority;
}else {
- appAuthority.setCode(1);
+ appAuthority.setCode(2);
appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
return appAuthority;
}
@@ -943,4 +953,11 @@
}
return f;
}
+
+
+ private ResponsibilityUnit getUnitName(Integer unitId){
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+ return responsibilityUnit;
+ }
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 86fd061..8ab5ba7 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -247,7 +247,7 @@
* @param appAllocationPushUserCond
*/
@Override
- @Async
+ @Async("asyncPoolTaskExecutor")
public void pushOneUser(Allocation appAllocationPushUserCond) {
QxUser currentUser = UserHelper.getCurrentUser();
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(appAllocationPushUserCond.getUnitId());
diff --git a/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml b/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
index 522b283..b8efaa6 100644
--- a/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
+++ b/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
@@ -42,4 +42,14 @@
select area_code from responsibility_unit t where unit_id = #{id}
</select>
+
+ <select id="selectName" resultType="java.lang.String">
+ select t1.dataValue from sys_dict_type t
+ left join sys_dict_data t1 on t1.dict_type_id = t.id
+
+ where t.is_delete = 0 and t.name = #{code} and t1.dataKey = #{id} and t1.is_delete = 0
+
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0