民警信息及警民群信息接口实现

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/controller/AppPropertyPoliceController.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.police.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
+import com.elink.esua.epdc.modules.police.service.PoliceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 物业项目表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-05-09
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "project")
+public class AppPropertyPoliceController {
+
+    @Autowired
+    private PoliceService policeService;
+
+    /**
+     * 获取社区内民警及警民群数据
+     *
+     * @return com.elink.esua.epdc.dto.police.result.PoliceResultDTO
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/5/13 15:37
+     */
+    @GetMapping("getDeptPolice")
+    public Result<PoliceResultDTO> getDeptPolice(@RequestBody PoliceFormDTO formDto) {
+        PoliceResultDTO data = policeService.getPoliceAndGroup(formDto);
+        return new Result<PoliceResultDTO>().ok(data);
+    }
+}

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/dao/PoliceDao.java

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.modules.police.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.modules.police.entity.PoliceEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -32,13 +34,24 @@ import java.util.Map;
  */
 @Mapper
 public interface PoliceDao extends BaseDao<PoliceEntity> {
+
     /**
      * 民警列表
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.pr.PoliceEntity>
+     * @return java.util.List<com.elink.esua.epdc.modules.police.entity.PoliceEntity>
      * @params [params]
      * @author zhangyuan
-     * @since 2019/10/11 14:54
+     * @since 2020/5/21 14:54
      */
     List<PoliceEntity> selectListOfPolice(Map<String, Object> params);
+
+    /**
+     * 民警信息及警民群信息
+     *
+     * @return com.elink.esua.epdc.dto.police.result.PoliceResultDTO
+     * @params [dto]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    PoliceResultDTO selectPoliceGroupInfo(PoliceFormDTO dto);
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/PoliceService.java

@@ -21,6 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.police.PoliceDTO;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.modules.police.entity.PoliceEntity;
 
 import java.util.List;
@@ -103,4 +105,14 @@ public interface PoliceService extends BaseService<PoliceEntity> {
      * @date 2020-05-21
      */
     void supplement(PoliceDTO[] ids);
+
+    /**
+     * 民警信息及警民群信息
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.dto.police.result.PoliceResultDTO
+     * @author zhangyuan
+     * @date 2020-05-21
+     */
+    PoliceResultDTO getPoliceAndGroup(PoliceFormDTO dto);
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java

@@ -32,6 +32,8 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.constant.GroupConstant;
 import com.elink.esua.epdc.dto.enums.GroupStateEnum;
 import com.elink.esua.epdc.dto.police.PoliceDTO;
+import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
@@ -200,6 +202,11 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
         }
     }
 
+    @Override
+    public PoliceResultDTO getPoliceAndGroup(PoliceFormDTO dto) {
+        return baseDao.selectPoliceGroupInfo(dto);
+    }
+
     /**
      * 根据网格ID获取冗余的组织机构信息
      *

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java

@@ -19,14 +19,11 @@ package com.elink.esua.epdc.modules.project.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.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;
 import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
 import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
-import com.elink.esua.epdc.modules.police.service.PoliceService;
 import com.elink.esua.epdc.modules.project.service.PropertyProjectScoreService;
 import com.elink.esua.epdc.modules.project.service.PropertyProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,9 +51,6 @@ public class AppPropertyProjectController {
     @Autowired
     private PropertyProjectScoreService propertyProjectScoreService;
 
-    @Autowired
-    private PoliceService policeService;
-
     /**
      * 项目列表
      *
@@ -112,18 +106,4 @@ public class AppPropertyProjectController {
         propertyProjectScoreService.score(formDto);
         return new Result();
     }
-
-    /**
-     * 获取社区内民警及警民群数据
-     *
-     * @return com.elink.esua.epdc.dto.police.result.PoliceResultDTO
-     * @params [formDto]
-     * @author zhangyuan
-     * @since 2020/5/13 15:37
-     */
-    @GetMapping("getDeptPolice")
-    public Result<PoliceResultDTO> getDeptPolice(@RequestBody PoliceFormDTO formDto) {
-//        propertyProjectScoreService.score(formDto);
-        return new Result();
-    }
 }

epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml

@@ -30,7 +30,7 @@
     </sql>
     <select id="selectListOfPolice" resultType="com.elink.esua.epdc.modules.police.entity.PoliceEntity">
         SELECT
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         FROM
         epdc_police ep
         WHERE
@@ -48,4 +48,58 @@
         ORDER BY
         ep.CREATED_TIME DESC
     </select>
+    <select id="selectPoliceGroupInfo" resultType="com.elink.esua.epdc.dto.police.result.PoliceResultDTO">
+        SELECT
+        ep.id AS POLICE_ID,
+        ep.POLICE_AVATAR,
+        ep.POLICE_NAME,
+        ep.POLICE_TEL,
+        eg.id AS GROUP_ID,
+        eg.GROUP_NAME,
+        eg.GROUP_AVATAR,
+        SUM(
+        CASE
+        WHEN eu.STATE = '10' THEN
+        1
+        ELSE
+        0
+        END
+        ) AS NUMBER_GROUP_MEMBER,
+        SUM(
+        CASE
+        WHEN eu.PARTY_MEMBER = '1'
+        AND eu.STATE = '10' THEN
+        1
+        ELSE
+        0
+        END
+        ) AS NUMBER_GROUP_PARTY_MEMBER,
+        SUM(
+        CASE
+        WHEN eu.USER_ID = #{userId}
+        AND eu.STATE = '0' THEN
+        1
+        WHEN eu.USER_ID = #{userId}
+        AND eu.STATE = '10' THEN
+        2
+        ELSE
+        0
+        END
+        ) AS GROUP_MEMBER_FLAG,
+        eg.STATE AS GROUP_STATE
+        FROM
+        epdc_police ep
+        LEFT JOIN epdc_group eg ON ep.id = eg.REFERENCE_BUSINESS_ID
+        LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID
+        AND eu.DEL_FLAG = '0'
+        WHERE
+        ep.DEL_FLAG = '0'
+        AND eg.DEL_FLAG = '0'
+        <if test="gridId != null and gridId != ''">
+            AND (ep.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},ep.ALL_DEPT_IDS))
+        </if>
+        GROUP BY
+        ep.ID
+    </select>
 </mapper>