Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,70 @@
+package com.sooka.sponest.mobile.comprehensive.ConflictDefuseController;
+
+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.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
+import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.service.RemoteConflictResolutionService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@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()) {
+            return AjaxResult.success(tableDataInfo.getRows());
+        } else {
+            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
+        }
+    }
+
+
+    /**
+     * 获取矛盾纠纷排查化解详细信息
+     */
+    @GetMapping("/conflict/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteConflictResolutionService.selectConflictResolutionById(id);
+    }
+
+    /**
+     * 新增矛盾纠纷排查化解
+     */
+    @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

@@ -0,0 +1,82 @@
+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.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.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());
+        if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
+            return AjaxResult.success(tableDataInfo.getRows());
+        } else {
+            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
+        }
+    }
+
+
+    /**
+     * 获取涉及线、路案（事）件列表详细信息
+     */
+    @GetMapping("/RoadCase/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteRoadCaseService.selectComprehensiveRoadCaseById(id);
+    }
+
+    /**
+     * 新增涉及线、路案（事）件列表
+     */
+    @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

@@ -0,0 +1,70 @@
+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.sooka.sponest.comprehensive.api.comprehensiveRoadCase.domain.ComprehensiveRoadProtection;
+import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.service.RemoteRoadProtectionService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@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()) {
+            return AjaxResult.success(tableDataInfo.getRows());
+        } else {
+            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
+        }
+    }
+
+
+    /**
+     * 获取护路护线详细信息
+     */
+    @GetMapping("/RoadProtection/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteRoadProtectionService.selectComprehensiveRoadProtectionById(id);
+    }
+
+    /**
+     * 新增护路护线
+     */
+    @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/comprehensivePersonBasicInfo/AppSafetyInvolvedController.java

@@ -29,7 +29,7 @@ public class AppSafetyInvolvedController extends BaseController {
     /**
      * 查询涉及师生安全的案（事）件列表
      */
-    @GetMapping("/leader/list")
+    @GetMapping("/SafetyInvolved/list")
     public AjaxResult list(ComprehensiveSafetyInvolved comprehensiveSafetyInvolved) {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -46,7 +46,7 @@ public class AppSafetyInvolvedController extends BaseController {
     /**
      * 获取涉及师生安全的案（事）件详细信息
      */
-    @GetMapping("/leader/edit")
+    @GetMapping("/SafetyInvolved/edit")
     public AjaxResult getInfo(String id) {
         return remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedById(id);
     }
@@ -54,7 +54,7 @@ public class AppSafetyInvolvedController extends BaseController {
     /**
      * 新增涉及师生安全的案（事）件
      */
-    @PostMapping("/leader")
+    @PostMapping("/SafetyInvolved")
     public AjaxResult add(@RequestBody String json) {
         return remoteSafetyInvolvedService.insertComprehensiveSafetyInvolved(json);
     }
@@ -62,7 +62,7 @@ public class AppSafetyInvolvedController extends BaseController {
     /**
      * 修改涉及师生安全的案（事）件
      */
-    @PostMapping("/leader/put")
+    @PostMapping("/SafetyInvolved/put")
     public AjaxResult edit(@RequestBody String json) {
         return remoteSafetyInvolvedService.updateComprehensiveSafetyInvolved(json);
     }
@@ -70,7 +70,7 @@ public class AppSafetyInvolvedController extends BaseController {
     /**
      * 删除涉及师生安全的案（事）件
      */
-    @GetMapping("/leader/del")
+    @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/dict/AppDictController.java

@@ -0,0 +1,36 @@
+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 list(DataDict dataDict) {
+        String type = dataDict.getType();
+        List list = dataDictService.dictTree(type);
+        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/organizationAndInstitutioncontroller/APPComprehensiveTGrossCaseController.java

@@ -0,0 +1,68 @@
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+
+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.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.List;
+
+/**
+ * @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()){
+            return AjaxResult.success(tableDataInfo.getRows());
+        }else{
+            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
+        }
+    }
+    /**
+     * 获取重特大案（事）件详细信息
+     */
+    @GetMapping(value = "/grossCase/{id}")
+    public AjaxResult getInfo(String id) {
+        return comprehensiveTGrossCaseService.getInfo(id);
+    }
+    /**
+     * 新增重特大案（事）件
+     */
+    @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

@@ -0,0 +1,68 @@
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+
+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.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.List;
+
+/**
+ * @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());
+        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
+            return AjaxResult.success(tableDataInfo.getRows());
+        }else{
+            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
+        }
+    }
+    /**
+     * 获取群防群治组织详细信息
+     */
+    @GetMapping(value = "/preventionOrganization/{id}")
+    public AjaxResult getInfo(String id) {
+        return AjaxResult.success(comprehensiveTPreventionOrganizationService.getInfo(id));
+    }
+    /**
+     * 新增群防群治组织
+     */
+    @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

@@ -0,0 +1,66 @@
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+
+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.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveTPreventionTeam;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionTeamService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @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());
+        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
+            return AjaxResult.success(tableDataInfo.getRows());
+        }else{
+            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
+        }
+    }
+    /**
+     * 获取群防群治队伍详细信息
+     */
+    @GetMapping(value = "/preventionTeam/{id}")
+    public AjaxResult getInfo(String id) {
+        return comprehensiveTPreventionTeamService.getInfo(id);
+    }
+    /**
+     * 新增群防群治队伍
+     */
+    @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/AppLeadershipController.java

@@ -0,0 +1,76 @@
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+
+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.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveLeadership;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteLeadershipService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 综治领导责任制
+ *
+ * @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()){
+            return AjaxResult.success(tableDataInfo.getRows());
+        }else{
+            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
+        }
+    }
+
+    /**
+     * 获取综治领导责任制详细信息
+     */
+    @GetMapping("/comprehensiveLeadership/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteLeadershipService.selectComprehensiveLeadershipById(id);
+    }
+
+    /**
+     * 新增综治领导责任制
+     */
+    @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]));
+    }
+
+}