删除综治的接口代码

应急手机端代码提交

src/main/java/com/sooka/sponest/mobile/comprehensive/ConflictDefuseController/AppConflictResolutionController.java

@@ -1,125 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.conflictDefuseController;
-
-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.comprehensiveConflictDefuse.domain.ConflictResolution;
-import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.service.RemoteConflictResolutionService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/AppConflictResolutionController")
-public class AppConflictResolutionController extends BaseController {
-    @Resource
-    private RemoteConflictResolutionService remoteConflictResolutionService;
-
-    /**
-     * 查询矛盾纠纷排查化解
-     */
-    @GetMapping("/conflict/list")
-    public AjaxResult list(ConflictResolution conflictResolution) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteConflictResolutionService.selectConflictResolutionList(pageNum, pageSize, conflictResolution.getTemp(),conflictResolution.getEventName(),conflictResolution.getMainPersonName(),conflictResolution.getResolutionResponsibleName());
-        if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String,Object> comprehensiveSex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
-            Map<String,Object> comprehensiveNation = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);
-            Map<String,Object> comprehensiveEducationalBackground = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
-            Map<String,Object> comprehensiveEventSize = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EVENT_SIZE);
-
-
-            Map<String,Object> comprehensiveEventType = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_EVENT_TYPE);
-            Map<String,Object> comprehensivePartiesInvolved = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_PARTIES_INVOLVED);
-            Map<String,Object> comprehensiveWaysResolving = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_WAYS_RESOLVING);
-
-            for (Map<String, Object> row : rows) {
-                row.put("mainPersonIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode,MapUtils.getString(row,"mainPersonIdCode")));
-                row.put("mainPersonGenderLabel",MapUtils.getString(comprehensiveSex,MapUtils.getString(row,"mainPersonGender")));
-                row.put("mainPersonNationalityLabel",MapUtils.getString(comprehensiveNation,MapUtils.getString(row,"mainPersonNationality")));
-                row.put("mainPersonEducationLabel",MapUtils.getString(comprehensiveEducationalBackground,MapUtils.getString(row,"mainPersonEducation")));
-                row.put("eventScaleLabel",MapUtils.getString(comprehensiveEventSize,MapUtils.getString(row,"eventScale")));
-                row.put("resolutionSuccessLabel",!MapUtils.getString(row,"resolutionSuccess").isEmpty()?("1".equals(conflictResolution.getResolutionSuccess())?"是":"否"):"");
-
-                row.put("eventCategoryLabel",MapUtils.getString(comprehensiveEventType,MapUtils.getString(row,"eventCategory")));
-                row.put("mainPersonCategoryLabel",MapUtils.getString(comprehensivePartiesInvolved,MapUtils.getString(row,"mainPersonCategory")));
-                row.put("resolutionMethodLabel",MapUtils.getString(comprehensiveWaysResolving,MapUtils.getString(row,"resolutionMethod")));
-
-
-            }
-
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
-        }
-    }
-
-
-    /**
-     * 获取矛盾纠纷排查化解详细信息
-     */
-    @GetMapping("/conflict/edit")
-    public AjaxResult getInfo(String id) {
-        R<ConflictResolution> edit = remoteConflictResolutionService.selectConflictResolutionById(id);
-        if(HttpStatus.SUCCESS == edit.getCode()){
-            ConflictResolution conflictResolution = edit.getData();
-            Map<String,Object> comprehensiveEventType = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_EVENT_TYPE);
-            Map<String,Object> comprehensivePartiesInvolved = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_PARTIES_INVOLVED);
-            Map<String,Object> comprehensiveWaysResolving = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_WAYS_RESOLVING);
-
-
-            conflictResolution.setMainPersonIdCodeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, conflictResolution.getMainPersonIdCode()));
-            conflictResolution.setMainPersonGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, conflictResolution.getMainPersonGender()));
-            conflictResolution.setMainPersonNationalityLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, conflictResolution.getMainPersonNationality()));
-            conflictResolution.setMainPersonEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, conflictResolution.getMainPersonEducation()));
-            conflictResolution.setEventScaleLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EVENT_SIZE, conflictResolution.getEventScale()));
-            conflictResolution.setResolutionSuccessLabel(!conflictResolution.getResolutionSuccess().isEmpty()?("1".equals(conflictResolution.getResolutionSuccess())?"是":"否"):"");
-
-            conflictResolution.setEventCategoryLabel(MapUtils.getString(comprehensiveEventType,conflictResolution.getEventCategory()));
-            conflictResolution.setMainPersonCategoryLabel(MapUtils.getString(comprehensivePartiesInvolved,conflictResolution.getMainPersonCategory()));
-            conflictResolution.setResolutionMethodLabel(MapUtils.getString(comprehensiveWaysResolving,conflictResolution.getResolutionMethod()));
-
-
-            return AjaxResult.success(conflictResolution);
-        }else{
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-    }
-
-    /**
-     * 新增矛盾纠纷排查化解
-     */
-    @PostMapping("/conflict")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteConflictResolutionService.insertConflictResolution(json);
-    }
-
-    /**
-     * 修改矛盾纠纷排查化解
-     */
-    @PostMapping("/conflict/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteConflictResolutionService.updateConflictResolution(json);
-    }
-
-    /**
-     * 删除矛盾纠纷排查化解
-     */
-    @GetMapping("/conflict/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteConflictResolutionService.deleteConflictResolutionByIds(id.toArray(new String[0]));
-    }
-}

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

@@ -1,107 +0,0 @@
-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;
-import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.domain.ComprehensiveRoadCase;
-import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.service.RemoteRoadCaseService;
-import com.sooka.sponest.data.api.digitalenvironment.domain.EnvironmentBiggas;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-/**
- * @Author LG
- * @Date 2023/9/8 - 9:38
- */
-@RestController
-@RequestMapping("/AppRoadCaseController")
-public class AppRoadCaseController  extends BaseController {
-
-    @Resource
-    RemoteRoadCaseService remoteRoadCaseService;
-
-    /**
-     * 查询涉及线、路案（事）件列表
-     */
-    @GetMapping("/RoadCase/list")
-    public AjaxResult list(ComprehensiveRoadCase comprehensiveRoadcase) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        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());
-        }
-    }
-
-
-    /**
-     * 获取涉及线、路案（事）件列表详细信息
-     */
-    @GetMapping("/RoadCase/edit")
-    public AjaxResult getInfo(String 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);
-    }
-
-    /**
-     * 新增涉及线、路案（事）件列表
-     */
-    @PostMapping("/RoadCase")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteRoadCaseService.insertComprehensiveRoadCase(json);
-    }
-
-    /**
-     * 修改涉及线、路案（事）件列表
-     */
-    @PostMapping("/RoadCase/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteRoadCaseService.updateComprehensiveRoadCase(json);
-    }
-
-    /**
-     * 删除涉及线、路案（事）件列表
-     */
-    @GetMapping("/RoadCase/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteRoadCaseService.deleteComprehensiveRoadCaseByIds(id.toArray(new String[0]));
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.RoadCaseController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.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.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/AppRoadProtectionController")
-public class AppRoadProtectionController extends BaseController {
-    @Resource
-    private RemoteRoadProtectionService remoteRoadProtectionService;
-
-    /**
-     * 查询护路护线
-     */
-    @GetMapping("/RoadProtection/list")
-    public AjaxResult list(ComprehensiveRoadProtection comprehensiveRoadProtection) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        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());
-        }
-    }
-
-
-
-    /**
-     * 获取护路护线详细信息
-     */
-    @GetMapping("/RoadProtection/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult =   remoteRoadProtectionService.selectComprehensiveRoadProtectionById(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveRoadProtection = (HashMap<String, Object>) ajaxResult.get("data");
-            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(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-
-    }
-
-    /**
-     * 新增护路护线
-     */
-    @PostMapping("/RoadProtection")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteRoadProtectionService.insertComprehensiveRoadProtection(json);
-    }
-
-    /**
-     * 修改护路护线
-     */
-    @PostMapping("/RoadProtection/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteRoadProtectionService.updateComprehensiveRoadProtection(json);
-    }
-
-    /**
-     * 删除护路护线
-     */
-    @GetMapping("/RoadProtection/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteRoadProtectionService.deleteComprehensiveRoadProtectionByIds(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/actualPeopleController/AppOverseasPersonInfoController.java

@@ -1,120 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.actualPeopleController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.comprehensiveActualPeople.domain.ComprehensiveRhfOverseasPersonInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service.RemoteOverseasPersonInfoService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 境外人员App
- *
- * @author hanfucheng
- * @date 2023/9/6 14:57
- */
-@RestController
-@RequestMapping("/AppOverseasPersonInfoController")
-public class AppOverseasPersonInfoController extends BaseController {
-
-    @Resource
-    RemoteOverseasPersonInfoService remoteOverseasPersonInfoService;
-
-    /**
-     * 查询境外人员列表
-     */
-    @GetMapping("/info/list")
-    public AjaxResult list(ComprehensiveRhfOverseasPersonInfo comprehensiveRhfOverseasPersonInfo) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteOverseasPersonInfoService.selectComprehensiveRhfOverseasPersonInfoList(pageNum, pageSize, comprehensiveRhfOverseasPersonInfo.getIdentityNumber(), comprehensiveRhfOverseasPersonInfo.getPhone());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//2260
-            Map<String,Object> comprehensiveSex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
-            Map<String,Object> comprehensiveInternation = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_INTERNATION);
-            Map<String,Object> comprehensiveReligiousBelief = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF);
-            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String,Object> comprehensiveComingToChinaPurpose = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_COMING_TO_CHINA_PURPOSE);
-            Map<String,Object> comprehensiveOccupationalCategory = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY);
-
-            for (Map<String, Object> row : rows) {
-                row.put("genderLabel",comprehensiveSex.get(MapUtils.getString(row,"gender")));
-                row.put("nativePlaceLabel",comprehensiveInternation.get(MapUtils.getString(row,"nativePlace")));
-                row.put("religiousBeliefLabel",comprehensiveReligiousBelief.get(MapUtils.getString(row,"religiousBelief")));
-                row.put("identityCodeLabel",comprehensiveCertificateCode.get(MapUtils.getString(row,"identityCode")));
-                row.put("purposeComingChinaLabel",comprehensiveComingToChinaPurpose.get(MapUtils.getString(row,"purposeComingChina")));
-                row.put("occupationalCategoryLabel",comprehensiveOccupationalCategory.get(MapUtils.getString(row,"occupationalCategory")));
-                row.put("focusPeopleLabel",null == row.get("focusPeople")?"":(MapUtils.getInteger(row,"focusPeople")== 1?"是":"否"));
-                row.put("currentResidencePlaceLabel",comprehensiveCityCode.get(MapUtils.getString(row,"currentResidencePlace")));
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-
-    /**
-     * 获取境外人员详细信息
-     */
-    @GetMapping("/info/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult =  remoteOverseasPersonInfoService.selectComprehensiveRhfOverseasPersonInfoById(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveRhfOverseasPersonInfo = (HashMap<String, Object>) ajaxResult.get("data");
-            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
-
-            comprehensiveRhfOverseasPersonInfo.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"gender")));
-            comprehensiveRhfOverseasPersonInfo.put("nativePlaceLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_INTERNATION,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"nativePlace")));
-            comprehensiveRhfOverseasPersonInfo.put("religiousBeliefLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"religiousBelief")));
-            comprehensiveRhfOverseasPersonInfo.put("identityCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"identityCode")));
-            comprehensiveRhfOverseasPersonInfo.put("purposeComingChinaLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_COMING_TO_CHINA_PURPOSE,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"purposeComingChina")));
-            comprehensiveRhfOverseasPersonInfo.put("occupationalCategoryLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"occupationalCategory")));
-            comprehensiveRhfOverseasPersonInfo.put("focusPeopleLabel",null == comprehensiveRhfOverseasPersonInfo.get("focusPeople")?"":(MapUtils.getInteger(comprehensiveRhfOverseasPersonInfo,"focusPeople")== 1?"是":"否"));
-            comprehensiveRhfOverseasPersonInfo.put("currentResidencePlaceLabel",comprehensiveCityCode.get(MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"currentResidencePlace")));
-
-            return AjaxResult.success(comprehensiveRhfOverseasPersonInfo);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-
-    }
-
-    /**
-     * 新增境外人员
-     */
-    @PostMapping("/info")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteOverseasPersonInfoService.insertComprehensiveRhfOverseasPersonInfo(json);
-    }
-    /**
-     * 修改境外人员
-     */
-    @PostMapping("/info/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteOverseasPersonInfoService.updateComprehensiveRhfOverseasPersonInfo(json);
-    }
-
-    /**
-     * 删除境外人员
-     */
-    @GetMapping("/info/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteOverseasPersonInfoService.deleteComprehensiveRhfOverseasPersonInfoByIds(id.toArray(new String[0]));
-    }
-
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/actualPeopleController/AppRentalHousingController.java

@@ -1,109 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.actualPeopleController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.comprehensiveActualPeople.domain.ComprehensiveRhfRentalHousing;
-import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service.RemoteRentalHousingService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 出租房App
- *
- * @author hanfucheng
- * @date 2023/9/6 14:57
- */
-@RestController
-@RequestMapping("/AppRentalHousingController")
-public class AppRentalHousingController extends BaseController {
-
-    @Resource
-    RemoteRentalHousingService remoteRentalHousingService;
-
-    /**
-     * 查询出租房列表
-     */
-    @GetMapping("/housing/list")
-    public AjaxResult list(ComprehensiveRhfRentalHousing comprehensiveRhfRentalHousing) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteRentalHousingService.selectComprehensiveRhfRentalHousingList(pageNum, pageSize, comprehensiveRhfRentalHousing.getName(), comprehensiveRhfRentalHousing.getHouseNumber(), comprehensiveRhfRentalHousing.getPhone());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> comprehensiveBuildingUse = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_BUILDING_USE);
-            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String,Object> comprehensiveRentalUse = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RENTAL_USE);
-            Map<String,Object> comprehensiveHazardType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_HAZARD_TYPE);
-            for (Map<String, Object> row : rows) {
-
-                row.put("buildingUseLabel",comprehensiveBuildingUse.get(MapUtils.getString(row,"buildingUse")));
-                row.put("identityCodeLabel",comprehensiveCertificateCode.get(MapUtils.getString(row,"identityCode")));
-                row.put("rentalUseLabel",comprehensiveRentalUse.get(MapUtils.getString(row,"rentalUse")));
-                row.put("hiddenDangerTypeLabel",comprehensiveHazardType.get(MapUtils.getString(row,"hiddenDangerType")));
-
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-
-    /**
-     * 获取出租房详细信息
-     */
-    @GetMapping("/housing/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteRentalHousingService.selectComprehensiveRhfRentalHousingById(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-
-            HashMap<String,Object> comprehensiveRhfRentalHousing = (HashMap<String, Object>) ajaxResult.get("data");
-            comprehensiveRhfRentalHousing.put("buildingUseLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_BUILDING_USE, MapUtils.getString(comprehensiveRhfRentalHousing,"buildingUse")));
-            comprehensiveRhfRentalHousing.put("identityCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveRhfRentalHousing,"identityCode")));
-            comprehensiveRhfRentalHousing.put("rentalUseLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_RENTAL_USE, MapUtils.getString(comprehensiveRhfRentalHousing,"rentalUse")));
-            comprehensiveRhfRentalHousing.put("hiddenDangerTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_HAZARD_TYPE, MapUtils.getString(comprehensiveRhfRentalHousing,"hiddenDangerType")));
-
-            return AjaxResult.success(comprehensiveRhfRentalHousing);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-
-    }
-
-    /**
-     * 新增出租房
-     */
-    @PostMapping("/housing")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteRentalHousingService.insertComprehensiveRhfRentalHousing(json);
-    }
-    /**
-     * 修改出租房
-     */
-    @PostMapping("/housing/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteRentalHousingService.updateComprehensiveRhfRentalHousing(json);
-    }
-
-    /**
-     * 删除出租房
-     */
-    @GetMapping("/housing/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteRentalHousingService.deleteComprehensiveRhfRentalHousingByIds(id.toArray(new String[0]));
-    }
-
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/comprehensiveconflictdefuseController/AppGridLeaderController.java

@@ -1,121 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.comprehensiveconflictdefuseController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.ComprehensiveRfhGridLeader;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteRfhGridLeaderService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-import static com.ruoyi.common.security.utils.DictUtils.getComprehensiveDictCacheToMap;
-
-/**
- * 网格长管理App
- *
- * @author hanfucheng
- * @date 2023/9/6 14:57
- */
-@RestController
-@RequestMapping("/AppGridLeaderController")
-public class    AppGridLeaderController extends BaseController {
-
-    @Resource
-    RemoteRfhGridLeaderService remoteRfhGridLeaderService;
-
-    /**
-     * 查询网格长管理列表
-     */
-    @GetMapping("/leader/list")
-    public AjaxResult list(ComprehensiveRfhGridLeader comprehensiveRfhGridLeader) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteRfhGridLeaderService.selectComprehensiveRfhGridLeaderList(pageNum, pageSize, comprehensiveRfhGridLeader.getUserName(), comprehensiveRfhGridLeader.getMemberName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> map = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);//性别
-            Map<String,Object> map1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);//民族
-            Map<String,Object> map2 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);//政治面貌
-            Map<String,Object> map3 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);//学历
-            for (Map<String, Object> row : rows) {
-                row.put("genderLabel",map.get(MapUtils.getString(row,"gender")));
-                row.put("nationLabel",map1.get(MapUtils.getString(row,"nation")));
-                row.put("politicalOutlookLabel",map2.get(MapUtils.getString(row,"politicalOutlook")));
-                row.put("educationLabel",map3.get(MapUtils.getString(row,"education")));
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    @GetMapping("/leader/listAll")
-    public AjaxResult listAll(ComprehensiveRfhGridLeader comprehensiveRfhGridLeader) {
-        AjaxResult ajaxResult = remoteRfhGridLeaderService.listAll();
-        if ("200".equals(ajaxResult.get("code").toString())){
-            Map<String,Object> map = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);//性别
-            Map<String,Object> map1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);//民族
-            Map<String,Object> map2 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);//政治面貌
-            Map<String,Object> map3 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);//学历
-            List<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
-            for (Map<String, Object> row : data) {
-                row.put("genderLabel",map.get(MapUtils.getString(row,"gender")));
-                row.put("nationLabel",map1.get(MapUtils.getString(row,"nation")));
-                row.put("politicalOutlookLabel",map2.get(MapUtils.getString(row,"politicalOutlook")));
-                row.put("educationLabel",map3.get(MapUtils.getString(row,"education")));
-            }
-        }
-        return ajaxResult;
-    }
-
-    /**
-     * 获取网格长管理详细信息
-     */
-    @GetMapping("/leader/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteRfhGridLeaderService.selectComprehensiveRfhGridLeaderById(id);
-        if ("200".equals(ajaxResult.get("code").toString())){
-            Map<String, Object> data = (Map<String, Object>) ajaxResult.get("data");
-            data.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, MapUtils.getString(data,"gender")));
-            data.put("nationLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, MapUtils.getString(data,"nation")));
-            data.put("politicalOutlookLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS, MapUtils.getString(data,"politicalOutlook")));
-            data.put("educationLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, MapUtils.getString(data,"education")));
-        }
-        return ajaxResult;
-    }
-
-    /**
-     * 新增网格长管理
-     */
-    @PostMapping("/leader")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteRfhGridLeaderService.insertComprehensiveRfhGridLeader(json);
-    }
-    /**
-     * 修改网格长管理
-     */
-    @PostMapping("/leader/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteRfhGridLeaderService.updateComprehensiveRfhGridLeader(json);
-    }
-
-    /**
-     * 删除网格长管理
-     */
-    @GetMapping("/leader/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteRfhGridLeaderService.deleteComprehensiveRfhGridLeaderByIds(id.toArray(new String[0]));
-    }
-
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/dict/AppDictController.java

