diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/pom.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/pom.xml index 2d19acc1..a0128cb9 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/pom.xml @@ -5,7 +5,7 @@ com.esua.epdc - epdc-party-group + epdc-partygroup 1.0.0 diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java new file mode 100644 index 00000000..5f297632 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupListDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupListDTO.java new file mode 100644 index 00000000..1b1321cc --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java index a8d3402a..ec67fd87 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java +++ b/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 allDeptIdsShow; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyTopicDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyTopicDTO.java index 7acf53e3..50cafc59 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyTopicDTO.java +++ b/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 images; + + /** + * 备注 - 关闭原因 + */ + private String remark; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml index fe7605d5..37b10251 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml @@ -139,7 +139,7 @@ epdc!redis@master1405 - + jinshui jinshui@833066 @@ -164,7 +164,7 @@ epdc!redis@master1405 - + jinshui jinshui@833066 @@ -197,7 +197,7 @@ - + epdc Elink@833066 diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/PartyGroupApplication.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/PartyGroupApplication.java index 47b0c7e3..c96af0ff 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/PartyGroupApplication.java +++ b/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 diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java index 2e08f02f..c2c1c212 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java +++ b/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"; } } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java index 9ad6eac4..0b44bf08 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java +++ b/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> + **/ + @GetMapping("groupList") + public Result> groupList() { + List data = partyGroupService.listOfGroupByDeptId(SecurityUser.getDeptId()); + return new Result>().ok(data); + } + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupOfficialsController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupOfficialsController.java index bf21b9bb..dc45893b 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupOfficialsController.java +++ b/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> page(@RequestParam Map params){ - PageData page = partyGroupOfficialsService.page(params); + public Result> page(@RequestParam Map params) { + PageData page = partyGroupOfficialsService.listPage(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { PartyGroupOfficialsDTO data = partyGroupOfficialsService.get(id); return new Result().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); diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicCommentController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicCommentController.java index 86cc4597..3645d21b 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicCommentController.java +++ b/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 params, HttpServletResponse response) throws Exception { List list = partyTopicCommentService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, PartyTopicCommentExcel.class); } + + /** + * + * 评论列表 + * + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/11/12 10:37 + */ + @GetMapping("comments") + public Result> commentsList(@RequestParam Map params) { + PageData page = partyTopicCommentService.listComments(params); + return new Result>().ok(page); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java index ef742a9e..1b492736 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java +++ b/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> page(@RequestParam Map params){ - PageData page = partyTopicService.page(params); + PageData page = partyTopicService.listPage(params); return new Result>().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); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java index e854dd0a..377bff17 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java +++ b/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 { - + /** + * @Description 获取网格下所有社群 + * @Author songyunpeng + * @Date 2020/5/29 + * @Param [deptId] + * @return java.util.List + **/ + List selectListOfGroupByDeptId(Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java index 720e3809..0b79b1b8 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java +++ b/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 { - + /** + * @Description 查询列表 + * @Author songyunpeng + * @Date 2020/5/29 + * @Param [params] + * @return java.util.List + **/ + List selectListOfPartyGroupOfficialsDTO(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicCommentDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicCommentDao.java index 36d95dfe..40565353 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicCommentDao.java +++ b/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 { - + /** + * @Description 评论列表 + * @Author songyunpeng + * @Date 2020/5/29 + * @Param [params] + * @return java.util.List + **/ + List selectListOfCommentsByTopicId(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java index 497ff965..ec66a1fd 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java +++ b/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 { - + /** + * @Description pc列表 + * @Author songyunpeng + * @Date 2020/5/29 + * @Param [params] + * @return java.util.List + **/ + List selectListOfPartyTopicEntity(Map params); + + + /** + * @Description 查看详情 + * @Author songyunpeng + * @Date 2020/5/29 + * @Param [params] + * @return java.util.List + **/ + PartyTopicDTO selectOneOfPartyTopicDTO(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java index 0d505693..7a3b0ff1 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java +++ b/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; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java index 8d2d8381..cdfeadba 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyTopicEntity.java +++ b/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; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java new file mode 100644 index 00000000..ed3e7616 --- /dev/null +++ b/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 + * @Author songyunepeng + * @Description 根据部门id获取部门信息 + * @Date 2020/6/1 20:22 + **/ + @GetMapping("/sys/dept/{id}") + Result getSysDeptDTO(@PathVariable("id") Long id); + + /** + * 根据部门ID获取上级所有部门信息 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author gp + * @date 2019-11-29 + */ + @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") String deptId); +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 00000000..2e80c80d --- /dev/null +++ b/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 getSysDeptDTO(Long id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysDeptDTO", id); + } + @Override + public Result getParentAndAllDept(String depId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId); + } +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupOfficialsService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupOfficialsService.java index 69c7f180..3cec1c29 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupOfficialsService.java +++ b/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 + **/ + PageData listPage(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java index c6d910c4..44f5e1cb 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java +++ b/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 { * @date 2020-05-29 */ void delete(String[] ids); + /** + * @Description 获取网格下所有社群 + * @Author songyunpeng + * @Date 2020/5/29 + * @Param [deptId] + * @return java.util.List + **/ + List listOfGroupByDeptId(Long deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicCommentService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicCommentService.java index 6c333107..50376e45 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicCommentService.java +++ b/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 + **/ + PageData listComments(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java index d794610e..9a1beccb 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java +++ b/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 { * @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 + **/ + PageData listPage(Map params); + /** + * @Description 关闭话题 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [formDto, oneStr] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result modifyTopicState(GroupTopicCloseFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java index 56f37fc9..04c45178 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java +++ b/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 page(Map params) { IPage page = baseDao.selectPage( @@ -83,6 +92,28 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl 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 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 listPage(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListOfPartyGroupOfficialsDTO(params); + return new PageData<>(ConvertUtils.sourceToTarget(list,PartyGroupOfficialsDTO.class), page.getTotal()); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index 03e667ab..bba4ca6b 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/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 page(Map params) { IPage page = baseDao.selectPage( @@ -83,6 +92,24 @@ public class PartyGroupServiceImpl extends BaseServiceImpl 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 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 listOfGroupByDeptId(Long deptId) { + return baseDao.selectListOfGroupByDeptId(deptId); + + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java index 7cdd4502..6dbdbb1a 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java +++ b/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 listComments(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListOfCommentsByTopicId(params); + return new PageData<>(list, page.getTotal()); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java index 3fad7b69..960ff044 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java +++ b/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 listPage(Map params) { + IPage page = getPage(params); + List 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(); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml index 212f652e..6fc62dd4 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml @@ -24,4 +24,16 @@ + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml index a5f08f1f..545ea238 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml @@ -18,7 +18,39 @@ + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicCommentDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicCommentDao.xml index 1b8cdad9..59f6c491 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicCommentDao.xml @@ -24,5 +24,19 @@ + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml index 01dd01ca..90bcb1b7 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml @@ -17,7 +17,6 @@ - @@ -36,4 +35,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file