社区网格核酸检测人员信息

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.service.AdminService;
@@ -79,4 +80,17 @@ public class ApiAdminController {
     public Result getAreaInfo(CityAreaFormDTO formDto){
         return adminService.getAreaInfo(formDto);
     }
+
+
+    /**
+     * @describe: 获取组织列表信息，通过pid
+     * @author wgf
+     * @date 2021/10/14 9:35
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("/dept/getDeptInfoByPid")
+    public Result getDeptInfoByPid(DeptIdByPidFormDTO formDto){
+        return adminService.getDeptInfoByPid(formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java

@@ -469,4 +469,16 @@ public class ApiScreenController {
     public Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto){
         return epdcScreenService.epidemicVaccinationStatisticsNew(formDto);
     }
+
+    /**
+     * 社区网格核酸人员信息
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @author wgf
+     * @since 2022/4/13 10:10
+     */
+    @GetMapping("epidemic/getEpidemicUserInfoList")
+    public Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto){
+        return epdcScreenService.getEpidemicUserInfoList(formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
@@ -239,4 +240,15 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/dept/getdeptinfo/{typeKey}")
     Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable("typeKey") String typeKey);
+
+
+    /**
+     * @describe: 获取组织列表信息，通过pid
+     * @author wgf
+     * @date 2021/10/14 9:35
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value = "sys/dept/getDeptInfoByPid", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getDeptInfoByPid(DeptIdByPidFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -370,4 +370,14 @@ public interface AnalysisFeignClient {
     Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto);
     @GetMapping("analysis/screen/epidemic/vaccinationStatistics/new")
     Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 社区网格核酸人员信息
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @author wgf
+     * @since 2022/4/13 10:10
+     */
+    @GetMapping("analysis/screen/epidemic/getEpidemicUserInfoList")
+    Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
@@ -122,4 +123,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<SysDeptDTO>> getDeptInfoByTypeKey(String typeKey) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoByTypeKey", typeKey);
     }
+
+    @Override
+    public Result getDeptInfoByPid(DeptIdByPidFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoByPid", formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -195,4 +195,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatisticsNew",formDto);
     }
+
+    @Override
+    public Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getEpidemicUserInfoList",formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.AppMemberListFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
@@ -121,4 +122,14 @@ public interface AdminService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getCommunityDeptList();
+
+
+    /**
+     * @describe: 获取组织列表信息，通过pid
+     * @author wgf
+     * @date 2021/10/14 9:35
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getDeptInfoByPid(DeptIdByPidFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java

@@ -327,4 +327,13 @@ public interface EpdcScreenService {
     Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto);
 
     Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 社区网格核酸人员信息
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @author wgf
+     * @since 2022/4/13 10:10
+     */
+    Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
@@ -170,4 +171,10 @@ public class AdminServiceImpl implements AdminService {
     public Result getCommunityDeptList() {
         return adminFeignClient.getCommunityDeptList();
     }
+
+    @Override
+    public Result getDeptInfoByPid(DeptIdByPidFormDTO formDto) {
+        log.info("formDto:"+formDto);
+        return adminFeignClient.getDeptInfoByPid(formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java

@@ -196,4 +196,9 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
     public Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
         return analysisFeignClient.epidemicVaccinationStatisticsNew(formDto);
     }
+
+    @Override
+    public Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) {
+        return analysisFeignClient.getEpidemicUserInfoList(formDto);
+    }
 }

epdc-cloud-api/src/main/resources/logback-spring.xml

@@ -144,10 +144,10 @@
 
     <!-- 生产环境 -->
     <springProfile name="prod">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.elink.esua.epdc" level="INFO"/>
-        <root level="INFO">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>