@@ -1,48 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.dict;
-
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.comprehensive.api.dict.domain.DataDict;
-import com.sooka.sponest.comprehensive.api.dict.service.DataDictService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@RestController
-@RequestMapping("/AppDataDictController")
-public class AppDictController extends BaseController {
-
-    @Resource
-    private DataDictService dataDictService;
-
-    /**
-     * 手机端树形接口
-     */
-    @GetMapping("/dictTree")
-    public AjaxResult dictTree(DataDict dataDict) {
-        List list = dataDictService.dictTree(dataDict.getType(), dataDict.getResultType());
-        if(!list.isEmpty() && null != list){
-            return AjaxResult.success(list);
-        }else{
-            return AjaxResult.error(500, "list is null!");
-        }
-    }
-
-    /**
-     * 手机端树形接口
-     */
-    @GetMapping("/dictByPid")
-    public AjaxResult dictByPid(DataDict dataDict) {
-        List list = dataDictService.dictByPid(dataDict.getParentId() , dataDict.getType());
-        if(!list.isEmpty() && null != list){
-            return AjaxResult.success(list);
-        }else{
-            return AjaxResult.error(500, "list is null!");
-        }
-    }
-
-}
-

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventCompletedController.java

@@ -1,33 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventCompletedService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppEventComplated")
-public class EventCompletedController {
-
-    @Resource
-    private RemoteEventCompletedService eventCompletedService;
-
-    /**
-     * 查询已办事件列表
-     */
-    @GetMapping("/eventCompleted/list")
-    public AjaxResult getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize){
-        TableDataInfo data = eventCompletedService.getList(pageNum, pageSize);
-        if(HttpStatus.SUCCESS == data.getCode()){
-            return AjaxResult.success(data.getRows());
-        }else{
-            return AjaxResult.error(data.getCode(), data.getMsg());
-        }
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventController.java

@@ -1,162 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.DictUtils;
-import com.ruoyi.system.api.domain.SysDictData;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.*;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/AppComprehensiveEvent")
-public class EventController {
-    @Resource
-    private RemoteEventService eventService;
-
-    @Resource
-    private RemoteEventTodoService eventTodoService;
-
-    @Resource
-    private RemoteEventCompletedService eventCompletedService;
-
-    @Resource
-    private RemoteEventVerfiedService eventVerfiedService;
-
-    @Resource
-    private RemoteEventDistributeService eventDistributeService;
-
-    @Resource
-    private RemoteEventFileService eventFileService;
-
-    /**
-     * 查询事件列表接口（分页）
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/event/getList")
-    public AjaxResult getEventList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize, @RequestParam("eventType") String eventType) {
-        TableDataInfo data = new TableDataInfo();
-
-        switch (eventType){
-            case "1":
-                data = eventService.getList(pageNum,pageSize);
-                return setLabel(data, "eventState");
-            case "2":
-                data = eventTodoService.getList(pageNum,pageSize);
-                return setLabel(data, "sjczCzzt");
-            case "3":
-                data = eventCompletedService.getList(pageNum,pageSize);
-                return setLabel(data, "eventState");
-            case "4":
-                data = eventVerfiedService.getList(pageNum,pageSize);
-                return setLabel(data, "eventState");
-            case "5":
-                data = eventDistributeService.getList(pageNum,pageSize);
-                return setLabel(data, "sjczCzzt");
-            case "6":
-                data = eventFileService.getList(pageNum,pageSize);
-                return setLabel(data, "eventState");
-            default:
-                return AjaxResult.error(500, "参数错误");
-        }
-
-    }
-
-    private AjaxResult setLabel(TableDataInfo data, String keys){
-        if (HttpStatus.SUCCESS == data.getCode()) {
-            Map<String, Object> eventType1 = DictUtils.getDictCacheToMap("eventType");
-            List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) data.getRows();
-            for (HashMap<String, Object> row : rows) {
-                row.put("eventStateLabel", eventType1.get(row.get(keys).toString()));
-            }
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(data.getCode(), data.getMsg());
-        }
-    }
-
-    /**
-     * 查询事件详情接口
-     * @param eventId
-     * @return
-     */
-    @GetMapping("/event/edit")
-    public AjaxResult getEdit(@RequestParam("eventId") String eventId){
-        AjaxResult result = eventService.getEdit(eventId);
-        if("200".equals(String.valueOf(result.get("code")))){
-            HashMap<String, Object> data = (HashMap<String, Object>) result.get("data");
-            String keys = "zhsqEventType";
-            List<JSONObject> list = SpringUtils.getBean(RedisService.class).getCacheList(keys);
-            for (JSONObject map : list) {
-                if(map.getString("eventTypeId").equals(String.valueOf(data.get("eventTypeId")))){
-                    data.put("eventTypeLabel", map.get("eventTypeName"));
-                    break;
-                }
-            }
-            return AjaxResult.success(data);
-        }else{
-            return AjaxResult.error(String.valueOf(result.get("code")), result.get("msg"));
-        }
-    }
-
-    /**
-     * 新增事件接口
-     * @param event
-     */
-    @PostMapping("/event/addComprehensiveEvent")
-    public AjaxResult add(@RequestBody ZhsqEvent event) {
-        return eventService.add(event);
-    }
-
-    /**
-     * 修改事件接口
-     * @param zhsqEvent
-     * @return
-     */
-    @PostMapping("/event/put")
-    public AjaxResult put(@RequestBody ZhsqEvent zhsqEvent){
-        return eventService.put(zhsqEvent);
-    }
-
-    /**
-     * 事件删除接口
-     * @param id
-     * @return
-     */
-    @GetMapping("/event/del")
-    public AjaxResult del(@RequestParam("id") List<String> id){
-        return eventService.del(id.toArray(new String[0]));
-    }
-
-    /**
-     * 上报事件
-     * @param eventId
-     * @return
-     */
-    @GetMapping("/event/report/eventId")
-    public AjaxResult reportEventId(@RequestParam("eventId") String eventId){
-        return eventService.reportEventId(eventId);
-    }
-
-    /**
-     * 获取事件日志
-     */
-    @GetMapping("/event/eventLog")
-    public AjaxResult getEventLog(@RequestParam("eventId") String eventId){
-        return eventService.getEventLog(eventId);
-    }
-
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventDistributeController.java

@@ -1,55 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventDistributeService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppEventDistribute")
-public class EventDistributeController {
-
-    @Resource
-    private RemoteEventDistributeService eventDistributeService;
-
-    /**
-     * 待分发事件信息列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/eventDistribute/list")
-    public AjaxResult getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize){
-        TableDataInfo data = eventDistributeService.getList(pageNum, pageSize);
-        if(HttpStatus.SUCCESS == data.getCode()){
-            return AjaxResult.success(data.getRows());
-        }else{
-            return AjaxResult.error(data.getCode(), data.getMsg());
-        }
-    }
-
-    /**
-     * 事件分发-重新分发
-     * @param zhsqEvent
-     * @return
-     */
-    @PostMapping("/eventDistribute/redistribute")
-    public AjaxResult redistribute(@RequestBody ZhsqEvent zhsqEvent){
-        return eventDistributeService.redistribute(zhsqEvent);
-    }
-
-    /**
-     * 事件分发-上报区级
-     * @param eventId
-     * @param sjczId
-     * @return
-     */
-    @GetMapping("/eventDistribute/reportDistrict")
-    public AjaxResult reportDistrict(@RequestParam("eventId") String eventId, @RequestParam("sjczId") String sjczId){
-        return eventDistributeService.reportDistrict(eventId, sjczId);
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventFileController.java

@@ -1,36 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventDistributeService;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventFileService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppEventFile")
-public class EventFileController {
-    @Resource
-    private RemoteEventFileService eventFileService;
-
-    /**
-     * 查询归档事件列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/eventFile/list")
-    public AjaxResult getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize){
-        TableDataInfo data = eventFileService.getList(pageNum, pageSize);
-        if(HttpStatus.SUCCESS == data.getCode()){
-            return AjaxResult.success(data.getRows());
-        }else{
-            return AjaxResult.error(data.getCode(), data.getMsg());
-        }
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventTodoController.java

@@ -1,70 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqSjcz;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventTodoService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppEventTodo")
-public class EventTodoController {
-
-    @Resource
-    private RemoteEventTodoService eventTodoService;
-
-    /**
-     * 查询代办事件列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/eventTodo/list")
-    public AjaxResult getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize){
-        TableDataInfo list = eventTodoService.getList(pageNum, pageSize);
-        if(HttpStatus.SUCCESS == list.getCode()){
-            return AjaxResult.success(list.getRows());
-        }else{
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-    /**
-     * 事件签收
-     * @param eventId
-     * @param sjczId
-     * @return
-     */
-    @GetMapping("/eventTodo/signFor")
-    public AjaxResult signFor(@RequestParam("eventId") String eventId, @RequestParam("sjczId") String sjczId){
-        return eventTodoService.signFor(eventId, sjczId);
-    }
-
-    /**
-     * 事件拒签
-     * @param eventId
-     * @param sjczId
-     * @param postId
-     * @return
-     */
-    @GetMapping("/eventTodo/refused")
-    public AjaxResult refused(@RequestParam("eventId") String eventId, @RequestParam("sjczId") String sjczId, @RequestParam("postId") String postId){
-        return eventTodoService.refused(eventId, sjczId, postId);
-    }
-
-    /**
-     * 待办事件申请办结
-     * @param zhsqSjcz
-     * @return
-     */
-    @PostMapping("/eventTodo/complete")
-    public AjaxResult complete(@RequestBody ZhsqSjcz zhsqSjcz){
-        return eventTodoService.complete(zhsqSjcz);
-    }
-
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventTypeController.java

@@ -1,51 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventTypeService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/AppEventType")
-public class EventTypeController {
-
-    @Resource
-    private RemoteEventTypeService eventTypeService;
-
-    /**
-     * 查询事件分类列表
-     */
-    @GetMapping("/eventType/list")
-    public AjaxResult getList(){
-        TableDataInfo data = eventTypeService.getList();
-        if(HttpStatus.SUCCESS == data.getCode()){
-            if(!data.getRows().isEmpty()){
-                List<Map<String, Object>> list = new ArrayList<>();
-                for (Map<String, Object> row : (List<Map<String, Object>>) data.getRows()) {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("id", row.get("eventTypeId").toString());
-                    map.put("name", row.get("eventTypeName").toString());
-                    map.put("type", row.get("type").toString());
-                    map.put("parentId", row.get("eventTypeParentId").toString());
-                    list.add(map);
-                }
-                return AjaxResult.success(list);
-            }else{
-                return AjaxResult.error(500, "rows is empty");
-            }
-        }else{
-            return AjaxResult.error(data.getCode(), data.getMsg());
-        }
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventVerfiedController.java

@@ -1,62 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.eventController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventService;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventVerfiedService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppEventVerfied")
-public class EventVerfiedController {
-
-    @Resource
-    private RemoteEventVerfiedService eventVerfiedService;
-
-    /**
-     * 查询待核验事件列表
-     */
-    @GetMapping("/eventVerfied/list")
-    public AjaxResult getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize){
-        TableDataInfo data = eventVerfiedService.getList(pageNum, pageSize);
-        if(HttpStatus.SUCCESS == data.getCode()){
-            return AjaxResult.success(data.getRows());
-        }else{
-            return AjaxResult.error(data.getCode(), data.getMsg());
-        }
-    }
-
-    /**
-     * 事件核验-核查通过
-     */
-    @GetMapping("/eventVerfied/verificationPassed")
-    public AjaxResult verificationPassed(ZhsqEvent zhsqEvent){
-        return eventVerfiedService.verificationPassed(zhsqEvent.getEventSbrDeptId(), zhsqEvent.getEventSbrDeptName(), zhsqEvent.getEventId(), zhsqEvent.getEventTypeId(), zhsqEvent.getEventHcyj());
-    }
-
-    /**
-     * 事件核验-退回重办
-     */
-    @GetMapping("/eventVerfied/reHandle")
-    public AjaxResult reHandle(ZhsqEvent zhsqEvent){
-        return eventVerfiedService.reHandle(zhsqEvent.getEventSbrDeptId(), zhsqEvent.getEventSbrDeptName(), zhsqEvent.getEventId(), zhsqEvent.getEventTypeId(), zhsqEvent.getEventHcyj());
-    }
-
-    /**
-     * 事件核验-归档
-     * @param eventId
-     * @return
-     */
-    @GetMapping("/eventVerfied/eventFile")
-    public AjaxResult eventFile(@RequestParam("eventId") String eventId){
-        return eventVerfiedService.eventFile(eventId);
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/nonPublicEconomicOrganizationsController/APPComprehensiveNonPublicEconomicOrganizationsController.java

@@ -1,119 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.nonPublicEconomicOrganizationsController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.ComprehensiveNonPublicEconomicOrganizations;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveNonPublicEconomicOrganizationsService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @author zhaozhan
- * @date 2023/9/15
- */
-@RestController
-@RequestMapping("/APPComprehensiveNonPublicEconomicOrganizationsController")
-public class APPComprehensiveNonPublicEconomicOrganizationsController {
-    @Resource
-    private ComprehensiveNonPublicEconomicOrganizationsService comprehensiveNonPublicEconomicOrganizationsService;
-    /**
-     * 非公有制经济组织列表
-     * @param comprehensiveNonPublicEconomicOrganizations
-     * @return
-     */
-    @GetMapping("/ComprehensiveNonPublicEconomicOrganizations/list")
-    public AjaxResult list(ComprehensiveNonPublicEconomicOrganizations comprehensiveNonPublicEconomicOrganizations) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = comprehensiveNonPublicEconomicOrganizationsService.list(pageNum, pageSize, comprehensiveNonPublicEconomicOrganizations.getEnterpriseName(), comprehensiveNonPublicEconomicOrganizations.getRegistrationNumbe(), comprehensiveNonPublicEconomicOrganizations.getLegalPersonIdNumber());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows= (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> comprehensiveBusinessCategory = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_BUSINESS_CATEGORY);
-            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String,Object> comprehensiveSecurityRisks = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SECURITY_RISKS);
-            Map<String,Object> comprehensiveLevelOfAttention = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION);
-            for (Map<String, Object> row : rows) {
-                row.put("enterpriseCategoryLabel",MapUtils.getString(comprehensiveBusinessCategory, MapUtils.getString(row,"enterpriseCategory")));
-                row.put("legalPersonIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode, MapUtils.getString(row,"legalPersonIdCode")));
-                row.put("safetyHazardsTypeLabel",MapUtils.getString(comprehensiveSecurityRisks, MapUtils.getString(row,"safetyHazardsType")));
-                row.put("attentivenessLabel",MapUtils.getString(comprehensiveLevelOfAttention, MapUtils.getString(row,"attentiveness")));
-                row.put("conditionsEstablishmentLabel",MapUtils.getLong(row,"conditionsEstablishment")==0?"否":"是");
-                row.put("communistOrganizationLabel",MapUtils.getLong(row,"communistOrganization")==0?"否":"是");
-                row.put("tradeUnionLabel",MapUtils.getLong(row,"tradeUnion")==0?"否":"是");
-                row.put("communistYouthLeagueLabel",MapUtils.getLong(row,"communistYouthLeague")==0?"否":"是");
-                row.put("womenFederationLabel",MapUtils.getLong(row,"womenFederation")==0?"否":"是");
-                row.put("hazardousIndustryLabel",MapUtils.getLong(row,"hazardousIndustry")==0?"否":"是");
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-    /**
-     * 非公有制经济组织详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/ComprehensiveNonPublicEconomicOrganizations/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = comprehensiveNonPublicEconomicOrganizationsService.edit(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveNonPublicEconomicOrganizations = (HashMap<String, Object>) ajaxResult.get("data");
-
-            comprehensiveNonPublicEconomicOrganizations.put("enterpriseCategoryLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_BUSINESS_CATEGORY, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"enterpriseCategory")));
-            comprehensiveNonPublicEconomicOrganizations.put("legalPersonIdCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"legalPersonIdCode")));
-            comprehensiveNonPublicEconomicOrganizations.put("safetyHazardsTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SECURITY_RISKS, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"safetyHazardsType")));
-            comprehensiveNonPublicEconomicOrganizations.put("attentivenessLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"attentiveness")));
-            comprehensiveNonPublicEconomicOrganizations.put("conditionsEstablishmentLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"conditionsEstablishment")==0?"否":"是");
-            comprehensiveNonPublicEconomicOrganizations.put("communistOrganizationLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"communistOrganization")==0?"否":"是");
-            comprehensiveNonPublicEconomicOrganizations.put("tradeUnionLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"tradeUnion")==0?"否":"是");
-            comprehensiveNonPublicEconomicOrganizations.put("communistYouthLeagueLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"communistYouthLeague")==0?"否":"是");
-            comprehensiveNonPublicEconomicOrganizations.put("womenFederationLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"womenFederation")==0?"否":"是");
-            comprehensiveNonPublicEconomicOrganizations.put("hazardousIndustryLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"hazardousIndustry")==0?"否":"是");
-
-            return AjaxResult.success(comprehensiveNonPublicEconomicOrganizations);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-
-    }
-    /**
-     * 非公有制经济组织新增
-     * @param json
-     * @return AjaxResult
-     */
-    @PostMapping("/ComprehensiveNonPublicEconomicOrganizations")
-    public AjaxResult add(@RequestBody String json) {
-        return comprehensiveNonPublicEconomicOrganizationsService.add(json);
-    }
-    /**
-     * 非公有制经济组织修改
-     * @param json
-     * @return AjaxResult
-     */
-    @PostMapping("/ComprehensiveNonPublicEconomicOrganizations/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return comprehensiveNonPublicEconomicOrganizationsService.getInfo(json);
-    }
-    /**
-     * 非公有制经济组织删除
-     * @param id
-     * @return AjaxResult
-     */
-    @GetMapping("/ComprehensiveNonPublicEconomicOrganizations/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return comprehensiveNonPublicEconomicOrganizationsService.remove(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/nonPublicEconomicOrganizationsController/APPComprehensiveSocialOrganizationController.java

@@ -1,116 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.nonPublicEconomicOrganizationsController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.ComprehensiveSocialOrganization;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveSocialOrganizationService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaozhan
- * @date 2023/9/15
- */
-@RestController
-@RequestMapping("/APPComprehensiveSocialOrganizationController")
-public class APPComprehensiveSocialOrganizationController {
-    @Resource
-    private ComprehensiveSocialOrganizationService comprehensiveSocialOrganizationService;
-    /**
-     * 社会组织列表
-     * @param comprehensiveSocialOrganization
-     * @return
-     */
-    @GetMapping("/ComprehensiveSocialOrganization/list")
-    public AjaxResult list(ComprehensiveSocialOrganization comprehensiveSocialOrganization) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = comprehensiveSocialOrganizationService.list(pageNum, pageSize, comprehensiveSocialOrganization.getSocialOrganizationName(), comprehensiveSocialOrganization.getRegistrationNumbe(), comprehensiveSocialOrganization.getPrincipalIdNumber());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-
-            Map<String,Object> comprehensiveSocialOrganization1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SOCIAL_ORGANIZATION);
-            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String,Object> comprehensiveLevelOfAttention = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION);
-            for (Map<String, Object> row : rows) {
-
-                row.put("socialOrganizationTypeLabel",MapUtils.getString(comprehensiveSocialOrganization1 , MapUtils.getString(row,"socialOrganizationType")));
-                row.put("principalIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode, MapUtils.getString(row,"principalIdCode")));
-                row.put("attentivenessLabel",MapUtils.getString(comprehensiveLevelOfAttention, MapUtils.getString(row,"attentiveness")));
-                row.put("conditionsEstablishmentLabel",MapUtils.getLong(row,"conditionsEstablishment")==0?"否":"是");
-                row.put("communistOrganizationLabel",MapUtils.getLong(row,"communistOrganization")==0?"否":"是");
-                row.put("tradeUnionLabel",MapUtils.getLong(row,"tradeUnion")==0?"否":"是");
-                row.put("communistYouthLeagueLabel",MapUtils.getLong(row,"communistYouthLeague")==0?"否":"是");
-                row.put("womenFederationLabel",MapUtils.getLong(row,"womenFederation")==0?"否":"是");
-                row.put("overseasBackgroundLabel",MapUtils.getLong(row,"overseasBackground")==0?"否":"是");
-                row.put("statusLabel",MapUtils.getLong(row,"status")==0?"不可用":"可用");
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-    /**
-     * 社会组织详情
-     * @param id
-     * @return AjaxResult
-     */
-    @GetMapping("/ComprehensiveSocialOrganization/edit")
-    public AjaxResult edit(String id) {
-        AjaxResult ajaxResult = comprehensiveSocialOrganizationService.edit(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveSocialOrganization = (HashMap<String, Object>) ajaxResult.get("data");
-            comprehensiveSocialOrganization.put("socialOrganizationTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SOCIAL_ORGANIZATION, MapUtils.getString(comprehensiveSocialOrganization,"socialOrganizationType")));
-            comprehensiveSocialOrganization.put("principalIdCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveSocialOrganization,"principalIdCode")));
-            comprehensiveSocialOrganization.put("attentivenessLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION, MapUtils.getString(comprehensiveSocialOrganization,"attentiveness")));
-            comprehensiveSocialOrganization.put("conditionsEstablishmentLabel",MapUtils.getLong(comprehensiveSocialOrganization,"conditionsEstablishment")==0?"否":"是");
-            comprehensiveSocialOrganization.put("communistOrganizationLabel",MapUtils.getLong(comprehensiveSocialOrganization,"communistOrganization")==0?"否":"是");
-            comprehensiveSocialOrganization.put("tradeUnionLabel",MapUtils.getLong(comprehensiveSocialOrganization,"tradeUnion")==0?"否":"是");
-            comprehensiveSocialOrganization.put("communistYouthLeagueLabel",MapUtils.getLong(comprehensiveSocialOrganization,"communistYouthLeague")==0?"否":"是");
-            comprehensiveSocialOrganization.put("womenFederationLabel",MapUtils.getLong(comprehensiveSocialOrganization,"womenFederation")==0?"否":"是");
-            comprehensiveSocialOrganization.put("overseasBackgroundLabel",MapUtils.getLong(comprehensiveSocialOrganization,"overseasBackground")==0?"否":"是");
-            comprehensiveSocialOrganization.put("statusLabel",MapUtils.getLong(comprehensiveSocialOrganization,"status")==0?"不可用":"可用");
-            return AjaxResult.success(comprehensiveSocialOrganization);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-    }
-    /**
-     * 社会组织新增
-     * @param json
-     * @return AjaxResult
-     */
-    @PostMapping("/ComprehensiveSocialOrganization")
-    public AjaxResult add(@RequestBody String json) {
-        return comprehensiveSocialOrganizationService.add(json);
-    }
-    /**
-     * 社会组织修改
-     * @param json
-     * @return AjaxResult
-     */
-    @PostMapping("/ComprehensiveSocialOrganization/put")
-    public AjaxResult getInfo(@RequestBody String json) {
-        return comprehensiveSocialOrganizationService.getInfo(json);
-    }
-    /**
-     * 社会组织删除
-     * @param id
-     * @return AjaxResult
-     */
-    @GetMapping("/ComprehensiveSocialOrganization/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return comprehensiveSocialOrganizationService.remove(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/APPComprehensiveManagementCenterController.java

@@ -1,103 +0,0 @@
-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.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.ComprehensiveManagementCenter;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveManagementCenterService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaozhan
- * @date 2023/9/14
- */
-@RestController
-@RequestMapping("/APPComprehensiveManagementCenterController")
-public class APPComprehensiveManagementCenterController extends BaseController {
-    @Resource
-    private ComprehensiveManagementCenterService comprehensiveManagementCenterService;
-
-    /**
-     * 综治中心列表
-     *
-     * @param comprehensiveManagementCenter
-     * @return
-     */
-    @GetMapping("/ComprehensiveManagementCenter/list")
-    public AjaxResult list(ComprehensiveManagementCenter comprehensiveManagementCenter) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = comprehensiveManagementCenterService.list(pageNum, pageSize, comprehensiveManagementCenter.getCenterName(), comprehensiveManagementCenter.getPrincipalName(), comprehensiveManagementCenter.getLevel());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            Map<String, Object> comprehensiveDictCacheToMap = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);// 2260
-            Map<String, Object> levelsCacheToMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);// levels
-            for (Object row : tableDataInfo.getRows()) {
-                HashMap r = (HashMap) row;
-                r.put("placeLabel", comprehensiveDictCacheToMap.get(r.get("place").toString()));//所在地 2260
-                r.put("levelLabel", levelsCacheToMap.get(r.get("level").toString()));//levels
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-    /**
-     * 综治中心详情
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/ComprehensiveManagementCenter/edit")
-    public AjaxResult edit(String id) {
-        AjaxResult info = comprehensiveManagementCenterService.edit(id);
-        if ("200".equals(info.get("code").toString())){
-            Map<String, Object> comprehensiveDictCacheToMap = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);// 2260
-            Map<String, Object> levelsCacheToMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);// levels
-            Map<String, Object> data = (Map<String, Object>) info.get("data");
-            data.put("placeLabel", comprehensiveDictCacheToMap.get(data.get("place").toString()));//所在地 2260
-            data.put("levelLabel", levelsCacheToMap.get(data.get("level").toString()));//levels
-        }
-        return info;
-    }
-
-    /**
-     * 综治中心新增
-     *
-     * @param json
-     * @return AjaxResult
-     */
-    @PostMapping("/ComprehensiveManagementCenter")
-    public AjaxResult add(@RequestBody String json) {
-        return comprehensiveManagementCenterService.add(json);
-    }
-    /**
-     * 综治中心修改
-     *
-     * @param json
-     * @return AjaxResult
-     */
-    @PostMapping("/ComprehensiveManagementCenter/put")
-    public AjaxResult getInfo(@RequestBody String json) {
-        return comprehensiveManagementCenterService.getInfo(json);
-    }
-    /**
-     * 综治中心删除
-     * @param id
-     * @return AjaxResult
-     */
-    @GetMapping("/ComprehensiveManagementCenter/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return comprehensiveManagementCenterService.remove(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/APPComprehensiveTGrossCaseController.java

@@ -1,89 +0,0 @@
-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.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.ComprehensiveTGrossCase;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTGrossCaseService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaozhan
- * @date 2023/9/18
- */
-@RestController
-@RequestMapping("/APPComprehensiveTGrossCaseController")
-public class APPComprehensiveTGrossCaseController {
-    @Resource
-    private ComprehensiveTGrossCaseService comprehensiveTGrossCaseService;
-
-    /**
-     * 查询重特大案（事）件列表
-     */
-    @GetMapping("/grossCase/list")
-    public AjaxResult list(ComprehensiveTGrossCase comprehensiveTGrossCase) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = comprehensiveTGrossCaseService.list(pageNum, pageSize, comprehensiveTGrossCase.getEventName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            Map<String, Object> cacheGrading = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CASES_GRADING);// 案（事）件分级
-            Map<String, Object> cacheType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CASES_TYPE);// 案（事）件类型
-            for (Object row : tableDataInfo.getRows()) {
-                HashMap r = (HashMap) row;
-                r.put("eventLevelLabel", cacheGrading.get(r.get("eventLevel").toString()));
-                r.put("eventTypeLabel", cacheType.get(r.get("eventType").toString()));
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-    /**
-     * 获取重特大案（事）件详细信息
-     */
-    @GetMapping(value = "/grossCase/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult info = comprehensiveTGrossCaseService.getInfo(id);
-        if ("200".equals(info.get("code").toString())){
-            Map<String, Object> cacheGrading = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CASES_GRADING);// 案（事）件分级
-            Map<String, Object> cacheType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CASES_TYPE);// 案（事）件类型
-            Map<String, Object> data = (Map<String, Object>) info.get("data");
-            data.put("eventLevelLabel", cacheGrading.get(data.get("eventLevel").toString()));
-            data.put("eventTypeLabel", cacheType.get(data.get("eventType").toString()));
-            return AjaxResult.success(data);
-        }else{
-            return AjaxResult.error(info.get("code").toString(),info.get("msg"));
-        }
-    }
-    /**
-     * 新增重特大案（事）件
-     */
-    @PostMapping("/grossCase")
-    public AjaxResult add(@RequestBody String json) {
-        return comprehensiveTGrossCaseService.add(json);
-    }
-    /**
-     * 修改重特大案（事）件
-     */
-    @PostMapping("/grossCase/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return comprehensiveTGrossCaseService.edit(json);
-    }
-    /**
-     * 删除重特大案（事）件
-     */
-    @GetMapping("/grossCase/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return comprehensiveTGrossCaseService.remove(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/APPComprehensiveTPreventionOrganizationController.java

@@ -1,95 +0,0 @@
-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.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.ComprehensiveHousingEstate;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveTPreventionOrganization;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionOrganizationService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaozhan
- * @date 2023/9/18
- */
-@RestController
-@RequestMapping("/APPComprehensiveTPreventionOrganizationController")
-public class APPComprehensiveTPreventionOrganizationController {
-
-    @Resource
-    private ComprehensiveTPreventionOrganizationService comprehensiveTPreventionOrganizationService;
-    /**
-     * 查询群防群治组织列表
-     */
-    @GetMapping("/preventionOrganization/list")
-    public AjaxResult list(ComprehensiveTPreventionOrganization comprehensiveTPreventionOrganization) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = comprehensiveTPreventionOrganizationService.list(pageNum, pageSize, comprehensiveTPreventionOrganization.getOrganizationName(), comprehensiveTPreventionOrganization.getOrganizationType(), comprehensiveTPreventionOrganization.getLevel(), comprehensiveTPreventionOrganization.getGuidanceDepartment(), comprehensiveTPreventionOrganization.getPersonnel(), comprehensiveTPreventionOrganization.getFunctions());
-        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            Map<String, Object> comprehensiveOrganizationTypeLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_ORGANIZATION_TYPE);
-            Map<String, Object> comprehensiveLevelLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);
-            for (HashMap<String, Object> row:
-                 rows) {
-                row.put("organizationTypeLabel",comprehensiveOrganizationTypeLabel.get(row.get("organizationType").toString()));
-                row.put("levelLabel",comprehensiveLevelLabel.get(row.get("level").toString()));
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-    @GetMapping("/preventionOrganization/getComprehensiveTPreventionOrganization")
-    public AjaxResult getComprehensiveTPreventionOrganization() {
-        return AjaxResult.success(comprehensiveTPreventionOrganizationService.getComprehensiveTPreventionOrganization());
-    }
-    /**
-     * 获取群防群治组织详细信息
-     */
-    @GetMapping(value = "/preventionOrganization/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveTPreventionOrganization> edit =comprehensiveTPreventionOrganizationService.getInfo(id);
-        ComprehensiveTPreventionOrganization data = edit.getData();
-        if (HttpStatus.SUCCESS == edit.getCode()){
-            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);
-    }
-    /**
-     * 新增群防群治组织
-     */
-    @PostMapping("/preventionOrganization")
-    public AjaxResult add(@RequestBody String json) {
-        return comprehensiveTPreventionOrganizationService.add(json);
-    }
-    /**
-     * 修改群防群治组织
-     */
-    @PostMapping("/preventionOrganization/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return comprehensiveTPreventionOrganizationService.edit(json);
-    }
-    /**
-     * 删除群防群治组织
-     */
-    @GetMapping("/preventionOrganization/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-       return comprehensiveTPreventionOrganizationService.remove(id.toArray(new String[0]));
-    }
-}

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

@@ -1,98 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.R;
-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.ComprehensiveTPreventionTeam;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionTeamService;
-import com.ruoyi.common.core.domain.DictKeys;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhaozhan
- * @date 2023/9/18
- */
-@RestController
-@RequestMapping("/APPComprehensiveTPreventionTeam")
-public class APPComprehensiveTPreventionTeam {
-    @Resource
-    private ComprehensiveTPreventionTeamService comprehensiveTPreventionTeamService;
-    /**
-     * 查询群防群治队伍列表
-     */
-    @GetMapping("/preventionTeam/list")
-    public AjaxResult list(ComprehensiveTPreventionTeam comprehensiveTPreventionTeam) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = comprehensiveTPreventionTeamService.list(pageNum, pageSize, comprehensiveTPreventionTeam.getName());
-        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            Map<String, Object> comprehensiveGenderLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
-            Map<String, Object> comprehensiveNationLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);
-            Map<String, Object> comprehensivePoliticalOutlookLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);
-            Map<String, Object> comprehensiveCodeLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String, Object> comprehensiveEducationLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
-            for (HashMap<String ,Object> row:rows) {
-                row.put("genderLabel",comprehensiveGenderLabel.get(row.get("gender").toString()));
-                row.put("nationLabel",comprehensiveNationLabel.get(row.get("nation").toString()));
-                row.put("politicalOutlookLabel",comprehensivePoliticalOutlookLabel.get(row.get("politicalOutlook").toString()));
-                row.put("educationLabel",comprehensiveEducationLabel.get(row.get("education").toString()));
-                row.put("codeLabel",comprehensiveCodeLabel.get(row.get("code").toString()));
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-    /**
-     * 获取群防群治队伍详细信息
-     */
-    @GetMapping(value = "/preventionTeam/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveTPreventionTeam> edit = comprehensiveTPreventionTeamService.getInfo(id);
-        if(HttpStatus.SUCCESS == edit.getCode()){
-            ComprehensiveTPreventionTeam comprehensiveTPreventionTeam = edit.getData();
-            comprehensiveTPreventionTeam.setSpecialityLabel(String.join(",",DictUtils.getDictDataListByValue(DictKeys.COMPREHENSIVE_PROFESSIONAL_EXPERTISE,comprehensiveTPreventionTeam.getSpeciality())));
-            comprehensiveTPreventionTeam.setGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, comprehensiveTPreventionTeam.getGender()));
-            comprehensiveTPreventionTeam.setNationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, comprehensiveTPreventionTeam.getNation()));
-            comprehensiveTPreventionTeam.setPoliticalOutlookLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS, comprehensiveTPreventionTeam.getPoliticalOutlook()));
-            comprehensiveTPreventionTeam.setCodeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, comprehensiveTPreventionTeam.getCode()));
-            comprehensiveTPreventionTeam.setEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, comprehensiveTPreventionTeam.getEducation()));
-
-            return AjaxResult.success(comprehensiveTPreventionTeam);
-        }else{
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-
-    }
-    /**
-     * 新增群防群治队伍
-     */
-    @PostMapping("/preventionTeam")
-    public AjaxResult add(@RequestBody String json) {
-        return comprehensiveTPreventionTeamService.add(json);
-    }
-    /**
-     * 修改群防群治队伍
-     */
-    @PostMapping("/preventionTeam/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return comprehensiveTPreventionTeamService.edit(json);
-    }
-    /**
-     * 删除群防群治队伍
-     */
-    @GetMapping("/preventionTeam/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return comprehensiveTPreventionTeamService.remove(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppBuildingController.java

@@ -1,94 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveBuilding;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteBuildingService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 楼栋管理
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppBuildingController")
-public class AppBuildingController extends BaseController {
-
-    @Resource
-    RemoteBuildingService remoteBuildingService;
-
-    /**
-     * 查询楼栋管理列表
-     */
-    @GetMapping("/comprehensivebuilding/list")
-    public AjaxResult list(ComprehensiveBuilding comprehensivebuilding) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteBuildingService.selectComprehensiveBuildingList(pageNum, pageSize,comprehensivebuilding.getBuildName(),comprehensivebuilding.getEstateId());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取楼栋管理详细信息
-     */
-    @GetMapping("/comprehensivebuilding/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveBuilding> edit = remoteBuildingService.selectComprehensiveBuildingById(id);
-        ComprehensiveBuilding data = edit.getData();
-        if (HttpStatus.SUCCESS == edit.getCode()){
-            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);
-    }
-
-    /**
-     * 新增楼栋管理
-     */
-    @PostMapping("/comprehensivebuilding")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteBuildingService.insertComprehensiveBuilding(json);
-    }
-    /**
-     * 修改楼栋管理
-     */
-    @PostMapping("/comprehensivebuilding/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteBuildingService.updateComprehensiveBuilding(json);
-    }
-
-    /**
-     * 删除楼栋管理
-     */
-    @GetMapping("/comprehensivebuilding/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteBuildingService.deleteComprehensiveBuildingByIds(id.toArray(new String[0]));
-    }
-
-    /**
-     * 楼栋下拉选
-     */
-    @GetMapping("/comprehensivebuilding/getbuilding")
-    public AjaxResult getbuilding(@RequestParam("estateId") String estateId) {
-        return remoteBuildingService.getbuilding(estateId);
-    }
-
-}

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

@@ -1,127 +0,0 @@
-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;
-
-import static com.ruoyi.common.security.utils.DictUtils.getComprehensiveDictCacheToMap;
-
-/**
- * 楼栋长管理
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppBuildingLeaderController")
-public class AppBuildingLeaderController extends BaseController {
-
-    @Resource
-    RemoteBuildingLeaderService remoteBuildingLeaderService;
-
-    /**
-     * 查询楼栋长管理列表
-     */
-    @GetMapping("/comprehensivebuildingleader/list")
-    public AjaxResult list(ComprehensiveBuildingLeader comprehensivebuildingleader) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteBuildingLeaderService.selectComprehensiveBuildingLeaderList(pageNum, pageSize,comprehensivebuildingleader.getUserName());
-        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            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);
-            Map<String, Object> maps3 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
-            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")));
-                    row.put("educationLabel", maps3.get(row.get("education")));
-                }
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    @GetMapping("/comprehensivebuildingleader/listAll")
-    public AjaxResult listAll(ComprehensiveBuildingLeader comprehensivebuildingleader) {
-        AjaxResult allUserInfo = remoteBuildingLeaderService.listAll();
-        if ("200".equals(allUserInfo.get("code").toString())){
-            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);
-            Map<String, Object> maps3 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
-            List<Map<String, Object>> data = (List<Map<String, Object>>) allUserInfo.get("data");
-            for (Map<String, Object> map : data) {
-                map.put("politicalOutlookLabel", maps.get(map.get("politicalOutlook")));
-                map.put("nationLabel", maps1.get(map.get("nation")));
-                map.put("genderLabel", maps2.get(map.get("gender")));
-                map.put("educationLabel", maps3.get(map.get("education")));
-            }
-        }
-     return allUserInfo;
-    }
-
-    /**
-     * 获取楼栋长管理详细信息
-     */
-    @GetMapping("/comprehensivebuildingleader/edit")
-    public AjaxResult getInfo(String id) {
-        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);
-        }else {
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-        return AjaxResult.success(data);
-    }
-
-    /**
-     * 新增楼栋长管理
-     */
-    @PostMapping("/comprehensivebuildingleader")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteBuildingLeaderService.insertComprehensiveBuildingLeader(json);
-    }
-    /**
-     * 修改楼栋长管理
-     */
-    @PostMapping("/comprehensivebuildingleader/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteBuildingLeaderService.updateComprehensiveBuildingLeader(json);
-    }
-
-    /**
-     * 删除楼栋长管理
-     */
-    @GetMapping("/comprehensivebuildingleader/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteBuildingLeaderService.deleteComprehensiveBuildingLeaderByIds(id.toArray(new String[0]));
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppHousingEstateController.java

@@ -1,99 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveHousingEstate;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteHousingEstateService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 小区管理
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppHousingEstateController")
-public class AppHousingEstateController extends BaseController {
-
-    @Resource
-    RemoteHousingEstateService remoteHousingEstateService;
-
-    /**
-     * 查询小区管理列表
-     */
-    @GetMapping("/comprehensivehousingestate/list")
-    public AjaxResult list(ComprehensiveHousingEstate comprehensivehousingestate) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteHousingEstateService.selectComprehensiveHousingEstaterList(pageNum, pageSize,comprehensivehousingestate.getEstateName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取小区管理详细信息
-     */
-    @GetMapping("/comprehensivehousingestate/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveHousingEstate> edit = remoteHousingEstateService.selectComprehensiveHousingEstaterById(id);
-        ComprehensiveHousingEstate data = edit.getData();
-        if (HttpStatus.SUCCESS == edit.getCode()){
-            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);
-    }
-
-    /**
-     * 新增小区管理
-     */
-    @PostMapping("/comprehensivehousingestate")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteHousingEstateService.insertComprehensiveHousingEstater(json);
-    }
-    /**
-     * 修改小区管理
-     */
-    @PostMapping("/comprehensivehousingestate/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteHousingEstateService.updateComprehensiveHousingEstater(json);
-    }
-
-    /**
-     * 删除小区管理
-     */
-    @GetMapping("/comprehensivehousingestate/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteHousingEstateService.deleteComprehensiveHousingEstaterByIds(id.toArray(new String[0]));
-    }
-
-    /**
-     * 小区下拉选小区管理
-     */
-    @GetMapping("/comprehensivehousingestate/getHousingEstate")
-    public AjaxResult getHousingEstate(ComprehensiveHousingEstate housingEstate) {
-        return remoteHousingEstateService.getHousingEstate(housingEstate.getEstateName());
-    }
-
-
-    @GetMapping("/comprehensivehousingestate/getDeptInfo")
-    public AjaxResult getDeptInfo(){
-        return remoteHousingEstateService.getDeptInfo();
-    }
-}

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

@@ -1,109 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.ComprehensiveInstitutions;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteInstitutionsService;
-import com.ruoyi.common.core.domain.DictKeys;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 综治机构
- *
- * @author hanfucheng
- * @date 2023/9/13 15:37
- */
-@RestController
-@RequestMapping("/AppInstitutionsController")
-public class AppInstitutionsController extends BaseController {
-
-    @Resource
-    RemoteInstitutionsService remoteInstitutionsService;
-
-    /**
-     * 查询综治机构列表
-     */
-    @GetMapping("/comprehensiveInstitutionsf/list")
-    public AjaxResult list(ComprehensiveInstitutions comprehensiveInstitutions) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteInstitutionsService.selectComprehensiveInstitutionsList(pageNum, pageSize, comprehensiveInstitutions.getInstitutionName(), comprehensiveInstitutions.getInstitutionType(), comprehensiveInstitutions.getLevel());
-        Map<String, Object> comprehensiveInstitutionsType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_INSTITUTIONS_TYPE);
-        Map<String, Object> comprehensiveLevels = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);
-        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("institutionTypeLabel", comprehensiveInstitutionsType.get(row.get("institutionType")));
-                    row.put("levelLabel", comprehensiveLevels.get(row.get("level")));
-                }
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        } else {
-            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
-        }
-    }
-
-    @GetMapping("/comprehensiveInstitutionsf/comprehensiveInstitutionsfList")
-    public AjaxResult selectComprehensiveInstitutionsf(ComprehensiveInstitutions comprehensiveInstitutions) {
-        List<ComprehensiveInstitutions> comprehensiveInstitutionsList = remoteInstitutionsService.comprehensiveInstitutionsfList();
-        return AjaxResult.success(comprehensiveInstitutionsList);
-    }
-
-
-    /**
-     * 获取综治机构详细信息
-     */
-    @GetMapping("/comprehensiveInstitutionsf/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveInstitutions> comprehensiveInstitutionsR = remoteInstitutionsService.selectComprehensiveInstitutionsById(id);
-        ComprehensiveInstitutions data = comprehensiveInstitutionsR.getData();
-        data.setInstitutionTypeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_INSTITUTIONS_TYPE, data.getInstitutionType()));
-        data.setLevelLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVELS, data.getLevel()));
-        if (HttpStatus.SUCCESS == comprehensiveInstitutionsR.getCode()) {
-            data.setIsEdit(true);
-        } else if (HttpStatus.ERROR == comprehensiveInstitutionsR.getCode() && null != data) {
-            data.setIsEdit(false);
-        } else {
-            return AjaxResult.error(comprehensiveInstitutionsR.getCode(), comprehensiveInstitutionsR.getMsg());
-        }
-        return AjaxResult.success(data);
-    }
-
-    /**
-     * 新增综治机构
-     */
-    @PostMapping("/comprehensiveInstitutionsf")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteInstitutionsService.insertComprehensiveInstitutions(json);
-    }
-
-    /**
-     * 修改综治机构
-     */
-    @PostMapping("/comprehensiveInstitutionsf/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteInstitutionsService.updateComprehensiveInstitutions(json);
-    }
-
-    /**
-     * 删除综治机构
-     */
-    @GetMapping("/comprehensiveInstitutionsf/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteInstitutionsService.deleteComprehensiveInstitutionsByIds(id.toArray(new String[0]));
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppLeadershipController.java

@@ -1,100 +0,0 @@
-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.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.ComprehensiveLeadership;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteLeadershipService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 综治领导责任制
- *
- * @author hanfucheng
- * @date 2023/9/21 13:14
- */
-@RestController
-@RequestMapping("/AppLeadershipController")
-public class AppLeadershipController extends BaseController {
-
-    @Resource
-    RemoteLeadershipService remoteLeadershipService;
-
-    /**
-     * 查询综治领导责任制列表
-     */
-    @GetMapping("/comprehensiveLeadership/list")
-    public AjaxResult list(ComprehensiveLeadership comprehensiveLeadership) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteLeadershipService.selectComprehensiveLeadershipList(pageNum, pageSize,comprehensiveLeadership.getImplementPrincipal());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> comprehensiveLevels = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);
-            Map<String,Object> comprehensivePoliciesType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLICIES_TYPE);
-
-
-            for (Map<String, Object> row : rows) {
-                row.put("implementedLevelLabel",MapUtils.getString(comprehensiveLevels,MapUtils.getString(row,"implementedLevel")));
-                row.put("implementLevelLabel",MapUtils.getString(comprehensiveLevels,MapUtils.getString(row,"implementLevel")));
-                row.put("policyTypelabel",MapUtils.getString(comprehensivePoliciesType, MapUtils.getString(row,"policyType")));
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取综治领导责任制详细信息
-     */
-    @GetMapping("/comprehensiveLeadership/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteLeadershipService.selectComprehensiveLeadershipById(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveLeadership = (HashMap<String, Object>) ajaxResult.get("data");
-            comprehensiveLeadership.put("implementedLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVELS, MapUtils.getString(comprehensiveLeadership,"implementedLevel")));
-            comprehensiveLeadership.put("implementLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVELS, MapUtils.getString(comprehensiveLeadership,"implementLevel")));
-            comprehensiveLeadership.put("policyTypelabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLICIES_TYPE, MapUtils.getString(comprehensiveLeadership,"policyType")));
-            return AjaxResult.success(comprehensiveLeadership);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-    }
-
-    /**
-     * 新增综治领导责任制
-     */
-    @PostMapping("/comprehensiveLeadership")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteLeadershipService.insertComprehensiveLeadership(json);
-    }
-    /**
-     * 修改综治领导责任制
-     */
-    @PostMapping("/comprehensiveLeadership/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteLeadershipService.updateComprehensiveLeadership(json);
-    }
-
-    /**
-     * 删除综治领导责任制
-     */
-    @GetMapping("/comprehensiveLeadership/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteLeadershipService.deleteComprehensiveLeadershipByIds(id.toArray(new String[0]));
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppPatrolPlanController.java

@@ -1,120 +0,0 @@
-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.comprehensivepatrol.domain.ComprehensivePatrolPlan;
-import com.sooka.sponest.comprehensive.api.comprehensivepatrol.service.RemotePatrolPlanService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 巡查计划
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppPatrolPlanController")
-public class AppPatrolPlanController extends BaseController {
-
-    @Resource
-    RemotePatrolPlanService remotePatrolPlanService;
-
-    /**
-     * 查询巡查计划列表
-     */
-    @GetMapping("/comprehensivepatrolplan/list")
-    public AjaxResult list(ComprehensivePatrolPlan comprehensivepatrolplan) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remotePatrolPlanService.selectPatrolPlanList(pageNum, pageSize,comprehensivepatrolplan.getType(),comprehensivepatrolplan.getName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> forestLinLevel = DictUtils.getDictCacheToMap(DictKeys.FOREST_LIN_LEVEL);
-            Map<String,Object> centerdataplanningCycle = DictUtils.getDictCacheToMap(DictKeys.CENTERDATAPLANNING_CYCLE);
-
-            for (Map<String, Object> row : rows) {
-             row.put("rankLabel", MapUtils.getString(forestLinLevel,MapUtils.getString(row,"rank")));
-             row.put("periodLabel", MapUtils.getString(centerdataplanningCycle,MapUtils.getString(row,"period")));
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取巡查计划详细信息
-     */
-    @GetMapping("/comprehensivepatrolplan/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensivePatrolPlan> edit = remotePatrolPlanService.selectPatrolPlanById(id);
-        ComprehensivePatrolPlan data = edit.getData();
-        data.setRankLabel(DictUtils.getDictDataByValue(DictKeys.FOREST_LIN_LEVEL,data.getRank()));
-        data.setPeriodLabel(DictUtils.getDictDataByValue(DictKeys.CENTERDATAPLANNING_CYCLE,data.getPeriod()));
-        if (HttpStatus.SUCCESS == edit.getCode()){
-            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);
-    }
-
-    /**
-     * 新增巡查计划
-     */
-    @PostMapping("/comprehensivepatrolplan")
-    public AjaxResult add(@RequestBody String json) {
-        return remotePatrolPlanService.insertPatrolPlan(json);
-    }
-    /**
-     * 修改巡查计划
-     */
-    @PostMapping("/comprehensivepatrolplan/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remotePatrolPlanService.updatePatrolPlan(json);
-    }
-
-    /**
-     * 删除巡查计划
-     */
-    @GetMapping("/comprehensivepatrolplan/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remotePatrolPlanService.deletePatrolPlanByIds(id.toArray(new String[0]));
-    }
-
-    /**
-     * 查询计划下拉选
-     */
-    @GetMapping("/comprehensivepatrolplan/getPatrolPlanAll")
-    public AjaxResult getPatrolPlanAll(String type) {
-        AjaxResult ajaxResult = remotePatrolPlanService.getPatrolPlanAll(type);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            List<Map<String,Object>>  data = (List<Map<String, Object>>) ajaxResult.get("data");
-            Map<String,Object> forestLinLevel = DictUtils.getDictCacheToMap(DictKeys.FOREST_LIN_LEVEL);
-            Map<String,Object> centerdataplanningCycle = DictUtils.getDictCacheToMap(DictKeys.CENTERDATAPLANNING_CYCLE);
-            for (Map<String, Object> datum : data) {
-                datum.put("rankLabel", MapUtils.getString(forestLinLevel,MapUtils.getString(datum,"rank")));
-                datum.put("periodLabel", MapUtils.getString(centerdataplanningCycle,MapUtils.getString(datum,"period")));
-            }
-            return AjaxResult.success(data);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppPatrolTaskController.java

@@ -1,110 +0,0 @@
-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.comprehensivepatrol.domain.ComprehensivePatrolTask;
-import com.sooka.sponest.comprehensive.api.comprehensivepatrol.service.RemotePatrolTaskService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 巡查任务
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppPatrolTaskController")
-public class AppPatrolTaskController extends BaseController {
-
-    @Resource
-    RemotePatrolTaskService remotePatrolTaskService;
-
-    /**
-     * 查询巡查任务列表
-     */
-    @GetMapping("/comprehensivepatroltask/list")
-    public AjaxResult list(ComprehensivePatrolTask comprehensivepatroltask) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remotePatrolTaskService.selectPatrolTaskList(pageNum, pageSize,comprehensivepatroltask.getType(),comprehensivepatroltask.getPlanName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String, Object> waterTaskStatus = DictUtils.getDictCacheToMap(DictKeys.WATER_TASK_STATUS);
-            for (Map<String, Object> row : rows) {
-                row.put("statusLabel", MapUtils.getString(waterTaskStatus,MapUtils.getString(row,"status")));
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取巡查任务详细信息
-     */
-    @GetMapping("/comprehensivepatroltask/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensivePatrolTask> edit = remotePatrolTaskService.selectPatrolTaskById(id);
-        ComprehensivePatrolTask data = edit.getData();
-        if(HttpStatus.SUCCESS == edit.getCode()){
-            data.setStatusLabel(DictUtils.getDictDataByValue(DictKeys.WATER_TASK_STATUS,data.getStatus()));
-            return AjaxResult.success(data);
-        }else {
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-    }
-
-    /**
-     * 新增巡查任务
-     */
-    @PostMapping("/comprehensivepatroltask")
-    public AjaxResult add(@RequestBody String json) {
-        return remotePatrolTaskService.insertPatrolTask(json);
-    }
-    /**
-     * 修改巡查任务
-     */
-    @PostMapping("/comprehensivepatroltask/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remotePatrolTaskService.updatePatrolTask(json);
-    }
-
-    /**
-     * 删除巡查任务
-     */
-    @GetMapping("/comprehensivepatroltask/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remotePatrolTaskService.deletePatrolTaskByIds(id.toArray(new String[0]));
-    }
-
-    /**
-     * 查询巡查任务列表无分页
-     */
-    @GetMapping("/comprehensivepatroltask/getPatrolTaskAll")
-    public AjaxResult getPatrolTaskAll(String type) {
-        AjaxResult ajaxResult = remotePatrolTaskService.getPatrolTaskAll(type);;
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-           List<Map<String,Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
-            Map<String, Object> waterTaskStatus = DictUtils.getDictCacheToMap(DictKeys.WATER_TASK_STATUS);
-            for (Map<String, Object> datum : data) {
-                datum.put("statusLabel", MapUtils.getString(waterTaskStatus,MapUtils.getString(datum,"status")));
-            }
-            return AjaxResult.success(data);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-    }
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppPatrolTrackController.java

@@ -1,83 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.sooka.sponest.comprehensive.api.comprehensivepatrol.domain.ComprehensivePatrolPlanRecord;
-import com.sooka.sponest.comprehensive.api.comprehensivepatrol.service.RemotePatrolTrackService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 巡查轨迹
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppPatrolTrackController")
-public class AppPatrolTrackController extends BaseController {
-
-    @Resource
-    RemotePatrolTrackService remotePatrolTrackService;
-
-    /**
-     * 查询巡查轨迹列表
-     */
-    @GetMapping("/comprehensivepatrolplanrecord/list")
-    public AjaxResult list(ComprehensivePatrolPlanRecord comprehensivepatrolplanrecord) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remotePatrolTrackService.selectPatrolPlanRecordList(pageNum, pageSize,comprehensivepatrolplanrecord.getType(),comprehensivepatrolplanrecord.getNickName(),comprehensivepatrolplanrecord.getTaskName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取巡查轨迹详细信息
-     */
-    @GetMapping("/comprehensivepatrolplanrecord/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensivePatrolPlanRecord> edit = remotePatrolTrackService.selectPatrolPlanRecordById(id);
-        ComprehensivePatrolPlanRecord data = edit.getData();
-        if(HttpStatus.SUCCESS == edit.getCode()){
-            return AjaxResult.success(data);
-        }else {
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-    }
-
-    /**
-     * 新增巡查轨迹
-     */
-    @PostMapping("/comprehensivepatrolplanrecord")
-    public AjaxResult add(@RequestBody String json) {
-        return remotePatrolTrackService.insertPatrolPlanRecord(json);
-    }
-    /**
-     * 修改巡查轨迹
-     */
-    @PostMapping("/comprehensivepatrolplanrecord/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remotePatrolTrackService.updatePatrolPlanRecord(json);
-    }
-
-    /**
-     * 删除巡查轨迹
-     */
-    @GetMapping("/comprehensivepatrolplanrecord/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remotePatrolTrackService.deletePatrolPlanRecordByIds(id.toArray(new String[0]));
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppPublicSafetyMonitoringController.java

@@ -1,81 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensivePublicSafetyMonitoring;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemotePublicSafetyMonitoringService;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteVideoNetworkingService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 城乡社区公共安全视频监控
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppPublicSafetyMonitoringController")
-public class AppPublicSafetyMonitoringController extends BaseController {
-
-    @Resource
-    RemotePublicSafetyMonitoringService remotePublicSafetyMonitoringService;
-
-    /**
-     * 查询城乡社区公共安全视频监控列表
-     */
-    @GetMapping("/publicSafetyMonitoring/list")
-    public AjaxResult list(ComprehensivePublicSafetyMonitoring publicSafetyMonitoring) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remotePublicSafetyMonitoringService.selectComprehensivePublicSafetyMonitoringList(pageNum, pageSize,publicSafetyMonitoring.getCommunityName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取城乡社区公共安全视频监控详细信息
-     */
-    @GetMapping("/publicSafetyMonitoring/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensivePublicSafetyMonitoring> edit = remotePublicSafetyMonitoringService.selectComprehensivePublicSafetyMonitoringById(id);
-        ComprehensivePublicSafetyMonitoring data = edit.getData();
-
-        return AjaxResult.success(data);
-    }
-
-    /**
-     * 新增城乡社区公共安全视频监控
-     */
-    @PostMapping("/publicSafetyMonitoring")
-    public AjaxResult add(@RequestBody String json) {
-        return remotePublicSafetyMonitoringService.insertComprehensivePublicSafetyMonitoring(json);
-    }
-    /**
-     * 修改城乡社区公共安全视频监控
-     */
-    @PostMapping("/publicSafetyMonitoring/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remotePublicSafetyMonitoringService.updateComprehensivePublicSafetyMonitoring(json);
-    }
-
-    /**
-     * 删除城乡社区公共安全视频监控
-     */
-    @GetMapping("/publicSafetyMonitoring/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remotePublicSafetyMonitoringService.deleteComprehensivePublicSafetyMonitoringByIds(id.toArray(new String[0]));
-    }
-
-}

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

@@ -1,175 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
-
-import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.StringUtils;
-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.comprehensiveOrganizationAndInstitution.service.RemoteRoomService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.ruoyi.common.core.domain.DictKeys.*;
-
-/**
- * 房间管理
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppRoomController")
-public class AppRoomController extends BaseController {
-
-    @Resource
-    RemoteRoomService remoteRoomService;
-
-    /**
-     * 查询房间管理列表
-     */
-    @GetMapping("/comprehensiveroom/list")
-    public AjaxResult list(ComprehensiveRoom comprehensiveroom) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        AjaxResult tableDataInfo = remoteRoomService.selectComprehensiveRoomList(
-                pageDomain.getPageNum(),
-                pageDomain.getPageSize(),
-                comprehensiveroom.getName(),
-                comprehensiveroom.getEstateId(),
-                comprehensiveroom.getTotal()
-        );
-        if (HttpStatus.SUCCESS == Integer.parseInt(tableDataInfo.get("code").toString())) {
-            List<ComprehensiveRoom> rows = (List<ComprehensiveRoom>) tableDataInfo.get("data");
-            String[] dictArray = new String[]{RFH_FJ_GLFS, RFH_FJ_WYH, RFH_FJ_FJXZ, RFH_FJ_SHLX};
-            Map<String, Map<String, Object>> dictMaps = DictUtils.getDictCacheToMapByArray(dictArray);
-            String s = JSON.toJSONString(rows);
-            rows = JSON.parseArray(s, ComprehensiveRoom.class);
-            if (StringUtils.isNotEmpty(rows)) {
-                for (ComprehensiveRoom data : rows) {
-                    setDictValue(data, dictMaps);
-                }
-            }
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(tableDataInfo.get("code").toString(), tableDataInfo.get("msg"));
-        }
-    }
-
-    /**
-     * 获取房间管理详细信息
-     */
-    @GetMapping("/comprehensiveroom/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveRoom> edit = remoteRoomService.selectComprehensiveRoomById(id);
-        ComprehensiveRoom data = edit.getData();
-        if (HttpStatus.SUCCESS == edit.getCode()) {
-            data.setIsEdit(true);
-        } else if (HttpStatus.ERROR == edit.getCode() && null != edit.getData()) {
-            data.setIsEdit(false);
-        } else {
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-        setDictValue(data, null);
-        return AjaxResult.success(data);
-    }
-
-    private void setDictValue(ComprehensiveRoom data, Map<String, Map<String, Object>> dictMaps) {
-        if (StringUtils.isEmpty(dictMaps)) {
-            String[] dictArray = new String[]{RFH_FJ_GLFS, RFH_FJ_WYH, RFH_FJ_FJXZ, RFH_FJ_SHLX};
-            dictMaps = DictUtils.getDictCacheToMapByArray(dictArray);
-        }
-        data.setRoomSfpfLabel("1".equals(data.getRoomSfpf()) ? "是" : "否");
-        data.setRoomSfydxsLabel("1".equals(data.getRoomSfydxs()) ? "是" : "否");
-        data.setRoomSfzrLabel("1".equals(data.getRoomSfzr()) ? "是" : "否");
-        data.setRoomSffwLabel("1".equals(data.getRoomSffw()) ? "是" : "否");
-        data.setRoomWfjzLabel("1".equals(data.getRoomWfjz()) ? "是" : "否");
-        data.setRoomSfcwLabel("1".equals(data.getRoomSfcw()) ? "是" : "否");
-        data.setRoomSfgzLabel("1".equals(data.getRoomSfgz()) ? "是" : "否");
-        data.setRoomSfmsfLabel("1".equals(data.getRoomSfmsf()) ? "是" : "否");
-        data.setRoomSfgkpyLabel("1".equals(data.getRoomSfgkpy()) ? "是" : "否");
-        data.setRoomSfjhqLabel("1".equals(data.getRoomSfjhq()) ? "是" : "否");
-        data.setRoomSfslzLabel("1".equals(data.getRoomSfslz()) ? "是" : "否");
-        data.setRoomGlfsLabel(MapUtils.getString((Map<String, Object>) MapUtils.getMap(dictMaps, RFH_FJ_GLFS), data.getRoomGlfs()));
-        data.setRoomWyhLabel(MapUtils.getString((Map<String, Object>) MapUtils.getMap(dictMaps, RFH_FJ_WYH), data.getRoomWyh()));
-        data.setRoomTypeLabel(MapUtils.getString((Map<String, Object>) MapUtils.getMap(dictMaps, RFH_FJ_FJXZ), data.getRoomType()));
-        data.setRoomShlxLabel(MapUtils.getString((Map<String, Object>) MapUtils.getMap(dictMaps, RFH_FJ_SHLX), data.getRoomShlx()));
-    }
-
-    /**
-     * 新增房间管理
-     */
-    @PostMapping("/comprehensiveroom")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteRoomService.insertComprehensiveRoom(json);
-    }
-
-    /**
-     * 修改房间管理
-     */
-    @PostMapping("/comprehensiveroom/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteRoomService.updateComprehensiveRoom(json);
-    }
-
-    /**
-     * 删除房间管理
-     */
-    @GetMapping("/comprehensiveroom/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteRoomService.deleteComprehensiveRoomByIds(id.toArray(new String[0]));
-    }
-
-    /**
-     * 楼栋的单元数
-     *
-     * @param num
-     * @return
-     */
-    @GetMapping("/comprehensiveroom/getunitList")
-    public AjaxResult getunitList(@RequestParam("num") String num) {
-        return remoteRoomService.getunitList(num);
-    }
-
-    /**
-     * 房间id
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/comprehensiveroom/getAllUserInfo")
-    public AjaxResult getAllUserInfo(@RequestParam("id") String id) {
-        return remoteRoomService.getAllUserInfo(id);
-    }
-
-    /**
-     * 新增房间绑定人员
-     */
-    @PostMapping("/comprehensiveroom/addRoomBindPerson")
-    public AjaxResult addRoomBindPerson(@RequestBody String json) {
-        return remoteRoomService.addRoomBindPerson(json);
-    }
-
-    /**
-     * 查询出租屋列表
-     *
-     * @param
-     * @return
-     */
-    @GetMapping("/comprehensiveroom/getLet")
-    public AjaxResult getLet() {
-        return remoteRoomService.selectComprehensiveLet();
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppTeamController.java

@@ -1,110 +0,0 @@
-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.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.ComprehensiveTeam;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteTeamService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 综治队伍
- *
- * @author hanfucheng
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppTeamController")
-public class AppTeamController extends BaseController {
-
-    @Resource
-    RemoteTeamService remoteTeamService;
-
-    /**
-     * 查询综治机构列表
-     */
-    @GetMapping("/comprehensiveTeam/list")
-    public AjaxResult list(ComprehensiveTeam comprehensiveTeam) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteTeamService.selectComprehensiveTeamList(pageNum, pageSize,comprehensiveTeam.getName(),comprehensiveTeam.getInstitutionId(),comprehensiveTeam.getIdentityNumber() );
-        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) tableDataInfo.getRows();
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            Map<String, Object> comprehensiveGenderLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
-            Map<String, Object> comprehensiveNationLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);
-            Map<String, Object> comprehensivePoliticalOutlookLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);
-            Map<String, Object> comprehensiveLevelLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_PERSONNEL_LEVEL);
-            Map<String, Object> comprehensiveDutiesLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_PERSONNEL_JOB);
-            Map<String, Object> comprehensiveEducationLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
-            for (HashMap<String, Object> row:
-                    rows ) {
-                row.put("genderLabel",comprehensiveGenderLabel.get(row.get("gender").toString()));
-                row.put("nationLabel",comprehensiveNationLabel.get(row.get("nation").toString()));
-                row.put("politicalOutlookLabel",comprehensivePoliticalOutlookLabel.get(row.get("politicalOutlook").toString()));
-                row.put("levelLabel",comprehensiveLevelLabel.get(row.get("level").toString()));
-                row.put("dutiesLabel",comprehensiveDutiesLabel.get(row.get("duties").toString()));
-                row.put("educationLabel",comprehensiveEducationLabel.get(row.get("education").toString()));
-
-            }
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取综治机构详细信息
-     */
-    @GetMapping("/comprehensiveTeam/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteTeamService.selectComprehensiveTeamById(id);
-        if("200".equals(String.valueOf(ajaxResult.get("code")))){
-            HashMap<String,Object> comprehensiveTeam = (HashMap<String, Object>) ajaxResult.get("data");
-            comprehensiveTeam.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, MapUtils.getString(comprehensiveTeam,"gender")));
-            comprehensiveTeam.put("nationLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, MapUtils.getString(comprehensiveTeam,"nation")));
-            comprehensiveTeam.put("politicalOutlookLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS, MapUtils.getString(comprehensiveTeam,"politicalOutlook")));
-            comprehensiveTeam.put("levelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_PERSONNEL_LEVEL, MapUtils.getString(comprehensiveTeam,"level")));
-            comprehensiveTeam.put("dutiesLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_PERSONNEL_JOB,MapUtils.getString(comprehensiveTeam,"duties")));
-            comprehensiveTeam.put("educationLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND,MapUtils.getString(comprehensiveTeam,"education")));
-            return AjaxResult.success(comprehensiveTeam);
-        }else{
-            return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));
-        }
-    }
-
-    /**
-     * 新增综治机构
-     */
-    @PostMapping("/comprehensiveTeam")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteTeamService.insertComprehensiveTeam(json);
-    }
-    /**
-     * 修改综治机构
-     */
-    @PostMapping("/comprehensiveTeam/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteTeamService.updateComprehensiveTeam(json);
-    }
-
-    /**
-     * 删除综治机构
-     */
-    @GetMapping("/comprehensiveTeam/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteTeamService.deleteComprehensiveTeamByIds(id.toArray(new String[0]));
-    }
-
-}

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

@@ -1,87 +0,0 @@
-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.ComprehensiveVideoNetworking;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteVideoNetworkingService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 综治视联网信息中心
- *
- * @author lidongyu
- * @date 2023/9/14 10:16
- */
-@RestController
-@RequestMapping("/AppVideoNetworkingController")
-public class AppVideoNetworkingController extends BaseController {
-
-    @Resource
-    RemoteVideoNetworkingService remoteVideoNetworkingService;
-
-    /**
-     * 查询综治视联网信息中心列表
-     */
-    @GetMapping("/videoNetworking/list")
-    public AjaxResult list(ComprehensiveVideoNetworking videoNetworking) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteVideoNetworkingService.selectComprehensiveVideoNetworkingList(pageNum, pageSize,videoNetworking.getCenterName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-    /**
-     * 获取综治视联网信息中心详细信息
-     */
-    @GetMapping("/videoNetworking/edit")
-    public AjaxResult getInfo(String id) {
-        R<ComprehensiveVideoNetworking> edit = remoteVideoNetworkingService.selectComprehensiveVideoNetworkingById(id);
-        if(HttpStatus.SUCCESS == edit.getCode()){
-            ComprehensiveVideoNetworking data = edit.getData();
-            data.setLevelLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVELS,data.getLevel()));
-            data.setMannedLabel("1".equals(data.getManned()) ? "是" : "否");
-            return AjaxResult.success(data);
-        }else{
-            return AjaxResult.error(edit.getCode(), edit.getMsg());
-        }
-    }
-
-    /**
-     * 新增综治视联网信息中心
-     */
-    @PostMapping("/videoNetworking")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteVideoNetworkingService.insertComprehensiveVideoNetworking(json);
-    }
-    /**
-     * 修改综治视联网信息中心
-     */
-    @PostMapping("/videoNetworking/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteVideoNetworkingService.updateComprehensiveVideoNetworking(json);
-    }
-
-    /**
-     * 删除综治视联网信息中心
-     */
-    @GetMapping("/videoNetworking/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteVideoNetworkingService.deleteComprehensiveVideoNetworkingByIds(id.toArray(new String[0]));
-    }
-
-}

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

@@ -1,511 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.personBasicInfoController;
-
-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.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableSupport;
-import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.comprehensive.api.comprehensivePersonBasicInfo.domain.*;
-import com.sooka.sponest.comprehensive.api.comprehensivePersonBasicInfo.service.RemotePersonBasicInfoService;
-import com.sooka.sponest.data.api.digitalenvironment.domain.EnvironmentBiggas;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static com.ruoyi.common.core.domain.DictKeys.*;
-import static com.ruoyi.common.security.utils.DictUtils.getComprehensiveDictCacheToMap;
-
-/**
- * @Author LG
- * @Date 2023/9/8 - 9:38
- */
-@RestController
-@RequestMapping("/AppPersonBasicInfoController")
-public class AppPersonBasicInfoController {
-    @Resource
-    private RemotePersonBasicInfoService personBasicInfoService;
-
-    /**
-     * 查询人员信息列表
-     */
-    @GetMapping("/PersonBasicInfo/list")
-    public AjaxResult list(PersonBasicInfo info) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        //noinspection unchecked
-        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) personBasicInfoService.getList(
-                info.getName(),
-                pageDomain.getPageNum(),
-                pageDomain.getPageSize(),
-                info.getDelFlag(),
-                info.getTotal()
-        ).get("data");
-        if (StringUtils.isNotEmpty(rows)) {
-            setDictValue(rows);
-        }
-        return AjaxResult.success(rows);
-    }
-
-
-    /**
-     * 查询人员信息详情
-     */
-    @GetMapping("/PersonBasicInfo/edit")
-    public AjaxResult getInfo(EnvironmentBiggas biggas) {
-        AjaxResult ajaxResult = personBasicInfoService.getEdit(biggas.getId());
-        if ("200".equals(ajaxResult.get("code").toString())) {
-            Map<String, Object> data = (Map<String, Object>) ajaxResult.get("data");
-            HashMap<String, Object> basicInfo = (HashMap<String, Object>) data.get("basicInfo");
-            setPersonBasicInfo(basicInfo, null, null);
-            List<HashMap<String, Object>> userBinds = (List<HashMap<String, Object>>) basicInfo.get("userBinds");
-            ArrayList<HashMap<String, Object>> otherInfo = (ArrayList<HashMap<String, Object>>) data.get("otherInfo");
-            Map<String, Object> result = new HashMap<>();
-            result.put("basicInfo", data.get("basicInfo"));
-            userBinds.forEach(bind -> {
-                otherInfo.stream()
-                        .filter(info -> info.get("id").equals(bind.get("otherPersonId")))
-                        .findFirst()
-                        .ifPresent(info -> setLabel(info, (Integer) bind.get("otherPersonType")));
-            });
-            otherInfo.forEach(bind -> {
-                switch (String.valueOf(bind.get("otherPersonType"))) {
-                    case "1":
-                        setRegisteredPopulation(bind);
-                        RegisteredPopulationInfo registeredPopulationInfo = JSONObject.toJavaObject(new JSONObject(bind), RegisteredPopulationInfo.class);
-                        result.put("registeredPopulation", registeredPopulationInfo);
-                        break;
-                    case "2":
-                        setFloatingPopulation(bind);
-                        FloatingPopulationInfo floatingPopulationInfo = JSONObject.toJavaObject(new JSONObject(bind), FloatingPopulationInfo.class);
-                        result.put("floatingPopulation", floatingPopulationInfo);
-                        break;
-                    case "3":
-                        setLeftBehindPerson(bind);
-                        LeftBehindPersonInfo leftBehindPersonInfo = JSONObject.toJavaObject(new JSONObject(bind), LeftBehindPersonInfo.class);
-                        result.put("leftBehindPerson", leftBehindPersonInfo);
-                        break;
-                    case "4":
-                        setCampusAroundPerson(bind);
-                        CampusAroundPersonInfo campusAroundPersonInfo = JSONObject.toJavaObject(new JSONObject(bind), CampusAroundPersonInfo.class);
-                        result.put("campusAroundPerson", campusAroundPersonInfo);
-                        break;
-                    case "5":
-                        setPrisonReleased(bind);
-                        PrisonReleasedInfo prisonReleasedInfo = JSONObject.toJavaObject(new JSONObject(bind), PrisonReleasedInfo.class);
-                        result.put("prisonReleased", prisonReleasedInfo);
-                        break;
-                    case "6":
-                        setCommunityCorrectionStaff(bind);
-                        CommunityCorrectionStaffInfo communityCorrectionStaffInfo = JSONObject.toJavaObject(new JSONObject(bind), CommunityCorrectionStaffInfo.class);
-                        result.put("communityCorrectionStaff", communityCorrectionStaffInfo);
-                        break;
-                    case "7":
-                        setPsychosisPopulation(bind);
-                        PsychosisPopulationInfo psychosisPopulationInfo = JSONObject.toJavaObject(new JSONObject(bind), PsychosisPopulationInfo.class);
-                        result.put("psychosisPopulation", psychosisPopulationInfo);
-                        break;
-                    case "8":
-                        setDrugAddict(bind);
-                        DrugAddictInfo drugAddictInfo = JSONObject.toJavaObject(new JSONObject(bind), DrugAddictInfo.class);
-                        result.put("drugAddict", drugAddictInfo);
-                        break;
-                    case "9":
-                        setAidsRisk(bind);
-                        AidsRiskInfo aidsRiskInfo = JSONObject.toJavaObject(new JSONObject(bind), AidsRiskInfo.class);
-                        result.put("aidsRisk", aidsRiskInfo);
-                        break;
-                    case "10":
-                        setKeyYouth(bind);
-                        KeyYouthInfo keyYouthInfo = JSONObject.toJavaObject(new JSONObject(bind), KeyYouthInfo.class);
-                        result.put("keyYouth", keyYouthInfo);
-                        break;
-                }
-            });
-            return AjaxResult.success(result);
-        } else {
-            return ajaxResult;
-        }
-    }
-
-    /**
-     * 根据给定的人员类型，设置字典中文值
-     */
-    private void setLabel(HashMap<String, Object> json, Integer type) {
-        switch (type) {
-            case 1:
-                setRegisteredPopulation(json);
-                break;
-            case 2:
-                setFloatingPopulation(json);
-                break;
-            case 3:
-                setLeftBehindPerson(json);
-                break;
-            case 4:
-                setCampusAroundPerson(json);
-                break;
-            case 5:
-                setPrisonReleased(json);
-                break;
-            case 6:
-                setCommunityCorrectionStaff(json);
-                break;
-            case 7:
-                setPsychosisPopulation(json);
-                break;
-            case 8:
-                setDrugAddict(json);
-                break;
-            case 9:
-                setAidsRisk(json);
-                break;
-            case 10:
-                setKeyYouth(json);
-                break;
-        }
-        json.put("otherPersonType", type);
-    }
-
-    /**
-     * 新增人员信息
-     */
-    @PostMapping("/PersonBasicInfo")
-    public AjaxResult add(@RequestBody String json) {
-        return personBasicInfoService.add(dataToList(json));
-    }
-
-    /**
-     * 修改人员信息
-     */
-    @PostMapping("/PersonBasicInfo/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return personBasicInfoService.edit(dataToList(json));
-    }
-
-
-    /**
-     * 数据格式转换，将JSONString类型替换为List
-     */
-    private String dataToList(String json) {
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        Set<String> strings = jsonObject.keySet();
-        JSONArray list = new JSONArray();
-        list.add(jsonObject.getJSONObject("basicInfo"));
-        strings.remove("basicInfo");
-        for (String string : strings) {
-            list.add(jsonObject.getJSONObject(string));
-        }
-        return JSONArray.toJSONString(list);
-    }
-
-    /**
-     * 删除人员信息
-     */
-    @GetMapping("/PersonBasicInfo/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return personBasicInfoService.del(id.toArray(new String[0]));
-    }
-
-    /**
-     * 审核删除人员信息
-     * state = 2 通过，  state = 1 拒绝
-     */
-    @GetMapping("/PersonBasicInfo/delInfo")
-    public AjaxResult delInfo(@RequestParam("id") String id, @RequestParam("state") String state) {
-        return personBasicInfoService.delInfo(id, state);
-    }
-
-    /**
-     * 设置人员基础信息字典值
-     */
-    private void setPersonBasicInfo(HashMap<String, Object> basicInfo, Map<String, Map<String, Object>> dictMaps, Map<String, Object> cityMaps) {//0
-        if(StringUtils.isEmpty(dictMaps)){
-            String[] dictKeys = {
-                    COMPREHENSIVE_SEX, //性别
-                    COMPREHENSIVE_NATION, //民族
-                    COMPREHENSIVE_MARITAL_STATUS, //婚姻状况
-                    COMPREHENSIVE_EDUCATIONAL_BACKGROUND, //学历
-                    COMPREHENSIVE_RELIGIOUS_BELIEF, //宗教信仰
-                    COMPREHENSIVE_POLITICAL_STATUS, //政治面貌
-                    COMPREHENSIVE_OCCUPATIONAL_CATEGORY //职业类别
-            };
-            dictMaps = DictUtils.getDictCacheToMapByArray(dictKeys);
-        }
-        if(StringUtils.isEmpty(cityMaps)){
-            cityMaps = getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
-        }
-        basicInfo.put("genderLabel", MapUtils.getMap(dictMaps, COMPREHENSIVE_SEX).get(mapUtilsGetString(basicInfo, "gender")));//性别字典值
-        basicInfo.put("nationLabel", MapUtils.getMap(dictMaps, COMPREHENSIVE_NATION).get(mapUtilsGetString(basicInfo, "nation")));//民族字典值
-        basicInfo.put("maritalStatusLabel", MapUtils.getMap(dictMaps, COMPREHENSIVE_MARITAL_STATUS).get(mapUtilsGetString(basicInfo, "maritalStatus")));//婚姻状况字典值
-        basicInfo.put("educationLabel", MapUtils.getMap(dictMaps, COMPREHENSIVE_EDUCATIONAL_BACKGROUND).get(mapUtilsGetString(basicInfo, "education")));//学历字典值
-        basicInfo.put("religiousBeliefLabel", null == MapUtils.getString(basicInfo, "religiousBelief") ? null : MapUtils.getMap(dictMaps, COMPREHENSIVE_RELIGIOUS_BELIEF).get(MapUtils.getString(basicInfo, "religiousBelief")));//宗教信仰字典值
-        basicInfo.put("politicalOutlookLabel", MapUtils.getMap(dictMaps, COMPREHENSIVE_POLITICAL_STATUS).get(mapUtilsGetString(basicInfo, "politicalOutlook")));//政治面貌字典值
-        basicInfo.put("occupationalCategoryLabel", MapUtils.getMap(dictMaps, COMPREHENSIVE_OCCUPATIONAL_CATEGORY).get(mapUtilsGetString(basicInfo, "occupationalCategory")));//职业类别字典值
-        basicInfo.put("householdRegistrationLabel", cityMaps.get(mapUtilsGetString(basicInfo, "householdRegistration")));//户籍地 2260
-        basicInfo.put("nativePlaceLabel", cityMaps.get(mapUtilsGetString(basicInfo, "nativePlace")));//籍贯 2260
-        basicInfo.put("currentResidencePlaceLabel", cityMaps.get(mapUtilsGetString(basicInfo,"currentResidencePlace")));
-        basicInfo.put("isResidentLabel", "1".equals(MapUtils.getString(basicInfo, "isResident"))? "是":"否");
-    }
-
-    private void setDictValue(List<HashMap<String, Object>> rows){
-        String[] dictKeys = {
-                COMPREHENSIVE_SEX, //性别
-                COMPREHENSIVE_NATION, //民族
-                COMPREHENSIVE_MARITAL_STATUS, //婚姻状况
-                COMPREHENSIVE_EDUCATIONAL_BACKGROUND, //学历
-                COMPREHENSIVE_RELIGIOUS_BELIEF, //宗教信仰
-                COMPREHENSIVE_POLITICAL_STATUS, //政治面貌
-                COMPREHENSIVE_OCCUPATIONAL_CATEGORY //职业类别
-        };
-        Map<String, Map<String, Object>> dictMaps = DictUtils.getDictCacheToMapByArray(dictKeys);
-        Map<String, Object> cityMaps = getComprehensiveDictCacheToMap(COMPREHENSIVE_CITY_CODE);// 2260
-        if (null != rows && !rows.isEmpty()) {
-            for (HashMap<String, Object> row : rows) {
-                setPersonBasicInfo(row, dictMaps, cityMaps);
-            }
-        }
-    }
-
-    /**
-     * 设置户籍人口字典值
-     */
-    private void setRegisteredPopulation(HashMap<String, Object> json) {//1
-        json.put("entryIdentityLabel", getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_IDENTIFICATION, String.valueOf(json.get("entryIdentity"))));//人户一致标识
-        json.put("accountRelationshipLabel", getDictData(DictKeys.COMPREHENSIVE_RELATION, String.valueOf(json.get("accountRelationship"))));//与户主关系
-    }
-
-    /**
-     * 设置流动人口字典值
-     */
-    private void setFloatingPopulation(HashMap<String, Object> json) {//2
-        json.put("inflowCauseLabel", getDictData(DictKeys.COMPREHENSIVE_INFLOW_REASON, String.valueOf(json.get("inflowCause"))));//流入原因
-        json.put("focusPeopleLabel", "1".equals(json.get("focusPeople")) ? "是" : "否");//是否重点关注人员
-        json.put("certificationTypeLabel", null == json.get("certificationType") ? null : getDictData(DictKeys.COMPREHENSIVE_CERTIFICATION_TYPE, String.valueOf(json.get("certificationType"))));//办证类型
-        json.put("domicileTypeLabel", getDictData(DictKeys.COMPREHENSIVE_RESIDENCE_TYPE, String.valueOf(json.get("domicileType"))));//住所类型
-    }
-
-    /**
-     * 设置留守人口字典值
-     */
-    private void setLeftBehindPerson(HashMap<String, Object> json) {//3
-        json.put("entryIdentityLabel", getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_IDENTIFICATION, String.valueOf(json.get("entryIdentity"))));//人户一致标识
-        json.put("leftBehindTypeLabel", getDictData(DictKeys.COMPREHENSIVE_LEFT_BEHIND_PERSONNEL_TYPE, String.valueOf(json.get("leftBehindType"))));//留守人员类型
-        json.put("healthStatusLabel", null == json.get("healthStatus") ? null : getDictData(DictKeys.COMPREHENSIVE_HEALTH_STATUS, String.valueOf(json.get("healthStatus"))));//健康状况
-        json.put("leftBehindRelationshipLabel", getDictData(DictKeys.COMPREHENSIVE_RELATION, String.valueOf(json.get("leftBehindRelationship"))));//与留守人员关系
-        json.put("keyFamilyHealthStatusLabel", null == json.get("keyFamilyHealthStatus") ? null : getDictData(DictKeys.COMPREHENSIVE_HEALTH_STATUS, String.valueOf(json.get("keyFamilyHealthStatus"))));//家庭主要成员健康状况
-    }
-
-    /**
-     * 设置校园周边重点人员字典值
-     */
-    private void setCampusAroundPerson(HashMap<String, Object> json) {//4
-        json.put("harmLevelLabel", getDictData(DictKeys.COMPREHENSIVE_DEGREE_OF_HARM, String.valueOf(json.get("harmLevel"))));//危害程度
-        json.put("focusPeopleLabel", "1".equals(json.get("focusPeople")) ? "是" : "否");//是否关注
-    }
-
-    /**
-     * 设置刑满释放人员字典值
-     */
-    private void setPrisonReleased(HashMap<String, Object> json) {//5
-        json.put("originalChargeLabel", getDictData(DictKeys.COMPREHENSIVE_OFFENCES_CLASSIFICATION, String.valueOf(json.get("originalCharge"))));//原罪名
-        json.put("recidivismLabel", "1".equals(json.get("recidivism")) ? "是" : "否");//是否累犯
-        json.put("riskAssessmentTypeLabel", getDictData(DictKeys.COMPREHENSIVE_HAZARD_ASSESSMENT_TYPE, String.valueOf(json.get("riskAssessmentType"))));//危险性评估类型
-        json.put("linkUpStatusLabel", getDictData(DictKeys.COMPREHENSIVE_CONNECTION, String.valueOf(json.get("linkUpStatus"))));//衔接情况
-        json.put("placementStatusLabel", getDictData(DictKeys.COMPREHENSIVE_PLACEMENT, String.valueOf(json.get("placementStatus"))));//安置情况
-        json.put("reoffendLabel", "1".equals(json.get("reoffend")) ? "是" : "否");//是否重新犯罪
-    }
-
-    /**
-     * 设置社区矫正人员字典值
-     */
-    private void setCommunityCorrectionStaff(HashMap<String, Object> json) {//6
-        json.put("caseCategoryLabel", getDictData(DictKeys.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("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")) ? "是" : "否");//是否累惯犯
-        json.put("establishCorrectionTeamLabel", "1".equals(json.get("establishCorrectionTeam")) ? "是" : "否");//是否建立矫正小组
-        json.put("reoffendLabel", "1".equals(json.get("reoffend")) ? "是" : "否");//是否重新犯罪
-        json.put("fourHistoriesListLabel", getDictDataList(DictKeys.COMPREHENSIVE_FOUR_HISTORIES_SITUATION, (List<String>) json.get("fourHistoriesList")));//“四史”情况
-        json.put("threeStepListLabel", getDictDataList(DictKeys.COMPREHENSIVE_THREE_INVOLVED_SITUATION, (List<String>) json.get("threeStepList")));//“三涉”情况
-        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("familyEconomicSituation") ? null : getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_FINANCIAL_SITUATION, String.valueOf(json.get("familyEconomicSituation"))));//家庭经济状况
-        json.put("subsistenceAllowanceLabel", "1".equals(json.get("subsistenceAllowance")) ? "是" : "否");//是否纳入低保
-        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(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(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(DictKeys.COMPREHENSIVE_CASE_REASON, String.valueOf(json.get("drugUse"))));//吸毒原因
-        json.put("drugAbuseLabel", null == json.get("drugAbuse") ? null : getDictData(DictKeys.COMPREHENSIVE_CASE_CONSEQUENCE, String.valueOf(json.get("drugAbuse"))));//吸毒后果
-    }
-
-    /**
-     * 设置艾滋病危险人员字典值
-     */
-    private void setAidsRisk(HashMap<String, Object> json) {//9
-        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(DictKeys.COMPREHENSIVE_CASE_CATEGORY, String.valueOf(json.get("caseCategory"))));//案件类别
-        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, mapUtilsGetString(json,"personType")));//人员类型
-        json.put("familySituationLabel", getDictData(COMPREHENSIVE_FAMILY_INERTIA, mapUtilsGetString(json,"familySituation")));//家庭情况
-        json.put("guardianRelationLabel", getDictData(COMPREHENSIVE_RELATION, mapUtilsGetString(json,"guardianRelation")));//与监护人关系
-        json.put("reoffendLabel", "1".equals(MapUtils.getString(json,"reoffend")) ? "是" : "否");//是否违法犯罪
-        json.put("meansAssistanceLabel", getDictData(COMPREHENSIVE_MEANS_OF_HELP, mapUtilsGetString(json,"meansAssistance")));//帮扶手段
-    }
-
-    private String getDictData(String dictKey, String value) {
-        return DictUtils.getDictDataByValue(dictKey, value);
-    }
-
-    private List<String> getDictDataList(String dictKey, List<String> values) {
-        return DictUtils.getDictDataListByValue(dictKey, values);
-    }
-
-    private String mapUtilsGetString(Map<String, Object> map, String key) {
-        return MapUtils.getString(map,key);
-    }
-
-    /**
-     * 查询其他人员类型列表
-     */
-    @GetMapping("/PersonBasicInfo/getOtherList")
-    public AjaxResult getOtherList(PersonBasicInfo personBasicInfo) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        //noinspection unchecked
-        List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) personBasicInfoService.getOtherList(
-                pageDomain.getPageNum(),
-                pageDomain.getPageSize(),
-                personBasicInfo.getDelFlag(),
-                personBasicInfo.getPersonType(),
-                personBasicInfo.getTotal()
-        ).get("data");
-        if (null != rows && !rows.isEmpty()) {
-            setDictValue(rows);
-        }
-        return AjaxResult.success(rows);
-    }
-
-    /**
-     * 查询其他类型人员详情
-     */
-    @GetMapping("/PersonBasicInfo/getOtherEdit")
-    public AjaxResult getOtherEdit(OtherPersonInfo otherPersonInfo) {
-        AjaxResult otherEdit = personBasicInfoService.getOtherEdit(otherPersonInfo.getBasicId(), otherPersonInfo.getPersonType());
-        if ("200".equals(otherEdit.get("code").toString())) {
-            Map<String, Object> comprehensiveDictCacheToMap = getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);// 2260
-            HashMap<String, HashMap<String, Object>> data = (HashMap<String, HashMap<String, Object>>) otherEdit.get("data");
-            setPersonBasicInfo(data.get("basicInfo"), null , null);
-            if (!comprehensiveDictCacheToMap.isEmpty()) {
-                data.computeIfPresent("basicInfo", (key, basicInfo) -> {
-                    basicInfo.put("householdRegistrationLabel", comprehensiveDictCacheToMap.get(basicInfo.get("householdRegistration")));// 户籍地 2260
-                    basicInfo.put("nativePlaceLabel", comprehensiveDictCacheToMap.get(basicInfo.get("nativePlace")));// 籍贯 2260
-                    return basicInfo;
-                });
-            }
-            switch (otherPersonInfo.getPersonType()) {
-                case 1:
-                    setRegisteredPopulation(data.get("otherInfo"));
-                    data.put("registeredPopulation", data.remove("otherInfo"));
-                    break;
-                case 2:
-                    setFloatingPopulation(data.get("otherInfo"));
-                    data.put("floatingPopulation", data.remove("otherInfo"));
-                    break;
-                case 3:
-                    setLeftBehindPerson(data.get("otherInfo"));
-                    data.put("leftBehindPerson", data.remove("otherInfo"));
-                    break;
-                case 4:
-                    setCampusAroundPerson(data.get("otherInfo"));
-                    data.put("campusAroundPerson", data.remove("otherInfo"));
-                    break;
-                case 5:
-                    setPrisonReleased(data.get("otherInfo"));
-                    data.put("prisonReleased", data.remove("otherInfo"));
-                    break;
-                case 6:
-                    setCommunityCorrectionStaff(data.get("otherInfo"));
-                    data.put("communityCorrectionStaff", data.remove("otherInfo"));
-                    break;
-                case 7:
-                    setPsychosisPopulation(data.get("otherInfo"));
-                    data.put("psychosisPopulation", data.remove("otherInfo"));
-                    break;
-                case 8:
-                    setDrugAddict(data.get("otherInfo"));
-                    data.put("drugAddict", data.remove("otherInfo"));
-                    break;
-                case 9:
-                    setAidsRisk(data.get("otherInfo"));
-                    data.put("aidsRisk", data.remove("otherInfo"));
-                    break;
-                case 10:
-                    setKeyYouth(data.get("otherInfo"));
-                    data.put("keyYouth", data.remove("otherInfo"));
-                    break;
-                default:
-                    break;
-            }
-            return AjaxResult.success(data);
-        } else {
-            return AjaxResult.error(otherEdit.get("code").toString(), otherEdit.get("msg"));
-        }
-    }
-
-    /**
-     * 查询全部有效的用户信息
-     */
-    @GetMapping("/PersonBasicInfo/getAllUserInfo")
-    public AjaxResult getAllUserInfo(PersonBasicInfo personBasicInfo) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        AjaxResult allUserInfo = personBasicInfoService.getAllUserInfo(personBasicInfo.getName(), pageDomain.getPageNum(), pageDomain.getPageSize());
-        if (HttpStatus.SUCCESS == Integer.valueOf(allUserInfo.get("code").toString())) {
-            Map<String, Object> comprehensiveDictCacheToMap = getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);// 2260
-            List<Map<String, Object>> data = (List<Map<String, Object>>) allUserInfo.get("data");
-            if (null != data) {
-                for (Map<String, Object> map : data) {
-                    map.put("householdRegistrationLabel", comprehensiveDictCacheToMap.get(map.get("householdRegistration")));// 户籍地 2260
-                    map.put("nativePlaceLabel", comprehensiveDictCacheToMap.get(map.get("nativePlace")));// 籍贯 2260
-                    map.put("currentResidencePlaceLabel", comprehensiveDictCacheToMap.get(map.get("currentResidencePlace")));// 2260
-                }
-            }
-            return AjaxResult.success(allUserInfo.get("rows"));
-        } else {
-            return AjaxResult.error(allUserInfo.get("code").toString(), allUserInfo.get("msg"));
-        }
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/schoolSafetyController/AppSafetyInvolvedController.java

