Skip to content

A
amos-boot-biz
Commit faf4f685 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register_to_0715' of…

Merge branch 'develop_tzs_register_to_0715' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register_to_0715
parents bcf8915b 29c3299e
Show whitespace changes
Inline Side-by-side
Showing with 425 additions and 258 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/CommonMapper.java
View file @ faf4f685
......@@ -132,5 +132,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
* @return 统计数量数组
*/
List<Long> countAllInFlowingForDPNoFinishedBizData(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Map<String, String>> getOrgCodeByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/DPStatisticsMapper.java
View file @ faf4f685
......@@ -11,32 +11,6 @@ public interface DPStatisticsMapper {
List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
int installCount(@Param("orgCode") String orgCode);
int maintenanceNoticeCount(@Param("orgCode") String orgCode);
int reformCount(@Param("orgCode") String orgCode);
int transferCount(@Param("orgCode") String orgCode);
int useCount(@Param("orgCode") String orgCode);
int vehicleCount(@Param("orgCode") String orgCode);
int changeNameCount(@Param("orgCode") String orgCode);
int changeReformCount(@Param("orgCode") String orgCode);
int changeTransferCount(@Param("orgCode") String orgCode);
int changeUnitCount(@Param("orgCode") String orgCode);
int changeVehicleCount(@Param("orgCode") String orgCode);
int disableCount(@Param("orgCode") String orgCode);
int cancelCount(@Param("cityCode") String cityCode);
List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
......@@ -67,4 +41,29 @@ public interface DPStatisticsMapper {
String newVehicleCountByYear(@Param("cityCode") String cityCode);
String newVehicleCountByMonth(@Param("cityCode") String cityCode);
List<Map<String, Object>> installCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> maintenanceNoticeCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> reformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> transferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> useCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> vehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeNameCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeReformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeTransferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeUnitCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeVehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> disableCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> cancelCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ faf4f685
......@@ -1036,4 +1036,12 @@
union all
select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status != '使用单位已撤回' and a.audit_status != '已作废' and a.audit_status != '已完成' and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_le(CAST(a.create_date as date),#{dto.endDate})
</select>
<select id="getOrgCodeByCompanyCodes" resultType="java.util.Map">
select P.org_code AS orgCode,R.region_name AS regionName from privilege_company P
INNER JOIN systemctl_region R ON P.company_code = R.region_code
where P.company_code in
<foreach collection="regionCodes" item="regionCode" separator="," open="(" close=")">
#{regionCode} :: VARCHAR
</foreach>
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.xml
View file @ faf4f685
......@@ -36,154 +36,6 @@
GROUP BY
sr.region_code
</select>
<select id="installCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_installation_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="maintenanceNoticeCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_maintain_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="reformCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_reform_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="transferCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_transfer_notice T
WHERE
T.notice_status = 6616
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="useCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_use_registration T
WHERE
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="vehicleCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_vehicle_information T
WHERE
T.status = '已完成'
AND T.receive_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeNameCount" resultType="int">
SELECT COUNT
( 1 )
FROM
(
SELECT
crn.sequence_nbr,
pc.org_code
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code = pc.org_code
INNER JOIN tzs_jg_change_registration_name crn ON bi.office_region LIKE CONCAT ( '%', crn.receive_company_code, '%' )
AND crn.audit_status = '已完成'
WHERE
pc.org_code LIKE concat ( #{orgCode}, '%' )
GROUP BY
crn.sequence_nbr
)
</select>
<select id="changeReformCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_change_registration_reform T
WHERE
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeTransferCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_change_registration_transfer T
WHERE
T.audit_status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeUnitCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_change_registration_unit T
WHERE
T.status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="changeVehicleCount" resultType="int">
SELECT COUNT
( 1 )
FROM
tzs_jg_change_vehicle_registration_unit T
WHERE
T.status = '已完成'
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="disableCount" resultType="int">
SELECT COUNT
( 1 )
FROM
(
SELECT
crn.sequence_nbr
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code = pc.org_code
INNER JOIN tzs_jg_enable_disable crn ON bi.office_region LIKE CONCAT ( '%', crn.receive_company_code, '%' )
AND crn.audit_status = '已完成'
WHERE
pc.org_code LIKE concat ( #{orgCode}, '%' )
GROUP BY
crn.sequence_nbr
)
</select>
<select id="cancelCount" resultType="int">
SELECT COUNT
( 1 )
FROM
(
SELECT
crn.sequence_nbr
FROM
privilege_company pc
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code = pc.org_code
INNER JOIN tzs_jg_scrap_cancel crn ON bi.office_region LIKE CONCAT ( '%', crn.receive_company_code, '%' )
AND crn.audit_status = '已完成'
WHERE
pc.org_code LIKE concat ( #{cityCode}, '%' )
GROUP BY
crn.sequence_nbr
)
</select>
<select id="installEquCount" resultType="java.util.Map">
SELECT COUNT
( 1 ),
......@@ -449,4 +301,226 @@
ORDER BY
ur.rec_date
</select>
<select id="installCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_installation_notice T
WHERE
T.notice_status = 6616
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="maintenanceNoticeCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_maintain_notice T
WHERE
T.notice_status = 6616
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="reformCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_reform_notice T
WHERE
T.notice_status = 6616
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="transferCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_transfer_notice T
WHERE
T.notice_status = 6616
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="useCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_use_registration T
WHERE
T.audit_status = '已完成'
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="vehicleCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_org_code AS orgCode
FROM
tzs_jg_vehicle_information T
WHERE
T.status = '已完成'
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_org_code
</select>
<select id="changeNameCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.org_code AS orgCode
FROM
(
SELECT
crn.sequence_nbr,
pc.org_code
FROM
privilege_company pc
INNER JOIN tzs_jg_change_registration_name crn ON crn.receive_org_code = pc.company_code
AND crn.audit_status = '已完成'
WHERE
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
crn.sequence_nbr
) T
GROUP BY
T.org_code
</select>
<select id="changeReformCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_change_registration_reform T
WHERE
T.audit_status = '已完成'
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="changeTransferCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_change_registration_transfer T
WHERE
T.audit_status = '已完成'
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="changeUnitCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_change_registration_unit T
WHERE
T.status = '已完成'
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="changeVehicleCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.receive_company_org_code AS orgCode
FROM
tzs_jg_change_vehicle_registration_unit T
WHERE
T.status = '已完成'
AND
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
T.receive_company_org_code
</select>
<select id="disableCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.org_code AS orgCode
FROM
(
SELECT
crn.sequence_nbr,
pc.org_code
FROM
privilege_company pc
INNER JOIN tzs_jg_enable_disable crn ON crn.receive_org_code = pc.company_code
AND crn.audit_status = '已完成'
WHERE
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
crn.sequence_nbr
) T
GROUP BY
T.org_code
</select>
<select id="cancelCountByOrgCodes" resultType="java.util.Map">
SELECT COUNT
( 1 ),
T.org_code AS orgCode
FROM
(
SELECT
crn.sequence_nbr,
pc.org_code
FROM
privilege_company pc
INNER JOIN tzs_jg_scrap_cancel crn ON crn.receive_org_code = pc.company_code
AND crn.audit_status = '已完成'
WHERE
<foreach collection="orgCodes" item="orgCode" separator="OR" open="(" close=")">
pc.org_code LIKE CONCAT ( #{orgCode}, '%' )
</foreach>
GROUP BY
crn.sequence_nbr
) T
GROUP BY
T.org_code
</select>
</mapper>
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/DPStatisticsServiceImpl.java
View file @ faf4f685
......@@ -49,6 +49,7 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
......@@ -915,152 +916,223 @@ public class DPStatisticsServiceImpl {
private Map<String, Object> cancelCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
Map<String,Integer> countMap = new HashMap<>();
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode() + "");
if (orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
List<Integer> regionCodeList = regionModelList.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
List<Map<String, String>> orgCodeByCompanyCodes = commonMapper.getOrgCodeByCompanyCodes(regionCodeList);
Map<String, String> companyMap = new HashMap<>();
List<String> orgCodes = new ArrayList<>();
orgCodeByCompanyCodes.stream().forEach(t->{
companyMap.put(t.get("regionName")+"",t.get("orgCode"));
if(StringUtils.isNotBlank(t.get("orgCode"))) {
orgCodes.add(t.get("orgCode"));
}
}
if(orgCode != null) {
});
//注销报废
int cancelCoount = dpStatisticsMapper.cancelCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(cancelCoount);
}else {
List<Map<String,Object>> cancelCoountList = dpStatisticsMapper.cancelCountByOrgCodes(orgCodes);
countByMap(countMap,cancelCoountList);
for(int i = 0; i < regionModelList.size(); i++){
AtomicInteger count = new AtomicInteger();
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
if(StringUtils.isNotEmpty(companyMap.get(regionModelList.get(i).getRegionName()))){
int finalI = i;
countMap.forEach((k, v)->{
if(k.startsWith(companyMap.get(regionModelList.get(finalI).getRegionName()))){
if(null != v){
count.addAndGet(v);
}
}
});
}
yDataList.add(count);
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> disableCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
Map<String,Integer> countMap = new HashMap<>();
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode() + "");
if (orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
List<Integer> regionCodeList = regionModelList.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
List<Map<String, String>> orgCodeByCompanyCodes = commonMapper.getOrgCodeByCompanyCodes(regionCodeList);
Map<String, String> companyMap = new HashMap<>();
List<String> orgCodes = new ArrayList<>();
orgCodeByCompanyCodes.stream().forEach(t->{
companyMap.put(t.get("regionName")+"",t.get("orgCode"));
if(StringUtils.isNotBlank(t.get("orgCode"))) {
orgCodes.add(t.get("orgCode"));
}
if(orgCode != null) {
});
//启用停用
int disableCount = dpStatisticsMapper.disableCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(disableCount);
List<Map<String,Object>> disableCountList = dpStatisticsMapper.disableCountByOrgCodes(orgCodes);
countByMap(countMap,disableCountList);
}else{
for(int i = 0; i < regionModelList.size(); i++){
AtomicInteger count = new AtomicInteger();
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
if(StringUtils.isNotEmpty(companyMap.get(regionModelList.get(i).getRegionName()))){
int finalI = i;
countMap.forEach((k, v)->{
if(k.startsWith(companyMap.get(regionModelList.get(finalI).getRegionName()))){
if(null != v){
count.addAndGet(v);
}
}
});
}
yDataList.add(count);
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> changeCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
Map<String,Integer> countMap = new HashMap<>();
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode() + "");
if (orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
List<Integer> regionCodeList = regionModelList.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
List<Map<String, String>> orgCodeByCompanyCodes = commonMapper.getOrgCodeByCompanyCodes(regionCodeList);
Map<String, String> companyMap = new HashMap<>();
List<String> orgCodes = new ArrayList<>();
orgCodeByCompanyCodes.stream().forEach(t->{
companyMap.put(t.get("regionName")+"",t.get("orgCode"));
if(StringUtils.isNotBlank(t.get("orgCode"))) {
orgCodes.add(t.get("orgCode"));
}
if(orgCode != null) {
});
//更名变更登记
int changeNameList = dpStatisticsMapper.changeNameCount(orgCode);
List<Map<String,Object>> changeNameList = dpStatisticsMapper.changeNameCountByOrgCodes(orgCodes);
countByMap(countMap,changeNameList);
//改造变更登记
int reformList = dpStatisticsMapper.changeReformCount(orgCode);
List<Map<String,Object>> reformList = dpStatisticsMapper.changeReformCountByOrgCodes(orgCodes);
countByMap(countMap,reformList);
//移装变更登记
int transferList = dpStatisticsMapper.changeTransferCount(orgCode);
List<Map<String,Object>> transferList = dpStatisticsMapper.changeTransferCountByOrgCodes(orgCodes);
countByMap(countMap,transferList);
//单位变更登记
int unitList = dpStatisticsMapper.changeUnitCount(orgCode);
List<Map<String,Object>> unitList = dpStatisticsMapper.changeUnitCountByOrgCodes(orgCodes);
countByMap(countMap,unitList);
//单位变更登记
int vehicleList = dpStatisticsMapper.changeVehicleCount(orgCode);
List<Map<String,Object>> vehicleList = dpStatisticsMapper.changeVehicleCountByOrgCodes(orgCodes);
countByMap(countMap,vehicleList);
for(int i = 0; i < regionModelList.size(); i++){
AtomicInteger count = new AtomicInteger();
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(changeNameList + reformList + transferList + unitList + vehicleList);
}else{
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
if(StringUtils.isNotEmpty(companyMap.get(regionModelList.get(i).getRegionName()))){
int finalI = i;
countMap.forEach((k, v)->{
if(k.startsWith(companyMap.get(regionModelList.get(finalI).getRegionName()))){
if(null != v){
count.addAndGet(v);
}
}
});
}
yDataList.add(count);
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> useCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
Map<String,Integer> countMap = new HashMap<>();
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode()+"");
if(orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
List<Integer> regionCodeList = regionModelList.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
List<Map<String, String>> orgCodeByCompanyCodes = commonMapper.getOrgCodeByCompanyCodes(regionCodeList);
Map<String, String> companyMap = new HashMap<>();
List<String> orgCodes = new ArrayList<>();
orgCodeByCompanyCodes.stream().forEach(t->{
companyMap.put(t.get("regionName")+"",t.get("orgCode"));
if(StringUtils.isNotBlank(t.get("orgCode"))) {
orgCodes.add(t.get("orgCode"));
}
}
if(orgCode != null) {
//使用登记
int useCount = dpStatisticsMapper.useCount(orgCode);
//气瓶登记
int vehicleCount = dpStatisticsMapper.vehicleCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(useCount + vehicleCount);
}else{
});
//使用告知
List<Map<String,Object>> useCountList = dpStatisticsMapper.useCountByOrgCodes(orgCodes);
countByMap(countMap,useCountList);
//车用气瓶使用告知
List<Map<String, Object>> vehicleCountList = dpStatisticsMapper.vehicleCountByOrgCodes(orgCodes);
countByMap(countMap,vehicleCountList);
for(int i = 0; i < regionModelList.size(); i++){
AtomicInteger count = new AtomicInteger();
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
if(StringUtils.isNotEmpty(companyMap.get(regionModelList.get(i).getRegionName()))){
int finalI = i;
countMap.forEach((k, v)->{
if(k.startsWith(companyMap.get(regionModelList.get(finalI).getRegionName()))){
if(null != v){
count.addAndGet(v);
}
}
});
}
yDataList.add(count);
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
}
private Map<String, Object> noticeCount(Map<String, Object> resultMap, List<RegionModel> regionModelList) {
Map<String,Integer> countMap = new HashMap<>();
List<Object> xDataList = new ArrayList<>();
List<Object> yDataList = new ArrayList<>();
for(int i = 0; i < regionModelList.size(); i++) {
String orgCode = regionCodeOrgCodeMap.get(regionModelList.get(i).getRegionCode());
if (orgCode == null) {
orgCode = commonMapper.getOrgCodeByCompanyCode(regionModelList.get(i).getRegionCode()+"");
if(orgCode != null) {
regionCodeOrgCodeMap.put(regionModelList.get(i).getRegionCode() + "", orgCode);
}
List<Integer> regionCodeList = regionModelList.stream().map(m -> m.getRegionCode()).collect(Collectors.toList());
List<Map<String, String>> orgCodeByCompanyCodes = commonMapper.getOrgCodeByCompanyCodes(regionCodeList);
Map<String, String> companyMap = new HashMap<>();
List<String> orgCodes = new ArrayList<>();
orgCodeByCompanyCodes.stream().forEach(t->{
companyMap.put(t.get("regionName")+"",t.get("orgCode"));
if(StringUtils.isNotBlank(t.get("orgCode"))) {
orgCodes.add(t.get("orgCode"));
}
if(orgCode != null) {
});
//安装告知
int installCount = dpStatisticsMapper.installCount(orgCode);
List<Map<String,Object>> installCountList = dpStatisticsMapper.installCountByOrgCodes(orgCodes);
countByMap(countMap,installCountList);
//维修告知
int maintenanceCount = dpStatisticsMapper.maintenanceNoticeCount(orgCode);
List<Map<String, Object>> maintenanceCountList = dpStatisticsMapper.maintenanceNoticeCountByOrgCodes(orgCodes);
countByMap(countMap,maintenanceCountList);
//改造告知
int reformCount = dpStatisticsMapper.reformCount(orgCode);
List<Map<String, Object>> reformCountList = dpStatisticsMapper.reformCountByOrgCodes(orgCodes);
countByMap(countMap,reformCountList);
//移装告知
int transferCount = dpStatisticsMapper.transferCount(orgCode);
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(installCount + maintenanceCount + reformCount + transferCount);
}else{
List<Map<String, Object>> transferCountList = dpStatisticsMapper.transferCountByOrgCodes(orgCodes);
countByMap(countMap,transferCountList);
for(int i = 0; i < regionModelList.size(); i++){
AtomicInteger count = new AtomicInteger();
xDataList.add(regionModelList.get(i).getRegionName());
yDataList.add(0);
if(StringUtils.isNotEmpty(companyMap.get(regionModelList.get(i).getRegionName()))){
int finalI = i;
countMap.forEach((k, v)->{
if(k.startsWith(companyMap.get(regionModelList.get(finalI).getRegionName()))){
if(null != v){
count.addAndGet(v);
}
}
});
}
yDataList.add(count);
}
resultMap.put("xdata", xDataList);
resultMap.put("ydata", yDataList);
return resultMap;
......@@ -1068,10 +1140,10 @@ public class DPStatisticsServiceImpl {
private void countByMap(Map<String, Integer> countMap, List<Map<String, Object>> list) {
for (int i = 0; i < list.size(); i++) {
if (null == countMap.get(list.get(i).get("regionName"))) {
countMap.put(list.get(i).get("regionName").toString(), Integer.valueOf(list.get(i).get("count") + ""));
if (null == countMap.get(list.get(i).get("orgCode"))) {
countMap.put(list.get(i).get("orgCode").toString(), Integer.valueOf(list.get(i).get("count")+""));
} else {
countMap.put(list.get(i).get("regionName").toString(), countMap.get(list.get(i).get("regionName").toString()) + Integer.valueOf(list.get(i).get("count") + ""));
countMap.put(list.get(i).get("orgCode").toString(), countMap.get(list.get(i).get("orgCode")) + Integer.valueOf(list.get(i).get("count")+""));
}
}
}
......
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/UseRegisterEquipUsedCheckImpl.java
View file @ faf4f685
......@@ -21,7 +21,7 @@ public class UseRegisterEquipUsedCheckImpl extends BaseEquipUsedCheckService {
private RedissonClient redissonClient;
private String bizType = "useRegister";
private String bizType = "useRegistration";
private JgUseRegistrationMapper useRegistrationMapper;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java
View file @ faf4f685
......@@ -483,6 +483,19 @@ public class DPSubServiceImpl {
String url = apiObj.getString("apiPath");
String reqType = !ValidationUtil.isEmpty(apiObj.getString("httpMethod")) ? apiObj.getString("httpMethod") : "GET";
Object params = apiObj.get("params");
if (ValidationUtil.isEmpty(params) && !ValidationUtil.isEmpty(apiObj.get("queryParams"))){
JSONObject queryParam = new JSONObject();
JSONArray queryParams = apiObj.getJSONArray("queryParams");
queryParams.stream().forEach(x -> {
JSONObject xObj = (JSONObject) x;
if ("staticValue".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){
queryParam.put(xObj.getString("name"), xObj.getJSONObject("value").getString("value"));
}
});
if (!ValidationUtil.isEmpty(queryParam)){
params = queryParam;
}
}
Object body = apiObj.get("body");
ResponseEntity<String> responseEntity = null;
//如果url以/开头，则调用本服务内接口
......@@ -528,7 +541,6 @@ public class DPSubServiceImpl {
if (200 != responseModel.getStatus()){
log.info("调用第三方接口失败, 请求地址：{}", apiObj);
throw new RuntimeException(String.format("调用第三方接口失败！"));
}
JSONObject ruleData = apiObj.getJSONObject("ruleData");
......
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