手机端字典项常量替换

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

@@ -3,12 +3,15 @@ package com.sooka.sponest.mobile.comprehensive.roadCaseController;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 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.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRoom;
 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;
@@ -40,7 +43,17 @@ public class AppRoadCaseController  extends BaseController {
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteRoadCaseService.selectComprehensiveRoadCaseList(pageNum, pageSize, comprehensiveRoadcase.getCaseName());
+        Map<String, Object> maps = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATURE_OF_THE_CASE);
+        Map<String, Object> maps1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
         if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
+            if (!rows.isEmpty()) {
+                for (HashMap<String, Object> row : rows) {
+                    row.put("caseNatureLabel",maps.get(row.get("caseNature")));
+                    row.put("mainSuspectIdCodeLabel",maps1.get(row.get("mainSuspectIdCode")));
+                    row.put("solvedLabel","1".equals(row.get("solved")) ? "是" : "否");
+                }
+            }
             return AjaxResult.success(tableDataInfo.getRows());
         } else {
             return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
@@ -53,7 +66,19 @@ public class AppRoadCaseController  extends BaseController {
      */
     @GetMapping("/RoadCase/edit")
     public AjaxResult getInfo(String id) {
-        return remoteRoadCaseService.selectComprehensiveRoadCaseById(id);
+        R<ComprehensiveRoadCase> edit = remoteRoadCaseService.selectComprehensiveRoadCaseById(id);
+        ComprehensiveRoadCase data = edit.getData();
+        data.setSolvedLabel("1".equals(data.getSolved()) ? "是" : "否");
+        if (HttpStatus.SUCCESS == edit.getCode()){
+            data.setCaseNatureLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATURE_OF_THE_CASE,data.getCaseNature()));
+            data.setMainSuspectIdCodeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE,data.getMainSuspectIdCode()));
+            data.setIsEdit(true);
+        }else if (HttpStatus.ERROR == edit.getCode() && null != edit.getData()) {
+            data.setIsEdit(false);
+        }else {
+            return AjaxResult.error(edit.getCode(), edit.getMsg());
+        }
+        return AjaxResult.success(data);
     }
 
     /**

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

@@ -7,6 +7,7 @@ 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.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRoom;
 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;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/AppRoadProtectionController")
@@ -33,6 +35,15 @@ public class AppRoadProtectionController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteRoadProtectionService.selectComprehensiveRoadProtectionList(pageNum, pageSize, comprehensiveRoadProtection.getName());
         if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
+            List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
+            Map<String, Object> dictCacheToMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LINE_TYPE);
+            Map<String, Object> dictCacheToMap1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLICING_LEVEL);
+            if (!rows.isEmpty()) {
+                for (HashMap<String, Object> row : rows) {
+                    row.put("routeTypeLabel", dictCacheToMap.get(row.get("routeType")));
+                    row.put("publicSecurityHazardLevelLabel", dictCacheToMap1.get(row.get("publicSecurityHazardLevel")));
+                }
+            }
             return AjaxResult.success(tableDataInfo.getRows());
         } else {
             return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
@@ -40,6 +51,7 @@ public class AppRoadProtectionController extends BaseController {
     }
 
 
+
     /**
      * 获取护路护线详细信息
      */

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