@@ -1,108 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.schoolSafetyController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.comprehensiveSchoolSafety.domain.ComprehensiveSafetyInvolved;
-import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.service.RemoteSafetyInvolvedService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涉及师生安全的案（事）件app
- *
- * @author hanfucheng
- * @date 2023/9/18 9:39
- */
-@RestController
-@RequestMapping("/AppSafetyInvolvedController")
-public class AppSafetyInvolvedController extends BaseController {
-
-    @Resource
-    RemoteSafetyInvolvedService remoteSafetyInvolvedService;
-
-    /**
-     * 查询涉及师生安全的案（事）件列表
-     */
-    @GetMapping("/SafetyInvolved/list")
-    public AjaxResult list(ComprehensiveSafetyInvolved comprehensiveSafetyInvolved) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedList(pageNum, pageSize, comprehensiveSafetyInvolved.getCaseName());
-        if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
-            Map<String,Object> comprehensiveNatureOfTheCase = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATURE_OF_THE_CASE);
-            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
-            Map<String,Object> comprehensiveCasesGrading = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CASES_GRADING);
-            for (Map<String, Object> row : rows) {
-                row.put("occurPlaceLabel", MapUtils.getString(comprehensiveCityCode,MapUtils.getString(row,"occurPlace")));
-                row.put("caseNatureLabel",MapUtils.getString(comprehensiveNatureOfTheCase, MapUtils.getString(row,"caseNature")));
-                row.put("mainSuspectIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode, MapUtils.getString(row,"mainSuspectIdCode")));
-                row.put("solvedLabel",MapUtils.getLong(row,"solved") == 1? "是":"否");
-                row.put("eventLevelLabel",MapUtils.getString(comprehensiveCasesGrading,MapUtils.getString(row,"eventLevel")));
-            }
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
-        }
-    }
-
-
-    /**
-     * 获取涉及师生安全的案（事）件详细信息
-     */
-    @GetMapping("/SafetyInvolved/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedById(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveSafetyInvolved = (HashMap<String, Object>) ajaxResult.get("data");
-            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
-            comprehensiveSafetyInvolved.put("occurPlaceLabel", MapUtils.getString(comprehensiveCityCode,MapUtils.getString(comprehensiveSafetyInvolved,"occurPlace")));
-            comprehensiveSafetyInvolved.put("caseNatureLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATURE_OF_THE_CASE, MapUtils.getString(comprehensiveSafetyInvolved,"caseNature")));
-            comprehensiveSafetyInvolved.put("mainSuspectIdCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveSafetyInvolved,"mainSuspectIdCode")));
-            comprehensiveSafetyInvolved.put("solvedLabel",MapUtils.getLong(comprehensiveSafetyInvolved,"solved") == 1? "是":"否");
-            comprehensiveSafetyInvolved.put("eventLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CASES_GRADING, MapUtils.getString(comprehensiveSafetyInvolved,"eventLevel")));
-
-            return AjaxResult.success(comprehensiveSafetyInvolved);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-    }
-
-    /**
-     * 新增涉及师生安全的案（事）件
-     */
-    @PostMapping("/SafetyInvolved")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteSafetyInvolvedService.insertComprehensiveSafetyInvolved(json);
-    }
-
-    /**
-     * 修改涉及师生安全的案（事）件
-     */
-    @PostMapping("/SafetyInvolved/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteSafetyInvolvedService.updateComprehensiveSafetyInvolved(json);
-    }
-
-    /**
-     * 删除涉及师生安全的案（事）件
-     */
-    @GetMapping("/SafetyInvolved/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteSafetyInvolvedService.deleteComprehensiveSafetyInvolvedByIds(id.toArray(new String[0]));
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/comprehensive/schoolSafetyController/AppSchoolController.java

@@ -1,101 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.schoolSafetyController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.comprehensiveSchoolSafety.domain.ComprehensiveSchool;
-import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.service.RemoteSchoolService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 学校app
- *
- * @author hanfucheng
- * @date 2023/9/18 9:39
- */
-@RestController
-@RequestMapping("/AppSchoolController")
-public class AppSchoolController extends BaseController {
-
-    @Resource
-    RemoteSchoolService remoteSchoolService;
-
-    /**
-     * 查询学校列表
-     */
-    @GetMapping("/leader/list")
-    public AjaxResult list(ComprehensiveSchool comprehensiveSchool) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo tableDataInfo = remoteSchoolService.selectComprehensiveSchoolList(pageNum, pageSize, comprehensiveSchool.getSchoolName());
-        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
-            Map<String,Object> map = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_TYPE_OF_SCHOOL);
-            Map<String,Object> map1 = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
-            if (!rows.isEmpty()) {
-                for (Map<String,Object> datum : rows) {
-                    datum.put("schoolTypeLabel",MapUtils.getString(map,MapUtils.getString(datum,"schoolType")));
-                    datum.put("educationAdminDeptLabel", MapUtils.getString(map1,MapUtils.getString(datum,"educationAdminDept")));
-                }
-            }
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
-        }
-    }
-
-
-    /**
-     * 获取学校详细信息
-     */
-    @GetMapping("/leader/edit")
-    public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteSchoolService.selectComprehensiveSchoolById(id);
-        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
-            HashMap<String,Object> comprehensiveSchool = (HashMap<String, Object>) ajaxResult.get("data");
-            Map<String,Object> map = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
-            comprehensiveSchool.put("schoolTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_TYPE_OF_SCHOOL, MapUtils.getString(comprehensiveSchool,"schoolType")));
-            comprehensiveSchool.put("educationAdminDeptLabel", MapUtils.getString(map,MapUtils.getString(comprehensiveSchool,"educationAdminDept")));
-            return AjaxResult.success(comprehensiveSchool);
-        }else{
-            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
-        }
-    }
-
-    /**
-     * 新增学校
-     */
-    @PostMapping("/leader")
-    public AjaxResult add(@RequestBody String json) {
-        return remoteSchoolService.insertComprehensiveSchool(json);
-    }
-    /**
-     * 修改学校
-     */
-    @PostMapping("/leader/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remoteSchoolService.updateComprehensiveSchool(json);
-    }
-
-    /**
-     * 删除学校
-     */
-    @GetMapping("/leader/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remoteSchoolService.deleteComprehensiveSchoolByIds(id.toArray(new String[0]));
-    }
-
-
-}

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

