Skip to content

A
amos-boot-biz
Commit f80789a1 authored by tianbo's avatar tianbo
Browse files
Options

feat(statistics): 优化安全问题追踪查询逻辑并修复地址设置问题

- 优化安全问题追踪查询，使用 limit 1 提高查询效率 - 移除冗余的列表查询，改用单条记录查询 - 修复企业注册地址设置时的空指针异常 - 更新分页查询逻辑以支持更精确的数据获取 - 注释掉未使用的账号类型相关代码
parent 1aace73e
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 80 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/SafetyProblemTracingMapper.java
View file @ f80789a1
......@@ -17,7 +17,11 @@ import java.util.Map;
*/
public interface SafetyProblemTracingMapper extends BaseMapper<SafetyProblemTracing> {
Page<SafetyProblemTracingDto> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingDto> page, @Param("problemModel")SafetyProblemTracingDto problemModel);
List<SafetyProblemTracingDto> queryForSafetyProblemTracingPage(@Param("size") Long size,
@Param("offset") Long offset,
@Param("problemModel") SafetyProblemTracingDto problemModel);
Long queryForSafetyProblemTracingCount(@Param("problemModel") SafetyProblemTracingDto problemModel);
Page<Map<String, Object>> queryEquipListByProblemId(Page<Map<String, Object>> page, String problemId);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/SafetyProblemTracingMapper.xml
View file @ f80789a1
......@@ -2,107 +2,100 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper">
<select id="queryForSafetyProblemTracingPage"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto">
SELECT
spt.sequence_nbr,
spt.problem_type,
spt.problem_desc,
spt.source_type,
spt.problem_time,
spt.principal_unit,
spt.principal_unit_type,
spt.governing_body,
spt.region_name,
spt.problem_status,
CASE
WHEN spt.problem_status_code = '0' THEN '红'
ELSE '绿'
END AS hiddenDangersLevel,
cdd.extend::json ->> 'pic' AS problemTypePic
FROM tzs_safety_problem_tracing spt
LEFT JOIN cb_data_dictionary cdd
ON cdd.type = 'ISSUE_TYPE'
AND cdd.code = spt.problem_type_code
<sql id="sptWhereConditions">
<where>
spt.is_delete = '0'
<if test="problemModel.problemNum != null and problemModel.problemNum != ''">
AND spt.problem_num LIKE CONCAT('%', #{problemModel.problemNum}, '%')
</if>
<if test="problemModel.problemStatus != null and problemModel.problemStatus != ''">
AND spt.problem_status = #{problemModel.problemStatus}
</if>
<if test="problemModel.equipListCode != null and problemModel.equipListCode != ''">
AND spt.equip_list_code = #{problemModel.equipListCode}
</if>
<if test="problemModel.equCategoryCode != null and problemModel.equCategoryCode != ''">
AND spt.equ_category_code = #{problemModel.equCategoryCode}
</if>
<if test="problemModel.sourceTypeCode != null and problemModel.sourceTypeCode != ''">
AND spt.source_type_code = #{problemModel.sourceTypeCode}
</if>
<if test="problemModel.problemLevelCode != null and problemModel.problemLevelCode != ''">
AND spt.problem_level_code = #{problemModel.problemLevelCode}
</if>
<if test="problemModel.problemTypeCode != null and problemModel.problemTypeCode != ''">
AND spt.problem_type_code = #{problemModel.problemTypeCode}
</if>
<if test="problemModel.problemTimeRange != null and problemModel.problemTimeRange.beginDate != null">
AND to_char(spt.problem_time, 'YYYY-MM-DD') <![CDATA[>=]]>
to_char(#{problemModel.problemTimeRange.beginDate}::timestamp, 'YYYY-MM-DD')
</if>
<if test="problemModel.problemTimeRange != null and problemModel.problemTimeRange.endDate != null">
AND to_char(spt.problem_time, 'YYYY-MM-DD') <![CDATA[<=]]>
to_char(#{problemModel.problemTimeRange.endDate}::timestamp, 'YYYY-MM-DD')
</if>
<if test="problemModel.problemDesc != null and problemModel.problemDesc != ''">
AND spt.problem_desc LIKE CONCAT('%', #{problemModel.problemDesc}, '%')
</if>
<if test="problemModel.sourceId != null and problemModel.sourceId != ''">
AND spt.source_id = #{problemModel.sourceId}
</if>
<if test="problemModel.governingBodyOrgCode != null and problemModel.governingBodyOrgCode != ''">
AND spt.governing_body_org_code LIKE CONCAT(#{problemModel.governingBodyOrgCode}, '%')
</if>
<if test="problemModel.governingBodyCode != null and problemModel.governingBodyCode != ''">
AND spt.governing_body_code = #{problemModel.governingBodyCode}
</if>
<if test="problemModel.principalUnit != null and problemModel.principalUnit != ''">
AND spt.principal_unit LIKE CONCAT('%', #{problemModel.principalUnit}, '%')
</if>
<if test="problemModel.principalUnitType != null and problemModel.principalUnitType != ''">
AND spt.principal_unit_type LIKE CONCAT('%', #{problemModel.principalUnitType}, '%')
</if>
<if test="problemModel.hiddenDangersLevel != null and problemModel.hiddenDangersLevel != ''">
AND spt.problem_status_code = #{problemModel.hiddenDangersLevel}
</if>
<if test="problemModel.regionCode != null and problemModel.regionCode != ''">
AND spt.region_code LIKE CONCAT('%', #{problemModel.regionCode}, '%')
</if>
<if test="problemModel.problemStatusCode != null and problemModel.problemStatusCode != ''">
AND spt.problem_status_code = #{problemModel.problemStatusCode}
</if>
</where>
</sql>
<select id="queryForSafetyProblemTracingPage"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto">
SELECT
spt.sequence_nbr,
spt.problem_type,
spt.problem_desc,
spt.source_type,
spt.problem_time,
spt.principal_unit,
spt.principal_unit_type,
spt.governing_body,
spt.region_name,
spt.problem_status,
CASE
WHEN spt.problem_status_code = '0' THEN '红'
ELSE '绿'
END AS hiddenDangersLevel,
cdd.extend::json ->> 'pic' AS problemTypePic
FROM tzs_safety_problem_tracing spt
LEFT JOIN cb_data_dictionary cdd
ON cdd.type = 'ISSUE_TYPE'
AND cdd.code = spt.problem_type_code
<include refid="sptWhereConditions"/>
ORDER BY spt.create_date DESC
LIMIT #{size} OFFSET #{offset}
</select>
<select id="queryForSafetyProblemTracingCount" resultType="long">
SELECT
count(*)
FROM tzs_safety_problem_tracing spt
<include refid="sptWhereConditions"/>
</select>
<select id="queryEquipListByProblemId" resultType="java.util.Map">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingServiceImpl.java
View file @ f80789a1
......@@ -75,7 +75,10 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
* 分页查询
*/
public Page<SafetyProblemTracingDto> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
long total = this.baseMapper.queryForSafetyProblemTracingCount(problemModel);
page.setRecords(this.baseMapper.queryForSafetyProblemTracingPage(page.getSize(), Long.min(page.getSize() * (page.getCurrent() - 1), total), problemModel));
page.setTotal(total);
return page;
}
public Page<SafetyProblemTracingDto> getProblemRecords(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
......@@ -94,7 +97,7 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
Map<String, String> unitTypeMap = unitTypeList.stream().collect(Collectors.toMap(DataDictionary::getCode, DataDictionary::getName));
problemModel.setPrincipalUnitType(unitTypeMap.getOrDefault(problemModel.getPrincipalUnitType(),null));
}
return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
return this.queryForSafetyProblemTracingPage(page, problemModel);
}
public String getAndSetOrgCode(String cityCode) {
......@@ -111,7 +114,7 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
public Page<SafetyProblemTracingDto> queryProblemPageByEquipId(Page<SafetyProblemTracingDto> page, String equipId) {
SafetyProblemTracingDto problemModel = new SafetyProblemTracingDto();
problemModel.setSourceId(equipId);
return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
return this.queryForSafetyProblemTracingPage(page, problemModel);
}
/**
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
View file @ f80789a1
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -2739,10 +2740,11 @@ public class JGDPStatisticsServiceImpl {
lambdaQueryWrapper.eq(SafetyProblemTracing::getSourceId, record);
lambdaQueryWrapper.orderByDesc(SafetyProblemTracing::getRecDate);
lambdaQueryWrapper.eq(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.UNHANDLED.getCode());
List<SafetyProblemTracing> safetyProblemTracings = safetyProblemTracingMapper.selectList(lambdaQueryWrapper);
if (!ObjectUtils.isEmpty(safetyProblemTracings)) {
objMap.put("problemStatus", ProblemStatusEnum.getNameByDesc.get(safetyProblemTracings.get(0).getProblemStatus()));
objMap.put("problemTime", safetyProblemTracings.get(0).getProblemTime());
lambdaQueryWrapper.last("limit 1");
SafetyProblemTracing safetyProblemTracing = safetyProblemTracingMapper.selectOne(lambdaQueryWrapper);
if (!ObjectUtils.isEmpty(safetyProblemTracing)) {
objMap.put("problemStatus", ProblemStatusEnum.getNameByDesc.get(safetyProblemTracing.getProblemStatus()));
objMap.put("problemTime", safetyProblemTracing.getProblemTime());
}
// 使用信息
......@@ -3051,8 +3053,8 @@ public class JGDPStatisticsServiceImpl {
objMap.put("completedBusinessTypes", judgeTheBusinessAccordingByRecord(record, objMap));
// 账号类型（用于车用气瓶流程页面-》监管审核-》打开设备详情 时隐藏保存按钮）
//ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
//objMap.put("accountType", reginParams.getCompany().getCompanyType());
// ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// objMap.put("accountType", reginParams.getCompany().getCompanyType());
// 登记日期
if (!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())) {
Optional<JgUseRegistrationManage> firstRecord = jgUseRegistrationManageMapper.selectList(new QueryWrapper<JgUseRegistrationManage>().lambda()
......@@ -3074,11 +3076,10 @@ public class JGDPStatisticsServiceImpl {
public IdxBizJgConstructionInfo queryConstructionNewestDetailByRecord(String record) {
IdxBizJgConstructionInfo result = new IdxBizJgConstructionInfo();
QueryWrapper<IdxBizJgConstructionInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(IdxBizJgConstructionInfo::getRecord, record).orderByDesc(IdxBizJgConstructionInfo::getUscDate);
List<IdxBizJgConstructionInfo> constructionInfoList = idxBizJgConstructionInfoMapper.selectList(queryWrapper);
if (!ValidationUtil.isEmpty(constructionInfoList)) {
BeanUtils.copyProperties(constructionInfoList.get(0), result);
;
queryWrapper.lambda().eq(IdxBizJgConstructionInfo::getRecord, record).orderByDesc(IdxBizJgConstructionInfo::getUscDate).last("limit 1");
IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoMapper.selectOne(queryWrapper);
if (!ValidationUtil.isEmpty(constructionInfo)) {
BeanUtils.copyProperties(constructionInfo, result);
}
return result;
}
......@@ -3087,10 +3088,10 @@ public class JGDPStatisticsServiceImpl {
public IdxBizJgMaintenanceRecordInfo queryMaintenanceNewestDetailByRecord(String record) {
IdxBizJgMaintenanceRecordInfo result = new IdxBizJgMaintenanceRecordInfo();
QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord, record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getInformEnd);
List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = idxBizJgMaintenanceRecordInfoMapper.selectList(queryWrapper);
if (!ValidationUtil.isEmpty(maintenanceRecordInfoList)) {
BeanUtils.copyProperties(maintenanceRecordInfoList.get(0), result);
queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord, record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getInformEnd).last("limit 1");
IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = idxBizJgMaintenanceRecordInfoMapper.selectOne(queryWrapper);
if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
BeanUtils.copyProperties(maintenanceRecordInfo, result);
}
return result;
}
......@@ -3099,10 +3100,10 @@ public class JGDPStatisticsServiceImpl {
public IdxBizJgInspectionDetectionInfo queryInspectionNewestDetailByRecord(String record) {
IdxBizJgInspectionDetectionInfo result = new IdxBizJgInspectionDetectionInfo();
QueryWrapper<IdxBizJgInspectionDetectionInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getRecord, record).orderByDesc(IdxBizJgInspectionDetectionInfo::getInspectDate);
List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoMapper.selectList(queryWrapper);
if (!ValidationUtil.isEmpty(inspectionDetectionInfoList)) {
BeanUtils.copyProperties(inspectionDetectionInfoList.get(0), result);
queryWrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getRecord, record).orderByDesc(IdxBizJgInspectionDetectionInfo::getInspectDate).last("limit 1");
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = idxBizJgInspectionDetectionInfoMapper.selectOne(queryWrapper);
if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
BeanUtils.copyProperties(inspectionDetectionInfo, result);
}
return result;
}
......@@ -3115,21 +3116,32 @@ public class JGDPStatisticsServiceImpl {
public String judgeTheBusinessAccordingByRecord(String record, Map<String, Object> objMap) {
String business = "";
// 安装告知
Map<String, Object> installDetail = useRegistrationMapper.getInstallDetail(record);
if (!ObjectUtils.isEmpty(installDetail)) {
String constructionSeq = MapUtil.getStr(objMap, "CONSTRUCTIONINFO_SEQ");
if (!ObjectUtils.isEmpty(constructionSeq)) {
business = business + ",安装告知";
objMap.putAll(installDetail);
objMap.put("insOtherAccessories", JSON.parse(Optional.ofNullable(installDetail.get("insOtherAccessories")).orElse("").toString()));
objMap.put("installProxyStatementAttachment", JSON.parse(Optional.ofNullable(installDetail.get("installProxyStatementAttachment")).orElse("").toString()));
objMap.put("installContractAttachment", JSON.parse(Optional.ofNullable(installDetail.get("installContractAttachment")).orElse("").toString()));
objMap.put("installStreet", objMap.get("CONSTRUCTION_STREET_NAME"));
objMap.put("installLeaderName", objMap.get("FACTORY_USE_SITE_STREET"));
objMap.put("installStartDate", objMap.get("USC_DATE"));
objMap.put("installLeaderPhone", objMap.get("CONSTRUCTION_LEADER_PHONE"));
objMap.put("installPropertyUnitName", objMap.get("USC_UNIT_NAME"));
objMap.put("installCounty", objMap.get("CONSTRUCTION_COUNTY_NAME"));
objMap.put("installCity", objMap.get("CONSTRUCTION_CITY_NAME"));
objMap.put("installProvince", objMap.get("CONSTRUCTION_PROVINCE_NAME"));
objMap.put("insOtherAccessories", JSON.parse(Optional.ofNullable(objMap.get("CONSTRUCTION_OTHER_ACCESSORIES")).orElse("").toString()));
objMap.put("installProxyStatementAttachment", JSON.parse(Optional.ofNullable(objMap.get("PROXY_STATEMENT_ATTACHMENT")).orElse("").toString()));
objMap.put("installContractAttachment", JSON.parse(Optional.ofNullable(objMap.get("CONSTRUCTION_CONTRACT_ATTACHMENT")).orElse("").toString()));
}
// 维保备案
Map<String, Object> maintenanceDetail = useRegistrationMapper.getMaintenanceDetail(record);
if (!ObjectUtils.isEmpty(maintenanceDetail)) {
String maintenanceSeq = MapUtil.getStr(objMap, "MAINTENANCERECORDINFO_SEQ");
if (!ObjectUtils.isEmpty(maintenanceSeq)) {
business = business + ",维保合同备案";
objMap.putAll(maintenanceDetail);
objMap.put("maintenanceContract", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
objMap.put("maintOtherAccessories", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));
objMap.put("maintenanceManagerOneName", objMap.get("ME_MASTER"));
objMap.put("maintenanceManagerOnePhone", objMap.get("ME_MASTER_PHONE"));
objMap.put("maintenanceManagerTwoName", objMap.get("ME_MASTER1"));
objMap.put("maintenanceManagerTwoPhone", objMap.get("ME_MASTER1_PHONE"));
objMap.put("maintenanceUnitName", objMap.get("ME_UNIT_NAME"));
objMap.put("maintenanceContract", JSON.parse(Optional.ofNullable(objMap.get("REPAIR_INFORM")).orElse("").toString()));
objMap.put("maintOtherAccessories", JSON.parse(Optional.ofNullable(objMap.get("ME_OTHER_ACCESSORIES")).orElse("").toString()));
}
// 使用登记
Map<String, Object> useRegistrationDetail = useRegistrationMapper.getUseRegistrationDetail(record);
......@@ -3422,7 +3434,7 @@ public class JGDPStatisticsServiceImpl {
public Page<SafetyProblemTracingDto> queryProblemPageByEquipId(Page<SafetyProblemTracingDto> page, String equipId) {
SafetyProblemTracingDto problemModel = new SafetyProblemTracingDto();
problemModel.setSourceId(equipId);
return safetyProblemTracingMapper.queryForSafetyProblemTracingPage(page, problemModel);
return this.querySatetyProblemTracingPage(page, problemModel);
}
/**
......@@ -3637,7 +3649,14 @@ public class JGDPStatisticsServiceImpl {
Map<String, String> unitTypeMap = unitTypeList.stream().collect(Collectors.toMap(DataDictionary::getCode, DataDictionary::getName));
problemModel.setPrincipalUnitType(unitTypeMap.getOrDefault(problemModel.getPrincipalUnitType(), null));
}
return safetyProblemTracingMapper.queryForSafetyProblemTracingPage(page, problemModel);
return this.querySatetyProblemTracingPage(page, problemModel);
}
public Page<SafetyProblemTracingDto> querySatetyProblemTracingPage(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
long total = safetyProblemTracingMapper.queryForSafetyProblemTracingCount(problemModel);
page.setRecords(safetyProblemTracingMapper.queryForSafetyProblemTracingPage(page.getSize(), Long.min(page.getSize() * (page.getCurrent() - 1), total), problemModel));
page.setTotal(total);
return page;
}
public Page<JgUseRegistrationManageDto> getRegistrationRecords(Page<JgUseRegistrationManageDto> page, JgUseRegistrationManageDto dto, String cityCode) {
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ f80789a1
......@@ -753,9 +753,11 @@ public class TzBaseEnterpriseInfoServiceImpl
});
if (!ValidationUtil.isEmpty(regUnitIcDto.getSequenceNbr())) {
List<String> addressList = (List<String>) map.get("registerAddressList");
tzBaseEnterpriseInfo.setProvince(addressList.get(0));
tzBaseEnterpriseInfo.setCity(addressList.get(1));
tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
if (!ValidationUtil.isEmpty(addressList) && addressList.size() > 2) {
tzBaseEnterpriseInfo.setProvince(addressList.get(0));
tzBaseEnterpriseInfo.setCity(addressList.get(1));
tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
}
tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("street")) ? null : String.valueOf(map.get("street")));
// tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment