From a1ef8a466a6603fe37cb6f7341ce127ab0861c07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Oct 2023 12:58:33 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.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 | 5 ++++-
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 13 +++++++++++++
5 files changed, 27 insertions(+), 1 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/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 9f7971d..69b1b23 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());
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
--
Gitblit v1.8.0