@@ -1,83 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.socialPolicingController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.R;
-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.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.domain.BasicHomicideInformation;
-import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteBasicHomicideInformationService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Author LG
- * @Date 2023/9/13 - 9:34
- */
-@RestController
-@RequestMapping("/AppBasicHomicideInformationController")
-public class AppBasicHomicideInformationController {
-    @Resource
-    private RemoteBasicHomicideInformationService basicHomicideInformationService;
-
-    /**
-     * 命案基本信息列表
-     */
-    @GetMapping("/basicHomicideInformation/list")
-    public AjaxResult list(BasicHomicideInformation basicHomicideInformation) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo list = basicHomicideInformationService.getList(pageNum, pageSize);
-        if (HttpStatus.SUCCESS == list.getCode()) {
-            return AjaxResult.success(list.getRows());
-        } else {
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-
-    /**
-     * 命案基本信息详细信息
-     */
-    @GetMapping("/basicHomicideInformation/edit")
-    public AjaxResult getInfo(BasicHomicideInformation basicHomicideInformation) {
-        R<BasicHomicideInformation> edit = basicHomicideInformationService.getEdit(basicHomicideInformation.getId());
-        BasicHomicideInformation data = edit.getData();
-        if (HttpStatus.SUCCESS == edit.getCode()) {
-            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);
-    }
-
-    /**
-     * 新增命案基本信息
-     */
-    @PostMapping("/basicHomicideInformation")
-    public AjaxResult add(@RequestBody String json) {
-        return basicHomicideInformationService.add(json);
-    }
-
-    /**
-     * 修改命案基本信息
-     */
-    @PostMapping("/basicHomicideInformation/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return basicHomicideInformationService.edit(json);
-    }
-
-    /**
-     * 删除命案基本信息
-     */
-    @GetMapping("/basicHomicideInformation/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return basicHomicideInformationService.del(id.toArray(new String[0]));
-    }
-}

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

@@ -1,97 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.socialPolicingController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.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;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author LG
- * @Date 2023/9/13 - 10:24
- */
-@RestController
-@RequestMapping("/AppRemediationInKeyAreaController")
-public class AppRemediationInKeyAreaController {
-    @Resource
-    private RemoteRemediationInKeyAreaService remediationInKeyAreaService;
-
-    /**
-     * 重点地区排查整治列表
-     */
-    @GetMapping("/remediationInKeyArea/list")
-    public AjaxResult list(RemediationInKeyArea remediationInKeyArea) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo list = remediationInKeyAreaService.getList(pageNum, pageSize);
-        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();
-            for (HashMap<String, Object> row : rows) {
-                row.put("outstandingSecurityIssuesLabel",policingIssues.get(row.get("outstandingSecurityIssues")));
-                row.put("areaInvolvedTypeLabel",regionsInvolved.get(row.get("areaInvolvedType")));
-                row.put("effectivenessEvaluationLabel",effectivenessEvaluation.get(row.get("effectivenessEvaluation")));
-            }
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-
-    /**
-     * 重点地区排查整治详细信息
-     */
-    @GetMapping("/remediationInKeyArea/edit")
-    public AjaxResult getInfo(RemediationInKeyArea remediationInKeyArea) {
-        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(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;
-        }
-    }
-
-    /**
-     * 新增重点地区排查整治
-     */
-    @PostMapping("/remediationInKeyArea")
-    public AjaxResult add(@RequestBody String json) {
-        return remediationInKeyAreaService.add(json);
-    }
-
-    /**
-     * 修改重点地区排查整治
-     */
-    @PostMapping("/remediationInKeyArea/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return remediationInKeyAreaService.edit(json);
-    }
-
-    /**
-     * 删除重点地区排查整治
-     */
-    @GetMapping("/remediationInKeyArea/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return remediationInKeyAreaService.del(id.toArray(new String[0]));
-    }
-
-}

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

@@ -1,111 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.socialPolicingController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-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.comprehensiveSocialPolicing.domain.SafetyManagement;
-import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteSafetyManagementService;
-import com.ruoyi.common.core.domain.DictKeys;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author LG
- * @Date 2023/9/13 - 13:44
- */
-@RestController
-@RequestMapping("/AppSafetyManagementController")
-public class AppSafetyManagementController {
-    @Resource
-    private RemoteSafetyManagementService safetyManagementService;
-
-    /**
-     * 寄递物流安全管理列表
-     */
-    @GetMapping("/safetyManagement/list")
-    public AjaxResult list(SafetyManagement safetyManagement) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo list = safetyManagementService.getList(pageNum, pageSize);
-        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);
-        Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
-
-        if (HttpStatus.SUCCESS == list.getCode()) {
-            List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) list.getRows();
-            for (HashMap<String, Object> row : rows) {
-                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(DictKeys.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())? "是":"否");
-                row.put("enterprisePlaceLabel", MapUtils.getString(comprehensiveCityCode,MapUtils.getString(row,"enterprisePlace")));
-            }
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-
-    /**
-     * 寄递物流安全管理详细信息
-     */
-    @GetMapping("/safetyManagement/edit")
-    public AjaxResult getInfo(SafetyManagement safetyManagement) {
-        AjaxResult edit = safetyManagementService.getEdit(safetyManagement.getId());
-        if("200".equals(edit.get("code").toString())){
-            HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
-            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
-
-            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())? "是":"否");
-
-            data.put("enterprisePlaceLabel",MapUtils.getString(comprehensiveCityCode,MapUtils.getString(data,"enterprisePlace")));
-            return AjaxResult.success(data);
-        }else{
-            return edit;
-        }
-    }
-
-    /**
-     * 新增寄递物流安全管理
-     */
-    @PostMapping("/safetyManagement")
-    public AjaxResult add(@RequestBody String json) {
-        return safetyManagementService.add(json);
-    }
-
-    /**
-     * 修改寄递物流安全管理
-     */
-    @PostMapping("/safetyManagement/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return safetyManagementService.edit(json);
-    }
-
-    /**
-     * 删除寄递物流安全管理
-     */
-    @GetMapping("/safetyManagement/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return safetyManagementService.del(id.toArray(new String[0]));
-    }
-}

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

