From b97af962557171bbae4db9d9f232c61d7709fde6 Mon Sep 17 00:00:00 2001 From: Chendy <596813911@qq.com> Date: Tue, 2 Sep 2025 15:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=88=86?= =?UTF-8?q?=E6=9E=90=20=E6=89=A7=E6=B3=95=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppSystemController.java | 8 +++-- .../code/domain/ComprehensiveAnalysis.java | 35 ++++++++++++++++++- .../ComprehensiveAnalysisServiceImpl.java | 20 +++++++++-- .../mapper/ComprehensiveAnalysisMapper.xml | 3 +- 4 files changed, 60 insertions(+), 6 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java index 95a294ff..402bba6d 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java @@ -121,9 +121,13 @@ public class AppSystemController extends BaseController { user.setDataScopeId(null); List list = userService.selectUserListByHave(user); if(list.size()>0){ - list.stream().filter(l->StringUtils.isNotEmpty(l.getPhonenumber())).forEach(li->{ - if(!li.getPhonenumber().matches("^\\d+$")) + list.forEach(li->{ + if(StringUtils.isEmpty(li.getPhonenumber()))return; + if(li.getPhonenumber().matches("^\\d+$")){ + li.setDecryptPhoneNum(li.getPhonenumber()); + }else{ li.setDecryptPhoneNum(IdCardCryptoUtil.symmetricDecryptIdCard(KEY, li.getPhonenumber())); + } }); } //解密 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java index 32a165e0..8323c49f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java @@ -11,10 +11,16 @@ public class ComprehensiveAnalysis { private String enterpriseName; private String enterpriseAddress; /** - * 检查类型 + * 任务来源 */ private String checkCategory; private Integer checkCategoryNumber; + + /** + * 执法类别 + */ + private String lawEnforceCategory; + private Integer lawEnforceCategoryNumber; /** * 企业类型 */ @@ -62,6 +68,10 @@ public class ComprehensiveAnalysis { private List companyOrgTypeList; private List complaintTypeList; + + // 执法类别list + private List lawEnforceCategoryList; + private Long userId; private String bureauDeptId; private String bureauDeptName; @@ -103,6 +113,14 @@ public class ComprehensiveAnalysis { */ private Integer enterpriseTotal; + public List getLawEnforceCategoryList() { + return lawEnforceCategoryList; + } + + public void setLawEnforceCategoryList(List lawEnforceCategoryList) { + this.lawEnforceCategoryList = lawEnforceCategoryList; + } + public String getCheckCategory() { return checkCategory; } @@ -111,6 +129,21 @@ public class ComprehensiveAnalysis { this.checkCategory = checkCategory; } + public String getLawEnforceCategory() { + return lawEnforceCategory; + } + + public void setLawEnforceCategory(String lawEnforceCategory) { + this.lawEnforceCategory = lawEnforceCategory; + } + + public Integer getLawEnforceCategoryNumber() { + return lawEnforceCategoryNumber; + } + + public void setLawEnforceCategoryNumber(Integer lawEnforceCategoryNumber) { + this.lawEnforceCategoryNumber = lawEnforceCategoryNumber; + } public String getCompanyOrgType() { return companyOrgType; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java index b3825f77..da7654d9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java @@ -55,8 +55,8 @@ public class ComprehensiveAnalysisServiceImpl implements ComprehensiveAnalysisSe comprehensiveAnalysis.setComplaintTotal(complaintList.size()); //投诉类型列表（类型value+数量+占比） comprehensiveAnalysis.setComplaintTypeList(getComplaintTypeList(complaintList)); - //检查类别列表（类型value+数量+占比） - comprehensiveAnalysis.setCheckCategoryList(getCheckCategoryList(primaryRegistrationList)); + //执法类别（类型value+数量+占比） + comprehensiveAnalysis.setLawEnforceCategoryList(getLawEnforceCategoryList(primaryRegistrationList)); //企业类型列表（文字+数量+占比） comprehensiveAnalysis.setCompanyOrgTypeList(getCompanyOrgTypeList(primaryRegistrationList)); return comprehensiveAnalysis; @@ -370,6 +370,22 @@ public class ComprehensiveAnalysisServiceImpl implements ComprehensiveAnalysisSe return checkCategoryList; } + public List getLawEnforceCategoryList(List registrationList) { + int num = registrationList.size(); + List lawList = new ArrayList<>(); + List dictDataList = dictDataMapper.selectDictDataByType("law_enforce_category"); + for (DictData dictData : dictDataList) { + ComprehensiveAnalysis comprehensiveAnalysis = new ComprehensiveAnalysis(); + List comprehensiveAnalysisList = registrationList.stream().filter(item -> item.getLawEnforceCategory().equals(dictData.getDictValue())).collect(Collectors.toList()); + comprehensiveAnalysis.setLawEnforceCategory(dictData.getDictLabel()); + comprehensiveAnalysis.setLawEnforceCategoryNumber(comprehensiveAnalysisList.size()); + comprehensiveAnalysis.setPercentage((double) comprehensiveAnalysisList.size() / num); + lawList.add(comprehensiveAnalysis); + registrationList = registrationList.stream().filter(item -> !item.equals(dictData.getDictValue())).collect(Collectors.toList()); + } + return lawList; + } + public List getCompanyOrgTypeList(List registrationList) { //企业类型数组 List companyOrgTypeList = new ArrayList<>(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml index 743debc3..118a8c06 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml @@ -15,13 +15,14 @@