大屏新增

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -290,6 +290,7 @@ renren:
     - /api/plugins/workLog/** #工作日志相关
     - /screen/** #大屏相关
     - /**/screenJinShui/**
+    - /custom/screencompany/page
   workUrls:
     - /api/work/** #工作端接口
     - /api/analysis/** #数据端接口
@@ -327,3 +328,4 @@ epdc:
     - /api/plugins/workLog/** #工作日志相关
     - /screen/topic/page #大屏相关
     - /**/screenJinShui/** #大屏接口
+    - /custom/screencompany/page

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java

@@ -52,7 +52,7 @@ public class ApiPartyGroupController {
         return partyGroupService.officialsList(userDetail, formDto);
     }
 
-    @GetMapping(value = "screenJinShui/officials/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "screenJinShui/officials/list")
     Result<List<PartyGroupOfficialsResultDTO>> officialsListForScreen(PartyGroupOfficialsFormDTO formDto) {
         return partyGroupService.officialsListForScreen(formDto);
     }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/ScreenCompanyController.java

@@ -57,6 +57,12 @@ public class ScreenCompanyController {
         return new Result<PageData<ScreenCompanyDTO>>().ok(page);
     }
 
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<ScreenCompanyDTO>> pageForScreen(@RequestParam Map<String, Object> params){
+        PageData<ScreenCompanyDTO> page = screenCompanyService.page(params);
+        return new Result<PageData<ScreenCompanyDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<ScreenCompanyDTO> get(@PathVariable("id") String id){
         ScreenCompanyDTO data = screenCompanyService.get(id);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java

@@ -87,6 +87,11 @@ public class EpdcScreenPopulationInformationController {
         return populationInformationService.selectPeopleDetail(dto);
     }
 
+    @PostMapping("screenJinShui/selectPeopleDetail")
+    public Result<EpdcScreenSelectPeopleDetailResultDTO> selectPeopleDetailForScreen(@RequestBody EpdcScreenSelectPeopleDetailFormDTO dto){
+        return populationInformationService.selectPeopleDetail(dto);
+    }
+
     /**
      * @Description  大屏找人接口
      * @Author songyunpeng

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HouseResidentController.java

@@ -56,6 +56,12 @@ public class HouseResidentController {
         return new Result<PageData<PopulationInformationDTO>>().ok(page);
     }
 
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<PopulationInformationDTO>> pageForScreen(@RequestParam Map<String, Object> params){
+        PageData<PopulationInformationDTO> page = houseResidentService.listPage(params);
+        return new Result<PageData<PopulationInformationDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<PopulationInformationDTO> get(@PathVariable("id") String id){
         PopulationInformationDTO data = houseResidentService.get(id);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java

@@ -74,12 +74,24 @@ public class HousingInformationController {
         return new Result<PageData<HousingInformationDTO>>().ok(page);
     }
 
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<HousingInformationDTO>> pageForScreen(@RequestParam Map<String, Object> params){
+        PageData<HousingInformationDTO> page = housingInformationService.listOfPage(params);
+        return new Result<PageData<HousingInformationDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<HousingInformationDTO> get(@PathVariable("id") String id){
         HousingInformationDTO data = housingInformationService.get(id);
         return new Result<HousingInformationDTO>().ok(data);
     }
 
+    @GetMapping("screenJinShui/{id}")
+    public Result<HousingInformationDTO> getForScreen(@PathVariable("id") String id){
+        HousingInformationDTO data = housingInformationService.get(id);
+        return new Result<HousingInformationDTO>().ok(data);
+    }
+
     @PostMapping
     public Result save(@RequestBody HousingInformationDTO dto){
         //效验数据

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PopulationInformationController.java

@@ -70,17 +70,36 @@ public class PopulationInformationController {
         return new Result<PageData<PopulationInformationDTO>>().ok(page);
     }
 
+
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<PopulationInformationDTO>> pageForScreen(@RequestParam Map<String, Object> params){
+        PageData<PopulationInformationDTO> page = populationInformationService.listPage(params);
+        return new Result<PageData<PopulationInformationDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<PopulationInformationDTO> get(@PathVariable("id") String id){
         PopulationInformationDTO populationInformationDTOS = populationInformationService.get(id);
         return new Result<PopulationInformationDTO>().ok(populationInformationDTOS);
     }
+
+    @GetMapping("screenJinShui/{id}")
+    public Result<PopulationInformationDTO> getForScreen(@PathVariable("id") String id){
+        PopulationInformationDTO populationInformationDTOS = populationInformationService.get(id);
+        return new Result<PopulationInformationDTO>().ok(populationInformationDTOS);
+    }
     @GetMapping("getHouseHeadInfo")
     public Result<PopulationInformationDTO> getHouseHeadInfo(String id){
         PopulationInformationDTO data = populationInformationService.getHouseHeadInfo(id);
         return new Result<PopulationInformationDTO>().ok(data);
     }
 
+    @GetMapping("screenJinShui/getHouseHeadInfo")
+    public Result<PopulationInformationDTO> getHouseHeadInfoForScreen(String id){
+        PopulationInformationDTO data = populationInformationService.getHouseHeadInfo(id);
+        return new Result<PopulationInformationDTO>().ok(data);
+    }
+
     @PostMapping
     public Result save(@RequestBody PopulationInformationDTO dto){
         //效验数据
@@ -218,6 +237,15 @@ public class PopulationInformationController {
         return new Result<PageData<EpdcScreenResidentInfoByCurrentAddressResultDTO>>().ok(page);
     }
 
+
+    @GetMapping("screenJinShui/selectPeopleByCurrentAddress")
+    public Result<PageData<EpdcScreenResidentInfoByCurrentAddressResultDTO>> selectPeopleByCurrentAddressForScreen(@RequestParam Map<String, Object> params){
+        List<EpdcScreenResidentInfoByCurrentAddressResultDTO> pointDeptStatisticsResultDTOS = populationInformationService.selectPeopleByCurrentAddressForPc(params);
+        Integer total = populationInformationService.selectCountPeopleByCurrentAddressForPc(params);
+        PageData<EpdcScreenResidentInfoByCurrentAddressResultDTO> page = new PageData<>(pointDeptStatisticsResultDTOS,total);
+        return new Result<PageData<EpdcScreenResidentInfoByCurrentAddressResultDTO>>().ok(page);
+    }
+
     /**
      * @Description  以城找人 - 导出
      * @Author songyunpeng