@@ -1,144 +0,0 @@
-package com.sooka.sponest.mobile.comprehensive.socialPolicingController;
-
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.domain.DictKeys;
-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.comprehensiveSocialPolicing.domain.Victim;
-import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteVictimService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author LG
- * @Date 2023/9/13 - 14:57
- */
-@RestController
-@RequestMapping("/AppVictimController")
-public class AppVictimController {
-    @Resource
-    private RemoteVictimService victimService;
-
-    /**
-     * 重点地区排查整治列表
-     */
-    @GetMapping("/victim/list")
-    public AjaxResult list(Victim victim) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String type = victim.getType();
-        TableDataInfo list = victimService.getList(pageNum, pageSize, type);
-        Map<String, Object> certificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);//证件代码
-        Map<String, Object> sex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);//性别
-
-
-        Map<String, Object> comprehensiveInternation = DictUtils.getDictCacheToMap("comprehensive_internation");//国籍（地区）
-        Map<String, Object> nation = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);//民族
-        Map<String, Object> maritalStatus = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_MARITAL_STATUS);//婚姻状况
-        Map<String, Object> politicalStatus = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);//政治面貌
-        Map<String, Object> educationalBackground = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);//学历
-        Map<String, Object> religiousBelief = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF);//宗教信仰
-        Map<String, Object> occupationalCategory = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY);//职业类别
-
-        Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
-
-        //isSevereMentalDisorderPatient     是否为严重精神障碍患者
-        //isMinor                           是否为未成年人
-        //isJuvenile                        是否为青少年
-
-        if (HttpStatus.SUCCESS == list.getCode()) {
-            List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) list.getRows();
-            for (HashMap<String, Object> row : rows) {
-
-                row.put("nativePlaceLabel",null == row.get("nativePlace")?"":comprehensiveCityCode.get(row.get("nativePlace")));
-                row.put("registeredResidenceLabel",null == row.get("registeredResidence")?"":comprehensiveCityCode.get(row.get("registeredResidence")));
-                row.put("currentResidenceLabel",null == row.get("currentResidence")?"":comprehensiveCityCode.get(row.get("currentResidence")));
-
-
-                row.put("identityCodeLabel",certificateCode.get(row.get("identityCode")));
-                row.put("genderLabel",sex.get(row.get("gender")));
-
-                row.put("nationalityRegionLabel",null == row.get("nationalityRegion")? "":comprehensiveInternation.get(row.get("nationalityRegion")));
-                row.put("nationLabel",null == row.get("nation")? "":nation.get(row.get("nation")));
-                row.put("maritalStatusLabel",null == row.get("maritalStatus")? "":maritalStatus.get(row.get("maritalStatus")));
-                row.put("politicalOutlookLabel",null == row.get("politicalOutlook")? "":politicalStatus.get(row.get("politicalOutlook")));
-                row.put("educationLabel",null == row.get("education")? "":educationalBackground.get(row.get("education")));
-                row.put("religiousBeliefsLabel",null == row.get("religiousBeliefs")? "":religiousBelief.get(row.get("religiousBeliefs")));
-                row.put("occupationCategoryLabel",null == row.get("occupationCategory")? "":occupationalCategory.get(row.get("occupationCategory")));
-
-                row.put("isSevereMentalDisorderPatientLabel",null == row.get("isSevereMentalDisorderPatient")? "":"1".equals(row.get("isSevereMentalDisorderPatient").toString())?"是":"否");
-                row.put("isMinorLabel",null == row.get("isMinor")? "":"1".equals(row.get("isMinor").toString())?"是":"否");
-                row.put("isJuvenileLabel",null == row.get("isJuvenile")? "":"1".equals(row.get("isJuvenile").toString())?"是":"否");
-            }
-            return AjaxResult.success(rows);
-        } else {
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-
-    /**
-     * 重点地区排查整治详细信息
-     */
-    @GetMapping("/victim/edit")
-    public AjaxResult getInfo(Victim victim) {
-        AjaxResult edit = victimService.getEdit(victim.getId());
-        if("200".equals(edit.get("code").toString())){
-            HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
-            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
-            data.put("identityCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE,data.get("identityCode").toString()));
-            data.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX,data.get("gender").toString()));
-            data.put("nationalityRegionLabel",null == data.get("nationalityRegion")? "":DictUtils.getDictDataByValue("comprehensive_internation",data.get("nationalityRegion").toString()));
-            data.put("nationLabel",null == data.get("nation")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION,data.get("nation").toString()));
-            data.put("maritalStatusLabel",null == data.get("maritalStatus")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_MARITAL_STATUS,data.get("maritalStatus").toString()));
-            data.put("politicalOutlookLabel",null == data.get("politicalOutlook")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS,data.get("politicalOutlook").toString()));
-            data.put("educationLabel",null == data.get("education")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND,data.get("education").toString()));
-            data.put("religiousBeliefsLabel",null == data.get("religiousBeliefs")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF,data.get("religiousBeliefs").toString()));
-            data.put("occupationCategoryLabel",null == data.get("occupationCategory")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY,data.get("occupationCategory").toString()));
-
-            data.put("isSevereMentalDisorderPatientLabel",null == data.get("isSevereMentalDisorderPatient")? "":"1".equals(data.get("isSevereMentalDisorderPatient").toString())?"是":"否");
-            data.put("isMinorLabel",null == data.get("isMinor")? "":"1".equals(data.get("isMinor").toString())?"是":"否");
-            data.put("isJuvenileLabel",null == data.get("isJuvenile")? "":"1".equals(data.get("isJuvenile").toString())?"是":"否");
-
-            data.put("nativePlaceLabel",null == data.get("nativePlace")?"":comprehensiveCityCode.get(data.get("nativePlace")));
-            data.put("registeredResidenceLabel",null == data.get("registeredResidence")?"":comprehensiveCityCode.get(data.get("registeredResidence")));
-            data.put("currentResidenceLabel",null == data.get("currentResidence")?"":comprehensiveCityCode.get(data.get("currentResidence")));
-
-            return AjaxResult.success(data);
-        }else{
-            return edit;
-        }
-    }
-
-    /**
-     * 新增重点地区排查整治
-     */
-    @PostMapping("/victim")
-    public AjaxResult add(@RequestBody String json) {
-        return victimService.add(json);
-    }
-
-    /**
-     * 修改重点地区排查整治
-     */
-    @PostMapping("/victim/put")
-    public AjaxResult edit(@RequestBody String json) {
-        return victimService.edit(json);
-    }
-
-    /**
-     * 删除重点地区排查整治
-     */
-    @GetMapping("/victim/del")
-    public AjaxResult remove(@RequestParam("id") List<String> id) {
-        return victimService.del(id.toArray(new String[0]));
-    }
-}

