chore:测试提交

jinpengyong

2023-10-23 a1ef8a466a6603fe37cb6f7341ce127ab0861c07

chore:测试提交

 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);
}

 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);
}

 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());

 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;
    }
}

 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>