@@ -1,18 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 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.comprehensiveOrganizationAndInstitution.domain.ComprehensiveBuildingLeader;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteBuildingLeaderService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 楼栋长管理
@@ -36,7 +40,18 @@ public class AppBuildingLeaderController extends BaseController {
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteBuildingLeaderService.selectComprehensiveBuildingLeaderList(pageNum, pageSize,comprehensivebuildingleader.getUserName(),comprehensivebuildingleader.getDeptId());
+        Map<String, Object> maps = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);
+        Map<String, Object> maps1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);
+        Map<String, Object> maps2 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
+        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
+            if (!rows.isEmpty()) {
+                for (HashMap<String, Object> row : rows) {
+                    row.put("politicalOutlookLabel", maps.get(row.get("politicalOutlook")));
+                    row.put("nationLabel", maps1.get(row.get("nation")));
+                    row.put("genderLabel", maps2.get(row.get("gender")));
+                }
+            }
             return AjaxResult.success(tableDataInfo.getRows());
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
@@ -56,6 +71,9 @@ public class AppBuildingLeaderController extends BaseController {
         R<ComprehensiveBuildingLeader> edit = remoteBuildingLeaderService.selectComprehensiveBuildingLeaderById(id);
         ComprehensiveBuildingLeader data = edit.getData();
         if (HttpStatus.SUCCESS == edit.getCode()){
+            data.setPoliticalOutlookLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS,data.getPoliticalOutlook()));
+            data.setNationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION,data.getNation()));
+            data.setGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX,data.getGender()));
             data.setIsEdit(true);
         }else if (HttpStatus.ERROR == edit.getCode() && null != edit.getData()) {
             data.setIsEdit(false);

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

@@ -2,6 +2,7 @@ package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionControl
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -9,12 +10,14 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 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.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRoom;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteRoomService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 房间管理
@@ -40,6 +43,10 @@ public class AppRoomController extends BaseController {
         TableDataInfo tableDataInfo = remoteRoomService.selectComprehensiveRoomList(pageNum, pageSize,comprehensiveroom.getName(),comprehensiveroom.getEstateId(),comprehensiveroom.getDeptId());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
             List<ComprehensiveRoom> rows = (List<ComprehensiveRoom>) tableDataInfo.getRows();
+            Map<String, Object> dictCacheToMap = DictUtils.getDictCacheToMap(DictKeys.RFH_FJ_GLFS);
+            Map<String, Object> dictCacheToMap1 = DictUtils.getDictCacheToMap(DictKeys.RFH_FJ_WYH);
+            Map<String, Object> dictCacheToMap2 = DictUtils.getDictCacheToMap(DictKeys.RFH_FJ_FJXZ);
+            Map<String, Object> dictCacheToMap3 = DictUtils.getDictCacheToMap(DictKeys.RFH_FJ_SHLX);
             String s = JSON.toJSONString(rows);
             rows = JSON.parseArray(s, ComprehensiveRoom.class);
             if(StringUtils.isNotEmpty(rows)) {
@@ -55,6 +62,10 @@ public class AppRoomController extends BaseController {
                     data.setRoomSfgkpyLabel("1".equals(data.getRoomSfgkpy()) ? "是" : "否");
                     data.setRoomSfjhqLabel("1".equals(data.getRoomSfjhq()) ? "是" : "否");
                     data.setRoomSfslzLabel("1".equals(data.getRoomSfslz()) ? "是" : "否");
+                    data.setRoomGlfsLabel(dictCacheToMap.get(data.getRoomGlfs()).toString());
+                    data.setRoomWyhLabel(dictCacheToMap1.get(data.getRoomWyh()).toString());
+                    data.setRoomTypeLabel(dictCacheToMap2.get(data.getRoomType()).toString());
+                    data.setRoomShlxLabel(dictCacheToMap3.get(data.getRoomShlx()).toString());
                 }
             }
             return AjaxResult.success(rows);
@@ -68,8 +79,6 @@ public class AppRoomController extends BaseController {
      */
     @GetMapping("/comprehensiveroom/edit")
     public AjaxResult getInfo(String id) {
-
-
         R<ComprehensiveRoom> edit = remoteRoomService.selectComprehensiveRoomById(id);
         ComprehensiveRoom data = edit.getData();
         data.setRoomSfpfLabel("1".equals(data.getRoomSfpf())? "是":"否");
@@ -84,6 +93,10 @@ public class AppRoomController extends BaseController {
         data.setRoomSfjhqLabel("1".equals(data.getRoomSfjhq())? "是":"否");
         data.setRoomSfslzLabel("1".equals(data.getRoomSfslz())? "是":"否");
         if (HttpStatus.SUCCESS == edit.getCode()){
+            data.setRoomGlfsLabel(DictUtils.getDictDataByValue(DictKeys.RFH_FJ_GLFS,data.getRoomGlfs()));
+            data.setRoomWyhLabel(DictUtils.getDictDataByValue(DictKeys.RFH_FJ_WYH,data.getRoomWyh()));
+            data.setRoomTypeLabel(DictUtils.getDictDataByValue(DictKeys.RFH_FJ_FJXZ,data.getRoomType()));
+            data.setRoomShlxLabel(DictUtils.getDictDataByValue(DictKeys.RFH_FJ_SHLX,data.getRoomShlx()));
             data.setIsEdit(true);
         }else if (HttpStatus.ERROR == edit.getCode() && null != edit.getData()) {
             data.setIsEdit(false);

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

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
 
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;