src/main/java/com/sooka/sponest/mobile/data/emergency/controller/AppTeamController.java

@@ -0,0 +1,31 @@
+package com.sooka.sponest.mobile.data.emergency.controller;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.mobile.data.emergency.domain.AppTeamVO;
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteTeamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/AppTeamController")
+public class AppTeamController {
+
+
+    @Autowired
+    private RemoteTeamService teamService;
+
+    @GetMapping("/getTeamList")
+    public AjaxResult getTeamList(AppTeamVO vo){
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        return teamService.getTeamList(pageNum, pageSize);
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/domain/AppTeamVO.java

@@ -0,0 +1,10 @@
+package com.sooka.sponest.mobile.data.emergency.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AppTeamVO extends BaseEntity {
+
+    String teamName;
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/factory/RemoteTeamServiceFallbackFactory.java

@@ -0,0 +1,11 @@
+package com.sooka.sponest.mobile.data.emergency.feign.factory;
+
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteTeamService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteTeamServiceFallbackFactory implements FallbackFactory<RemoteTeamService> {
+    @Override
+    public RemoteTeamService create(Throwable cause) {
+        return null;
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/service/RemoteTeamService.java

@@ -0,0 +1,20 @@
+package com.sooka.sponest.mobile.data.emergency.feign.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteIndexServiceFallbackFactory;
+import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteTeamServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "AppRemoteTeamService",
+        value = ServiceNameConstants.DATA_SERVICE,
+        fallbackFactory = RemoteTeamServiceFallbackFactory.class
+        , url = "${sooka.service.data}"
+)
+public interface RemoteTeamService {
+    @GetMapping("/AppTeamController/getTeamList")
+    AjaxResult getTeamList(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+}