话题管理+网格长管理

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>com.esua.epdc</groupId>
-        <artifactId>epdc-party-group</artifactId>
+        <artifactId>epdc-partygroup</artifactId>
         <version>1.0.0</version>
     </parent>
 

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2020-06-01
+ */
+@Data
+public class GroupTopicCloseFormDTO  implements Serializable {
+    private static final long serialVersionUID = -8847567240714882803L;
+
+    /**
+     * 话题ID
+     */
+    @NotBlank(message = "话题ID不能为空")
+    private String id;
+
+    /**
+     * 关闭原因
+     */
+    @NotBlank(message = "关闭原因不能为空且在50字以内")
+    @Size(min = 1, max = 50, message = "关闭原因不能为空且在50字以内")
+    private String remark;
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupListDTO.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：songyunpeng
+ * @Date：2020/5/29 9:28
+ */
+@Data
+public class PartyGroupListDTO implements Serializable {
+    private static final long serialVersionUID = 5340620329305821737L;
+
+    /**
+     * 党群ID
+     */
+    private String groupId;
+
+    /**
+     * 党群名称
+     */
+    private String partyGroupName;
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java

@@ -19,6 +19,8 @@ package com.elink.esua.epdc.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 
 
@@ -103,4 +105,39 @@ public class PartyGroupOfficialsDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 前端获取的部门
+     */
+    private List<Long> allDeptIdsShow;
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyTopicDTO.java

@@ -22,6 +22,7 @@ import java.util.Date;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 话题表 
@@ -179,4 +180,14 @@ public class PartyTopicDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 图片
+     */
+	private List<String> images;
+
+    /**
+     * 备注  - 关闭原因
+     */
+    private String remark;
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml

@@ -139,7 +139,7 @@
                 <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_party_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
                 <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
@@ -164,7 +164,7 @@
                 <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/js_esua_epdc_party_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
                 <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
@@ -197,7 +197,7 @@
                 <nacos.namespace></nacos.namespace>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.0.8:10000/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.16.0.8:10000/js_esua_epdc_party_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/PartyGroupApplication.java

@@ -16,8 +16,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 /**
  * 党群模块
  *
- * @author zhangyong
- * @date 2020/4/28
+ * @author songyunpeng
+ * @date 2020/5/28
  */
 @SpringBootApplication
 @EnableDiscoveryClient

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java

@@ -21,6 +21,6 @@ import org.springframework.stereotype.Service;
 public class ModuleConfigImpl implements ModuleConfig {
     @Override
     public String getName() {
-        return "party-group";
+        return "partygroup";
     }
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -26,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
+import com.elink.esua.epdc.dto.PartyGroupListDTO;
 import com.elink.esua.epdc.excel.PartyGroupExcel;
 import com.elink.esua.epdc.service.PartyGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,18 @@ public class PartyGroupController {
         ExcelUtils.exportExcelToTarget(response, null, list, PartyGroupExcel.class);
     }
 
+    /**
+     * @Description  获取网格下所有社群
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.group.GroupListDTO>>
+     **/
+    @GetMapping("groupList")
+    public Result<List<PartyGroupListDTO>> groupList() {
+        List<PartyGroupListDTO> data = partyGroupService.listOfGroupByDeptId(SecurityUser.getDeptId());
+        return new Result<List<PartyGroupListDTO>>().ok(data);
+    }
+
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupOfficialsController.java

@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 网格长（楼长）表 
+ * 网格长（楼长）表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-05-29
@@ -45,24 +45,24 @@ import java.util.Map;
 @RestController
 @RequestMapping("partygroupofficials")
 public class PartyGroupOfficialsController {
-    
+
     @Autowired
     private PartyGroupOfficialsService partyGroupOfficialsService;
 
     @GetMapping("page")
-    public Result<PageData<PartyGroupOfficialsDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PartyGroupOfficialsDTO> page = partyGroupOfficialsService.page(params);
+    public Result<PageData<PartyGroupOfficialsDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<PartyGroupOfficialsDTO> page = partyGroupOfficialsService.listPage(params);
         return new Result<PageData<PartyGroupOfficialsDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<PartyGroupOfficialsDTO> get(@PathVariable("id") String id){
+    public Result<PartyGroupOfficialsDTO> get(@PathVariable("id") String id) {
         PartyGroupOfficialsDTO data = partyGroupOfficialsService.get(id);
         return new Result<PartyGroupOfficialsDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody PartyGroupOfficialsDTO dto){
+    public Result save(@RequestBody PartyGroupOfficialsDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         partyGroupOfficialsService.save(dto);
@@ -70,7 +70,7 @@ public class PartyGroupOfficialsController {
     }
 
     @PutMapping
-    public Result update(@RequestBody PartyGroupOfficialsDTO dto){
+    public Result update(@RequestBody PartyGroupOfficialsDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         partyGroupOfficialsService.update(dto);
@@ -78,7 +78,7 @@ public class PartyGroupOfficialsController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         partyGroupOfficialsService.delete(ids);

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicCommentController.java

@@ -85,10 +85,32 @@ public class PartyTopicCommentController {
         return new Result();
     }
 
+    @GetMapping("deleteCommonts/{id}")
+    public Result deleteCommonts(@PathVariable("id" )String id){
+        String[] ids = {id};
+        partyTopicCommentService.delete(ids);
+        return new Result();
+    }
+
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<PartyTopicCommentDTO> list = partyTopicCommentService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, PartyTopicCommentExcel.class);
     }
 
+
+    /**
+     *
+     * 评论列表
+     *
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.comment.TopicCommentDTO>>
+     * @author liuchuang
+     * @since 2019/11/12 10:37
+     */
+    @GetMapping("comments")
+    public Result<PageData<PartyTopicCommentDTO>> commentsList(@RequestParam Map<String, Object> params) {
+        PageData<PartyTopicCommentDTO> page = partyTopicCommentService.listComments(params);
+        return new Result<PageData<PartyTopicCommentDTO>>().ok(page);
+    }
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO;
 import com.elink.esua.epdc.dto.PartyTopicDTO;
 import com.elink.esua.epdc.excel.PartyTopicExcel;
 import com.elink.esua.epdc.service.PartyTopicService;
@@ -51,7 +52,7 @@ public class PartyTopicController {
 
     @GetMapping("page")
     public Result<PageData<PartyTopicDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PartyTopicDTO> page = partyTopicService.page(params);
+        PageData<PartyTopicDTO> page = partyTopicService.listPage(params);
         return new Result<PageData<PartyTopicDTO>>().ok(page);
     }
 
@@ -91,4 +92,10 @@ public class PartyTopicController {
         ExcelUtils.exportExcelToTarget(response, null, list, PartyTopicExcel.class);
     }
 
+    @PostMapping("close")
+    public Result close(@RequestBody GroupTopicCloseFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return partyTopicService.modifyTopicState(formDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java

@@ -18,9 +18,12 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyGroupListDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 党群表 
  *
@@ -29,5 +32,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyGroupDao extends BaseDao<PartyGroupEntity> {
-	
+    /**
+     * @Description  获取网格下所有社群 
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [deptId]
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyGroupListDTO>
+     **/
+    List<PartyGroupListDTO> selectListOfGroupByDeptId(Long deptId);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyGroupOfficialsDTO;
 import com.elink.esua.epdc.entity.PartyGroupOfficialsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 网格长（楼长）表 
  *
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyGroupOfficialsDao extends BaseDao<PartyGroupOfficialsEntity> {
-	
+    /**
+     * @Description  查询列表
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyGroupOfficialsDTO>
+     **/
+    List<PartyGroupOfficialsEntity> selectListOfPartyGroupOfficialsDTO(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicCommentDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyTopicCommentDTO;
 import com.elink.esua.epdc.entity.PartyTopicCommentEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 话题评论表 
  *
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyTopicCommentDao extends BaseDao<PartyTopicCommentEntity> {
-	
+    /**
+     * @Description  评论列表 
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyTopicCommentDTO>
+     **/
+    List<PartyTopicCommentDTO> selectListOfCommentsByTopicId(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyTopicDTO;
 import com.elink.esua.epdc.entity.PartyTopicEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 话题表 
  *
@@ -29,5 +33,22 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyTopicDao extends BaseDao<PartyTopicEntity> {
-	
+    /**
+     * @Description  pc列表
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return java.util.List<com.elink.esua.epdc.entity.PartyTopicEntity>
+     **/
+    List<PartyTopicEntity> selectListOfPartyTopicEntity(Map<String, Object> params);
+
+
+    /**
+     * @Description  查看详情
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return java.util.List<com.elink.esua.epdc.entity.PartyTopicEntity>
+     **/
+    PartyTopicDTO selectOneOfPartyTopicDTO(String id);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java

@@ -73,4 +73,34 @@ public class PartyGroupOfficialsEntity extends BaseEpdcEntity {
      */
 	private String areaResponsibility;
 
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java

@@ -99,10 +99,6 @@ public class PartyTopicEntity extends BaseEpdcEntity {
      */
 	private BigDecimal topicLongitude;
 
-    /**
-     * 党群名字
-     */
-	private String partyGroupName;
 
     /**
      * 党群ID
@@ -148,5 +144,9 @@ public class PartyTopicEntity extends BaseEpdcEntity {
      * 父所有部门
      */
 	private String parentDeptNames;
+	/**
+     * 备注  - 关闭原因
+     */
+	private String remark;
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -0,0 +1,48 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+
+/**
+ * 管理端接口
+ *
+ * @author songyunepeng
+ * @Date 2020/6/1 20:22
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+
+    /**
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @Author songyunepeng
+     * @Description 根据部门id获取部门信息
+     * @Date 2020/6/1 20:22
+     **/
+    @GetMapping("/sys/dept/{id}")
+    Result<SysDeptDTO> getSysDeptDTO(@PathVariable("id") Long id);
+
+    /**
+     * 根据部门ID获取上级所有部门信息
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @author gp
+     * @date 2019-11-29
+     */
+    @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author songyunpeng
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+	@Override
+	public Result<SysDeptDTO> getSysDeptDTO(Long id) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysDeptDTO", id);
+	}
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
+    }
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupOfficialsService.java

@@ -92,4 +92,12 @@ public interface PartyGroupOfficialsService extends BaseService<PartyGroupOffici
      * @date 2020-05-29
      */
     void delete(String[] ids);
+    /**
+     * @Description  pc查询网格长列表
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyGroupOfficialsDTO>
+     **/
+    PageData<PartyGroupOfficialsDTO> listPage(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
+import com.elink.esua.epdc.dto.PartyGroupListDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
 
 import java.util.List;
@@ -92,4 +93,12 @@ public interface PartyGroupService extends BaseService<PartyGroupEntity> {
      * @date 2020-05-29
      */
     void delete(String[] ids);
+    /**
+     * @Description  获取网格下所有社群
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [deptId]
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyGroupListDTO>
+     **/
+    List<PartyGroupListDTO> listOfGroupByDeptId(Long deptId);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicCommentService.java

@@ -92,4 +92,12 @@ public interface PartyTopicCommentService extends BaseService<PartyTopicCommentE
      * @date 2020-05-29
      */
     void delete(String[] ids);
+    /**
+     * @Description  党群话题评论列表
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyTopicCommentDTO>
+     **/
+    PageData<PartyTopicCommentDTO> listComments(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java

@@ -19,6 +19,8 @@ package com.elink.esua.epdc.service;
 
 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.GroupTopicCloseFormDTO;
 import com.elink.esua.epdc.dto.PartyTopicDTO;
 import com.elink.esua.epdc.entity.PartyTopicEntity;
 
@@ -92,4 +94,20 @@ public interface PartyTopicService extends BaseService<PartyTopicEntity> {
      * @date 2020-05-29
      */
     void delete(String[] ids);
+    /**
+     * @Description  pc列表 
+     * @Author songyunpeng
+     * @Date  2020/5/29
+     * @Param [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyTopicDTO>
+     **/
+    PageData<PartyTopicDTO> listPage(Map<String, Object> params);
+    /**
+     * @Description  关闭话题
+     * @Author songyunpeng
+     * @Date  2020/6/1
+     * @Param [formDto, oneStr]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result modifyTopicState(GroupTopicCloseFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java

@@ -20,12 +20,18 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyGroupOfficialsDao;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.PartyGroupOfficialsDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.PartyGroupOfficialsEntity;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.PartyGroupOfficialsRedis;
 import com.elink.esua.epdc.service.PartyGroupOfficialsService;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +55,9 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
     @Autowired
     private PartyGroupOfficialsRedis partyGroupOfficialsRedis;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<PartyGroupOfficialsDTO> page(Map<String, Object> params) {
         IPage<PartyGroupOfficialsEntity> page = baseDao.selectPage(
@@ -83,6 +92,28 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyGroupOfficialsDTO dto) {
+        //处理gridID
+        if (dto.getAllDeptIdsShow().size()!= NumConstant.FOUR) {
+            throw new RenException("请选择网格！");
+        }
+        Result<SysDeptDTO> sysDeptDTO = adminFeignClient.getSysDeptDTO(dto.getAllDeptIdsShow().get(NumConstant.THREE));
+        if(!sysDeptDTO.success() || sysDeptDTO.getData()==null){
+            throw new RenException(sysDeptDTO.getMsg());
+        }
+        SysDeptDTO grid = sysDeptDTO.getData();
+        dto.setGrid(grid.getName());
+        dto.setGridId(grid.getId());
+        // 塞入全部部门ids,names
+        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(grid.getId()));
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取用户部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            dto.setAllDeptIds(deptDTO.getAllDeptIds());
+            dto.setAllDeptNames(deptDTO.getAllDeptNames());
+            dto.setParentDeptIds(deptDTO.getParentDeptIds());
+            dto.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
         PartyGroupOfficialsEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupOfficialsEntity.class);
         insert(entity);
     }
@@ -101,4 +132,11 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PageData<PartyGroupOfficialsDTO> listPage(Map<String, Object> params) {
+        IPage<PartyGroupOfficialsDTO> page = getPage(params);
+        List<PartyGroupOfficialsEntity> list = baseDao.selectListOfPartyGroupOfficialsDTO(params);
+        return new PageData<>(ConvertUtils.sourceToTarget(list,PartyGroupOfficialsDTO.class), page.getTotal());
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java

@@ -20,12 +20,18 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyGroupDao;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
+import com.elink.esua.epdc.dto.PartyGroupListDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.PartyGroupRedis;
 import com.elink.esua.epdc.service.PartyGroupService;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +55,9 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
     @Autowired
     private PartyGroupRedis partyGroupRedis;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<PartyGroupDTO> page(Map<String, Object> params) {
         IPage<PartyGroupEntity> page = baseDao.selectPage(
@@ -83,6 +92,24 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyGroupDTO dto) {
+        //赋值部门名称
+        Result<SysDeptDTO> sysDeptDTO = adminFeignClient.getSysDeptDTO(Long.parseLong(dto.getDeptId()));
+        if(!sysDeptDTO.success() || sysDeptDTO.getData()==null){
+            throw new RenException(sysDeptDTO.getMsg());
+        }
+        SysDeptDTO dept = sysDeptDTO.getData();
+        dto.setDept(dept.getName());
+        // 塞入全部部门ids,names
+        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取用户部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            dto.setAllDeptIds(deptDTO.getAllDeptIds());
+            dto.setAllDeptNames(deptDTO.getAllDeptNames());
+            dto.setParentDeptIds(deptDTO.getParentDeptIds());
+            dto.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
         PartyGroupEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupEntity.class);
         insert(entity);
     }
@@ -101,4 +128,10 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PartyGroupListDTO> listOfGroupByDeptId(Long deptId) {
+        return baseDao.selectListOfGroupByDeptId(deptId);
+
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.PartyTopicCommentDao;
 import com.elink.esua.epdc.dto.PartyTopicCommentDTO;
+import com.elink.esua.epdc.dto.comment.TopicCommentListDTO;
 import com.elink.esua.epdc.entity.PartyTopicCommentEntity;
 import com.elink.esua.epdc.redis.PartyTopicCommentRedis;
 import com.elink.esua.epdc.service.PartyTopicCommentService;
@@ -101,4 +102,11 @@ public class PartyTopicCommentServiceImpl extends BaseServiceImpl<PartyTopicComm
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PageData<PartyTopicCommentDTO> listComments(Map<String, Object> params) {
+        IPage<PartyTopicCommentDTO> page = getPage(params);
+        List<PartyTopicCommentDTO> list = baseDao.selectListOfCommentsByTopicId(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java

@@ -23,7 +23,9 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyTopicDao;
+import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO;
 import com.elink.esua.epdc.dto.PartyTopicDTO;
 import com.elink.esua.epdc.entity.PartyTopicEntity;
 import com.elink.esua.epdc.redis.PartyTopicRedis;
@@ -76,8 +78,7 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
 
     @Override
     public PartyTopicDTO get(String id) {
-        PartyTopicEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PartyTopicDTO.class);
+        return  baseDao.selectOneOfPartyTopicDTO(id);
     }
 
     @Override
@@ -101,4 +102,21 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PageData<PartyTopicDTO> listPage(Map<String, Object> params) {
+        IPage<PartyTopicDTO> page = getPage(params);
+        List<PartyTopicEntity> list = baseDao.selectListOfPartyTopicEntity(params);
+        return new PageData<>(ConvertUtils.sourceToTarget(list,PartyTopicDTO.class), page.getTotal());
+    }
+
+    @Override
+    public Result modifyTopicState(GroupTopicCloseFormDTO formDto) {
+        PartyTopicEntity entity = new PartyTopicEntity();
+        entity.setId(formDto.getId());
+        entity.setRemark(formDto.getRemark());
+        entity.setState(20);
+        updateById(entity);
+        return new Result();
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml

@@ -24,4 +24,16 @@
     </resultMap>
 
 
+    <select id="selectListOfGroupByDeptId" resultType="com.elink.esua.epdc.dto.PartyGroupListDTO">
+        SELECT
+            ID AS groupId,
+            PARTY_GROUP_NAME AS partyGroupName
+        FROM
+            epdc_party_group
+        WHERE
+            DEL_FLAG = '0'
+            AND find_in_set(#{deptId},ALL_DEPT_IDS)
+    </select>
+
+
 </mapper>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml

@@ -18,7 +18,39 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="grid" column="GRID"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="gridId" column="GRID_ID"/>
     </resultMap>
 
 
+    <select id="selectListOfPartyGroupOfficialsDTO" resultMap="partyGroupOfficialsMap">
+        select ID,
+           PARTY_GROUP_ID,
+           NAME,
+           MOBILE,
+           MOTTO,
+           DUTY,
+           FACE_IMG,
+           AREA_RESPONSIBILITY,
+           DEL_FLAG,
+           REVISION,
+           CREATED_BY,
+           CREATED_TIME,
+           UPDATED_BY,
+           UPDATED_TIME
+        from epdc_party_group_officials
+        where DEL_FLAG ='0'
+        <if test="partyGroupId!=null and partyGroupId != ''">
+            PARTY_GROUP_ID = #{partyGroupId}
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},ALL_DEPT_IDS))
+        </if>
+    </select>
+
 </mapper>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicCommentDao.xml

@@ -24,5 +24,19 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="selectListOfCommentsByTopicId" resultType="com.elink.esua.epdc.dto.PartyTopicCommentDTO">
+            SELECT
+                t1.ID,
+                t1.CONTENT,
+                t1.CREATED_TIME,
+                t1.USERNAME
+            FROM
+                epdc_party_topic_comment t1
+            WHERE
+                t1.DEL_FLAG = '0'
+                AND t1.TOPIC_ID = #{id}
+            ORDER BY
+                t1.CREATED_TIME DESC
+    </select>
 
 </mapper>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml

@@ -17,7 +17,6 @@
         <result property="topicAddress" column="TOPIC_ADDRESS"/>
         <result property="topicLatitude" column="TOPIC_LATITUDE"/>
         <result property="topicLongitude" column="TOPIC_LONGITUDE"/>
-        <result property="partyGroupName" column="PARTY_GROUP_NAME"/>
         <result property="partyGroupId" column="PARTY_GROUP_ID"/>
         <result property="state" column="STATE"/>
         <result property="commentNum" column="COMMENT_NUM"/>
@@ -36,4 +35,96 @@
     </resultMap>
 
 
+    <select id="selectListOfPartyTopicEntity" resultMap="partyTopicMap">
+        select
+            t.ID,
+            t.USER_ID,
+            t.NICKNAME,
+            t.USER_FACE,
+            t.PARTY_MEMBER,
+            t.MOBILE,
+            t.TOPIC_CONTENT,
+            t.TOPIC_MODULE,
+            t.GRID,
+            t.GRID_ID,
+            t.TOPIC_ADDRESS,
+            t.TOPIC_LATITUDE,
+            t.TOPIC_LONGITUDE,
+            t.PARTY_GROUP_ID,
+            t.STATE,
+            t.COMMENT_NUM,
+            t.SUPPORT_NUM,
+            t.BROWSE_NUM,
+            t.ALL_DEPT_IDS,
+            t.ALL_DEPT_NAMES,
+            t.PARENT_DEPT_IDS,
+            t.PARENT_DEPT_NAMES,
+            t.DEL_FLAG,
+            t.REVISION,
+            t.CREATED_BY,
+            t.CREATED_TIME,
+            t.UPDATED_BY,
+            t.UPDATED_TIME
+        from epdc_party_topic t
+        where t.DEL_FLAG ='0'
+        <if test="partyGroupId!=null and partyGroupId!=''">
+            and t.PARTY_GROUP_ID = #{partyGroupId}
+        </if>
+        <if test="topicModule!=null and topicModule!=''">
+            and t.TOPIC_MODULE = #{topicModule}
+        </if>
+        <if test="startTime != null and startTime != '' ">
+            and t.CREATED_TIME >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != '' ">
+            <![CDATA[ and t.CREATED_TIME <= ]]> #{endTime}
+        </if>
+    </select>
+
+    <resultMap id="topicDetail" type="com.elink.esua.epdc.dto.PartyTopicDTO">
+        <result property="nickname" column="NICKNAME"/>
+        <result property="id" column="ID"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="topicContent" column="TOPIC_CONTENT"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="topicModule" column="TOPIC_MODULE"/>
+        <result property="topicAddress" column="TOPIC_ADDRESS"/>
+        <result property="topicLatitude" column="TOPIC_LATITUDE"/>
+        <result property="topicLongitude" column="TOPIC_LONGITUDE"/>
+        <result property="partyGroupName" column="PARTY_GROUP_NAME"/>
+        <result property="userFace" column="USER_FACE"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
+        <result property="browseNum" column="BROWSE_NUM"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectOneOfPartyTopicDTO" resultMap="topicDetail">
+        select
+            t.ID,
+            t.USER_ID,
+            t.NICKNAME,
+            t.USER_FACE,
+            t.PARTY_MEMBER,
+            t.MOBILE,
+            t.TOPIC_CONTENT,
+            t.TOPIC_MODULE,
+            t.GRID,
+            t.GRID_ID,
+            t.TOPIC_ADDRESS,
+            t.TOPIC_LATITUDE,
+            t.TOPIC_LONGITUDE,
+            t1.PARTY_GROUP_NAME,
+            t.PARTY_GROUP_ID,
+            t2.IMG_URL
+        from epdc_party_topic t
+         left join epdc_party_group t1 on t1.ID = t.PARTY_GROUP_ID and t1.DEL_FLAG='0'
+         left join epdc_party_topic_img t2 on t.ID = t2.REFERENCE_ID and t2.DEL_FLAG='0'
+        where t.DEL_FLAG ='0'
+        and t.ID = #{id}
+    </select>
+
 </mapper>