创建字典key常量类，修改手机端代码引用常量属性

src/main/java/com/sooka/sponest/mobile/comprehensive/RoadCasecontroller/AppRoadProtectionController.java

@@ -7,11 +7,10 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
 import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.domain.ComprehensiveRoadProtection;
 import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.service.RemoteRoadProtectionService;
+import com.ruoyi.common.core.domain.DictKeys;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.ibatis.util.MapUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -49,8 +48,8 @@ public class AppRoadProtectionController extends BaseController {
         AjaxResult ajaxResult =   remoteRoadProtectionService.selectComprehensiveRoadProtectionById(id);
         if("200".equals(String.valueOf(ajaxResult.get("code")))){
             HashMap<String,Object> comprehensiveRoadProtection = (HashMap<String, Object>) ajaxResult.get("data");
-            comprehensiveRoadProtection.put("routeTypeLabel",DictUtils.getDictDataByValue("comprehensive_line_type", MapUtils.getString(comprehensiveRoadProtection,"routeType")));
-            comprehensiveRoadProtection.put("publicSecurityHazardLevelLabel",DictUtils.getDictDataByValue("comprehensive_policing_level",MapUtils.getString(comprehensiveRoadProtection,"publicSecurityHazardLevel")));
+            comprehensiveRoadProtection.put("routeTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LINE_TYPE, MapUtils.getString(comprehensiveRoadProtection,"routeType")));
+            comprehensiveRoadProtection.put("publicSecurityHazardLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLICING_LEVEL,MapUtils.getString(comprehensiveRoadProtection,"publicSecurityHazardLevel")));
             return AjaxResult.success(comprehensiveRoadProtection);
         }else{
             return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/APPComprehensiveTPreventionTeam.java

@@ -7,18 +7,12 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveTPreventionTeam;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionTeamService;
-import com.sooka.sponest.comprehensive.api.dict.domain.DictKeys;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.ibatis.util.MapUtil;
+import com.ruoyi.common.core.domain.DictKeys;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author zhaozhan

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppInstitutionsController.java

@@ -10,11 +10,10 @@ import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveInstitutions;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteInstitutionsService;
-import com.sooka.sponest.comprehensive.api.dict.domain.DictKeys;
+import com.ruoyi.common.core.domain.DictKeys;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/sooka/sponest/mobile/comprehensive/personBasicInfoController/AppPersonBasicInfoController.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.mobile.comprehensive.personBasicInfoController;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.HttpStatus;
@@ -12,10 +11,8 @@ import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensivePersonBasicInfo.domain.OtherPersonInfo;
 import com.sooka.sponest.comprehensive.api.comprehensivePersonBasicInfo.domain.PersonBasicInfo;
 import com.sooka.sponest.comprehensive.api.comprehensivePersonBasicInfo.service.RemotePersonBasicInfoService;
-import com.sooka.sponest.comprehensive.api.dict.domain.DictKeys;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.sooka.sponest.data.api.digitalenvironment.domain.EnvironmentBiggas;
-import com.sooka.sponest.data.api.digitalenvironment.service.RemoteBiggasService;
-import com.sooka.sponest.mobile.system.camera.service.AppCameraService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -208,7 +205,7 @@ public class AppPersonBasicInfoController {
     }
 
     private void setCampusAroundPerson(HashMap<String, Object> json) {//4
-        json.put("harmLevelLabel", getDictData("comprehensive_degree_of_harm", String.valueOf(json.get("harmLevel"))));//危害程度
+        json.put("harmLevelLabel", getDictData(DictKeys.COMPREHENSIVE_DEGREE_OF_HARM, String.valueOf(json.get("harmLevel"))));//危害程度
         json.put("focusPeopleLabel", "1".equals(json.get("focusPeople")) ? "是" : "否");//是否关注
     }
 
@@ -223,9 +220,9 @@ public class AppPersonBasicInfoController {
 
     private void setCommunityCorrectionStaff(HashMap<String, Object> json) {//6
         json.put("caseCategoryLabel", getDictData("comprehensive_case_category", String.valueOf(json.get("caseCategory"))));//案件类别
+        json.put("correctiveReleaseTypeLabel", null == json.get("correctiveReleaseType") ? null : getDictData(DictKeys.COMPREHENSIVE_CORRECTIVE_RELEASE_TYPE, String.valueOf(json.get("correctiveReleaseType"))));//矫正解除（终止）类型
         json.put("receivingModeLabel", getDictData(DictKeys.COMPREHENSIVE_RECEIVING_METHOD, String.valueOf(json.get("receivingMode"))));//接收方式
         json.put("correctionClassLabel", getDictData(DictKeys.COMPREHENSIVE_CORRECTIVE_CATEGORY, String.valueOf(json.get("correctionClass"))));//矫正类别
-        json.put("correctiveReleaseTypeLabel", null == json.get("correctiveReleaseType") ? null : getDictData("comprehensive_corrective_release_type", String.valueOf(json.get("correctiveReleaseType"))));//矫正解除（终止）类型
         json.put("tubeLabel", "1".equals(json.get("tube")) ? "是" : "否");//是否有脱管
         json.put("leakingPipesLabel", "1".equals(json.get("leakingPipes")) ? "是" : "否");//是否有漏管
         json.put("recidivismLabel", null == json.get("recidivism") ? null : "1".equals(json.get("recidivism")) ? "是" : "否");//是否累惯犯
@@ -233,42 +230,42 @@ public class AppPersonBasicInfoController {
         json.put("reoffendLabel", "1".equals(json.get("reoffend")) ? "是" : "否");//是否重新犯罪
         json.put("fourHistoriesListLabel", getDictDataList(DictKeys.COMPREHENSIVE_THREE_INVOLVED_SITUATION, (List<String>) json.get("fourHistoriesList")));//“四史”情况
         json.put("threeStepListLabel", getDictDataList("comprehensive_three_involved_situation", (List<String>) json.get("threeStepList")));//“三涉”情况
-        json.put("correctionTeamCompositionListLabel", getDictDataList("comprehensive_corrections_team_composition_type", (List<String>) json.get("correctionTeamCompositionList")));//矫正小组人员组成情况
+        json.put("correctionTeamCompositionListLabel", getDictDataList(DictKeys.COMPREHENSIVE_CORRECTIONS_TEAM_COMPOSITION_TYPE, (List<String>) json.get("correctionTeamCompositionList")));//矫正小组人员组成情况
     }
 
     private void setPsychosisPopulation(HashMap<String, Object> json) {//7
-        json.put("familyEconomicSituationLabel", null == json.get("familyEconomicSituationLabel") ? null : getDictData("comprehensive_households_financial_situation", String.valueOf(json.get("familyEconomicSituationLabel"))));//家庭经济状况
+        json.put("familyEconomicSituationLabel", null == json.get("familyEconomicSituationLabel") ? null : getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_FINANCIAL_SITUATION, String.valueOf(json.get("familyEconomicSituationLabel"))));//家庭经济状况
         json.put("subsistenceAllowanceLabel", "1".equals(json.get("subsistenceAllowance")) ? "是" : "否");//是否纳入低保
-        json.put("diagnosisTypeLabel", getDictData("comprehensive_current_diagnostic", String.valueOf(json.get("diagnosisType"))));//目前诊断类型
+        json.put("diagnosisTypeLabel", getDictData(DictKeys.COMPREHENSIVE_CURRENT_DIAGNOSTIC, String.valueOf(json.get("diagnosisType"))));//目前诊断类型
         json.put("historyCausingAccidentsLabel", "1".equals(json.get("historyCausingAccidents")) ? "有" : "无");//有无肇事肇祸史
-        json.put("riskAssessmentLevelLabel", getDictData("comprehensive_hazard_assessment", String.valueOf(json.get("riskAssessmentLevel"))));//目前危险性评估等级
-        json.put("treatmentSituationLabel", getDictData("comprehensive_treatment_conditions", String.valueOf(json.get("treatmentSituation"))));//治疗情况
-        json.put("reasonsHospitalizationListLabel", getDictDataList("comprehensive_hospitalization_reasons", (List<String>) json.get("reasonsHospitalizationList")));//实施住院治疗原因
-        json.put("participatingManagersListLabel", getDictDataList("comprehensive_managers", (List<String>) json.get("participatingManagersList")));//参与管理人员
-        json.put("assistanceSituationListLabel", getDictDataList("comprehensive_help_situation", (List<String>) json.get("assistanceSituationList")));//帮扶情况
+        json.put("riskAssessmentLevelLabel", getDictData(DictKeys.COMPREHENSIVE_HAZARD_ASSESSMENT, String.valueOf(json.get("riskAssessmentLevel"))));//目前危险性评估等级
+        json.put("treatmentSituationLabel", getDictData(DictKeys.COMPREHENSIVE_TREATMENT_CONDITIONS, String.valueOf(json.get("treatmentSituation"))));//治疗情况
+        json.put("reasonsHospitalizationListLabel", getDictDataList(DictKeys.COMPREHENSIVE_HOSPITALIZATION_REASONS, (List<String>) json.get("reasonsHospitalizationList")));//实施住院治疗原因
+        json.put("participatingManagersListLabel", getDictDataList(DictKeys.COMPREHENSIVE_MANAGERS, (List<String>) json.get("participatingManagersList")));//参与管理人员
+        json.put("assistanceSituationListLabel", getDictDataList(DictKeys.COMPREHENSIVE_HELP_SITUATION, (List<String>) json.get("assistanceSituationList")));//帮扶情况
     }
 
     private void setDrugAddict(HashMap<String, Object> json) {//8
-        json.put("controlSituationLabel", getDictData("comprehensive_governance", String.valueOf(json.get("controlSituation"))));//管控情况
+        json.put("controlSituationLabel", getDictData(DictKeys.COMPREHENSIVE_GOVERNANCE, String.valueOf(json.get("controlSituation"))));//管控情况
         json.put("criminalHistoryLabel", null == json.get("criminalHistory") ? null : "1".equals(json.get("criminalHistory")) ? "有" : "无");//有无犯罪史
         json.put("drugUseLabel", getDictData("comprehensive_case_consequence", String.valueOf(json.get("drugUse"))));//吸毒原因
         json.put("drugAbuseLabel", null == json.get("drugAbuse") ? null : getDictData("comprehensive_case_consequence", String.valueOf(json.get("drugAbuse"))));//吸毒后果
     }
 
     private void setAidsRisk(HashMap<String, Object> json) {//9
-        json.put("routeInfectionLabel", getDictData("comprehensive_route_of_infection", String.valueOf(json.get("routeInfection"))));//感染途径
+        json.put("routeInfectionLabel", getDictData(DictKeys.COMPREHENSIVE_ROUTE_OF_INFECTION, String.valueOf(json.get("routeInfection"))));//感染途径
         json.put("criminalHistoryLabel", "1".equals(json.get("criminalHistory")) ? "是" : "否");//是否有违法犯罪史
         json.put("caseCategoryLabel", null == json.get("caseCategory") ? null : getDictData("comprehensive_case_category", String.valueOf(json.get("caseCategory"))));//案件类别
-        json.put("concernTypeLabel", getDictData("comprehensive_type_of_concern", String.valueOf(json.get("concernType"))));//关注类型
-        json.put("admissionSituationLabel", null == json.get("admissionSituation") ? null : getDictData("comprehensive_admission_to_inertia", String.valueOf(json.get("admissionSituation"))));//收治情况
+        json.put("concernTypeLabel", getDictData(DictKeys.COMPREHENSIVE_TYPE_OF_CONCERN, String.valueOf(json.get("concernType"))));//关注类型
+        json.put("admissionSituationLabel", null == json.get("admissionSituation") ? null : getDictData(DictKeys.COMPREHENSIVE_ADMISSION_TO_INERTIA, String.valueOf(json.get("admissionSituation"))));//收治情况
     }
 
     private void setKeyYouth(HashMap<String, Object> json) {//10
-        json.put("personTypeLabel", null == json.get("personType") ? null : getDictData("comprehensive_type_of_person", String.valueOf(json.get("personType"))));//人员类型
-        json.put("familySituationLabel", getDictData("comprehensive_family_inertia", String.valueOf(json.get("familySituation"))));//家庭情况
+        json.put("personTypeLabel", null == json.get("personType") ? null : getDictData(DictKeys.COMPREHENSIVE_TYPE_OF_PERSON, String.valueOf(json.get("personType"))));//人员类型
+        json.put("familySituationLabel", getDictData(DictKeys.COMPREHENSIVE_FAMILY_INERTIA, String.valueOf(json.get("familySituation"))));//家庭情况
         json.put("guardianRelationLabel", getDictData("comprehensive_relation", String.valueOf(json.get("guardianRelation"))));//与监护人关系
         json.put("reoffendLabel", "1".equals(json.get("reoffend")) ? "是" : "否");//是否违法犯罪
-        json.put("meansAssistanceLabel", getDictData("comprehensive_means_of_help", String.valueOf(json.get("meansAssistance"))));//帮扶手段
+        json.put("meansAssistanceLabel", getDictData(DictKeys.COMPREHENSIVE_MEANS_OF_HELP, String.valueOf(json.get("meansAssistance"))));//帮扶手段
     }
 
     private String getDictData(String dictKey, String value) {

src/main/java/com/sooka/sponest/mobile/comprehensive/socialPolicingController/AppRemediationInKeyAreaController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.domain.RemediationInKeyArea;
 import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteRemediationInKeyAreaService;
+import com.ruoyi.common.core.domain.DictKeys;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -34,9 +35,9 @@ public class AppRemediationInKeyAreaController {
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo list = remediationInKeyAreaService.getList(pageNum, pageSize);
-        Map<String, Object> policingIssues = DictUtils.getDictCacheToMap("comprehensive_policing_issues");
-        Map<String, Object> regionsInvolved = DictUtils.getDictCacheToMap("comprehensive_regions_involved");
-        Map<String, Object> effectivenessEvaluation = DictUtils.getDictCacheToMap("comprehensive_effectiveness_evaluation");
+        Map<String, Object> policingIssues = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLICING_ISSUES);
+        Map<String, Object> regionsInvolved = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_REGIONS_INVOLVED);
+        Map<String, Object> effectivenessEvaluation = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EFFECTIVENESS_EVALUATION);
 
         if (HttpStatus.SUCCESS == list.getCode()) {
             List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) list.getRows();
@@ -60,9 +61,9 @@ public class AppRemediationInKeyAreaController {
         AjaxResult edit = remediationInKeyAreaService.getEdit(remediationInKeyArea.getId());
         if("200".equals(edit.get("code").toString())){
             HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
-            data.put("outstandingSecurityIssuesLabel",DictUtils.getDictDataByValue("comprehensive_policing_issues",data.get("outstandingSecurityIssues").toString()));
-            data.put("areaInvolvedTypeLabel",DictUtils.getDictDataByValue("comprehensive_regions_involved",data.get("areaInvolvedType").toString()));
-            data.put("effectivenessEvaluationLabel",DictUtils.getDictDataByValue("comprehensive_effectiveness_evaluation",data.get("effectivenessEvaluation").toString()));
+            data.put("outstandingSecurityIssuesLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLICING_ISSUES,data.get("outstandingSecurityIssues").toString()));
+            data.put("areaInvolvedTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_REGIONS_INVOLVED,data.get("areaInvolvedType").toString()));
+            data.put("effectivenessEvaluationLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EFFECTIVENESS_EVALUATION,data.get("effectivenessEvaluation").toString()));
             return AjaxResult.success(data);
         }else{
             return edit;

src/main/java/com/sooka/sponest/mobile/comprehensive/socialPolicingController/AppSafetyManagementController.java

@@ -6,10 +6,9 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.domain.RemediationInKeyArea;
 import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.domain.SafetyManagement;
-import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteRemediationInKeyAreaService;
 import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteSafetyManagementService;
+import com.ruoyi.common.core.domain.DictKeys;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -36,9 +35,9 @@ public class AppSafetyManagementController {
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo list = safetyManagementService.getList(pageNum, pageSize);
-        Map<String, Object> typeOfRegistration = DictUtils.getDictCacheToMap("comprehensive_type_of_registration");
-        Map<String, Object> holdingInertia = DictUtils.getDictCacheToMap("comprehensive_holding_inertia");
-        Map<String, Object> businessType = DictUtils.getDictCacheToMap("comprehensive_business_type");
+        Map<String, Object> typeOfRegistration = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_TYPE_OF_REGISTRATION);
+        Map<String, Object> holdingInertia = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_HOLDING_INERTIA);
+        Map<String, Object> businessType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_BUSINESS_TYPE);
 
         if (HttpStatus.SUCCESS == list.getCode()) {
             List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) list.getRows();
@@ -46,7 +45,7 @@ public class AppSafetyManagementController {
                 row.put("registrationTypeLabel",typeOfRegistration.get(row.get("registrationType")));
                 row.put("holdingStatusLabel",holdingInertia.get(row.get("holdingStatus")));
                 row.put("enterpriseTypeLabel",businessType.get(row.get("enterpriseType")));
-                row.put("businessScopeLabel",DictUtils.getDictDataListByValue("comprehensive_business_scope", (List<String>) row.get("businessScope")));
+                row.put("businessScopeLabel",DictUtils.getDictDataListByValue(DictKyes.COMPREHENSIVE_BUSINESS_SCOPE, (List<String>) row.get("businessScope")));
                 row.put("preClosingCheckLabel","1".equals(row.get("preClosingCheck").toString())? "是":"否");
                 row.put("realNameRegistrationLabel","1".equals(row.get("realNameRegistration").toString())? "是":"否");
                 row.put("xrayInspectionLabel","1".equals(row.get("xrayInspection").toString())? "是":"否");
@@ -66,10 +65,10 @@ public class AppSafetyManagementController {
         AjaxResult edit = safetyManagementService.getEdit(safetyManagement.getId());
         if("200".equals(edit.get("code").toString())){
             HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
-            data.put("registrationTypeLabel",DictUtils.getDictDataByValue("comprehensive_type_of_registration",data.get("registrationType").toString()));
-            data.put("holdingStatusLabel",DictUtils.getDictDataByValue("comprehensive_holding_inertia",data.get("holdingStatus").toString()));
-            data.put("enterpriseTypeLabel",DictUtils.getDictDataByValue("comprehensive_business_type",data.get("enterpriseType").toString()));
-            data.put("businessScopeLabel",DictUtils.getDictDataListByValue("comprehensive_business_scope", (List<String>) data.get("businessScope")));
+            data.put("registrationTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_TYPE_OF_REGISTRATION,data.get("registrationType").toString()));
+            data.put("holdingStatusLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_HOLDING_INERTIA,data.get("holdingStatus").toString()));
+            data.put("enterpriseTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_BUSINESS_TYPE,data.get("enterpriseType").toString()));
+            data.put("businessScopeLabel",DictUtils.getDictDataListByValue(DictKeys.COMPREHENSIVE_BUSINESS_SCOPE, (List<String>) data.get("businessScope")));
             data.put("preClosingCheckLabel","1".equals(data.get("preClosingCheck").toString())? "是":"否");
             data.put("realNameRegistrationLabel","1".equals(data.get("realNameRegistration").toString())? "是":"否");
             data.put("xrayInspectionLabel","1".equals(data.get("xrayInspection").toString())? "是":"否");