民警群信息接口

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

@@ -12,6 +12,8 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
@@ -305,4 +307,18 @@ public class ApiPropertyController {
         ValidatorUtils.validateEntity(formDto);
         return propertyService.score(userDetail, formDto);
     }
+
+    /**
+     * 获取社区内民警及警民群数据
+     *
+     * @return
+     * @params [userDetail, formDto]
+     * @author zhangyuan
+     * @since 2020/5/21 15:04
+     */
+    @GetMapping("police/getByDept")
+    public Result<PoliceResultDTO> score(@LoginUser TokenDto userDetail, PoliceFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return propertyService.getDeptPolice(userDetail, formDto);
+    }
 }

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

@@ -10,6 +10,8 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
@@ -250,7 +252,7 @@ public interface PropertyFeignClient {
     /**
      * 物业打分
      *
-     * @return ProjectDetailResultDTO
+     * @return Result
      * @params [formDto]
      * @author ZHANGYUAN
      * @since 2020/5/13 15:06
@@ -258,6 +260,17 @@ public interface PropertyFeignClient {
     @GetMapping(value = "property/epdc-app/project/projectScore", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result projectScore(ProjectScoreFormDTO formDto);
 
+    /**
+     * 获取社区内民警及警民群数据
+     *
+     * @return Result
+     * @params [formDto]
+     * @author ZHANGYUAN
+     * @since 2020/5/13 15:06
+     */
+    @GetMapping(value = "property/epdc-app/project/getDeptPolice", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<PoliceResultDTO> getDeptPolice(PoliceFormDTO formDto);
+
     @PostMapping(value = "property/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result submit(TopicCommentFormDTO commentFormDTO);
 

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

@@ -12,6 +12,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
@@ -139,6 +141,11 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectScore", formDto);
     }
 
+    @Override
+    public Result<PoliceResultDTO> getDeptPolice(PoliceFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "getDeptPolice", formDto);
+    }
+
     public Result submit(TopicCommentFormDTO commentFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", commentFormDTO);
     }

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

@@ -11,6 +11,8 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
 import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
@@ -229,7 +231,6 @@ public interface PropertyService {
      */
     Result<List<TopicListResultDTO>> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto);
 
-
     /**
      * 物业打分
      *
@@ -238,4 +239,13 @@ public interface PropertyService {
      * @since 2020/5/21 15:50
      */
     Result score(TokenDto userDetail, ProjectScoreFormDTO formDto);
+
+    /**
+     * 获取社区内民警及警民群数据
+     *
+     * @params [userDetail, formDto]
+     * @author zhangyuan
+     * @since 2020/5/21 15:50
+     */
+    Result<PoliceResultDTO> getDeptPolice(TokenDto userDetail, PoliceFormDTO formDto);
 }

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

@@ -15,6 +15,8 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
@@ -291,4 +293,13 @@ public class PropertyServiceImpl implements PropertyService {
         formDto.setUserId(userDetail.getUserId());
         return propertyFeignClient.projectScore(formDto);
     }
+
+    @Override
+    public Result<PoliceResultDTO> getDeptPolice(TokenDto userDetail, PoliceFormDTO formDto) {
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        formDto.setGridId(userDetail.getGridId());
+        return propertyFeignClient.getDeptPolice(formDto);
+    }
 }