diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java index ebc3ca20..eb52294b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java @@ -4,10 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO; -import com.elink.esua.epdc.dto.result.PartyGroupResultDTO; -import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; -import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.service.PartyGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -164,4 +161,16 @@ public class ApiPartyGroupController { return partyGroupService.joinGroup(userDetail, formDto); } + /** + * 获取当天(周几)的-论坛指南信息 + * @param partyGroupId 党群ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 13:48 2020-06-17 + **/ + @GetMapping("group/guideInfo/{partyGroupId}") + public Result guideInfo(@PathVariable("partyGroupId") String partyGroupId){ + return partyGroupService.getGuideInfo(partyGroupId); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java index ba8e869c..9c3ff09b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java @@ -3,10 +3,7 @@ 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.form.*; -import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO; -import com.elink.esua.epdc.dto.result.PartyGroupResultDTO; -import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; -import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.feign.fallback.PartyGroupFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -144,4 +141,14 @@ public interface PartyGroupFeignClient { @GetMapping(value = "partyGroup/topic/myTopicList", consumes = MediaType.APPLICATION_JSON_VALUE) Result myTopicList(MyPartyTopicFormDTO formDto); + + /** + * 获取论坛指南信息 + * @param partyGroupId 党群ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 13:48 2020-06-17 + **/ + @GetMapping(value = "partyGroup/epdc-app/partygroupguide/group/guideInfo/{partyGroupId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getGuideInfo(@PathVariable("partyGroupId") String partyGroupId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java index 97998906..1f2c6b9d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java @@ -4,10 +4,7 @@ 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.form.*; -import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO; -import com.elink.esua.epdc.dto.result.PartyGroupResultDTO; -import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; -import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.feign.PartyGroupFeignClient; import org.springframework.stereotype.Component; @@ -85,4 +82,9 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient { public Result myTopicList(MyPartyTopicFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "myTopicList",formDto); } + + @Override + public Result getGuideInfo(String partyGroupId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "getGuideInfo",partyGroupId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java index eb5ac438..c2af06e0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java @@ -3,10 +3,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO; -import com.elink.esua.epdc.dto.result.PartyGroupResultDTO; -import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; -import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; +import com.elink.esua.epdc.dto.result.*; import java.util.List; @@ -18,7 +15,7 @@ import java.util.List; public interface PartyGroupService { /** - * @Description 党群列表接口 + * @Description 党群列表接口 * @Author songyunpeng * @Date 2020/6/3 * @Param [] @@ -26,7 +23,7 @@ public interface PartyGroupService { **/ Result> groupList(TokenDto userDetail); /** - * @Description 网格长列表 + * @Description 网格长列表 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDTO] @@ -34,7 +31,7 @@ public interface PartyGroupService { **/ Result> officialsList(TokenDto userDetail, PartyGroupOfficialsFormDTO formDTO); /** - * @Description 评论 + * @Description 评论 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -42,7 +39,7 @@ public interface PartyGroupService { **/ Result commentSubmit(TokenDto userDetail, PartyTopicCommentFormDTO formDto); /** - * @Description 话题列表 + * @Description 话题列表 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -50,7 +47,7 @@ public interface PartyGroupService { **/ Result topicList(TokenDto userDetail, PartyTopicFormDTO formDto); /** - * @Description 发布话题 + * @Description 发布话题 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -58,7 +55,7 @@ public interface PartyGroupService { **/ Result topicSubmit(TokenDto userDetail, PartyTopicSubmitFormDTO formDto); /** - * @Description 话题(赞/踩)接口 + * @Description 话题(赞/踩)接口 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -66,7 +63,7 @@ public interface PartyGroupService { **/ Result topicStatement(TokenDto userDetail, TopicStatementFormDTO formDto); /** - * @Description 群成员列表 + * @Description 群成员列表 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -74,7 +71,7 @@ public interface PartyGroupService { **/ Result userList(TokenDto userDetail, PartyUserGroupFormDTO formDto); /** - * @Description 当前用户在群里的信息 + * @Description 当前用户在群里的信息 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -82,7 +79,7 @@ public interface PartyGroupService { **/ Result currentUserInfo(String partyGroupId); /** - * @Description 禁言 + * @Description 禁言 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -90,7 +87,7 @@ public interface PartyGroupService { **/ Result banned( PartyUserBannedFormDTO formDto); /** - * @Description 身份认证 + * @Description 身份认证 * @Author songyunpeng * @Date 2020/6/3 * @Param [userDetail, formDto] @@ -98,7 +95,7 @@ public interface PartyGroupService { **/ Result modifyIdentity(PartyUserIdentityFormDTO formDto); /** - * @Description 加入党群 + * @Description 加入党群 * @Author songyunpeng * @Date 2020/6/4 * @Param [userDetail, formDto] @@ -106,11 +103,20 @@ public interface PartyGroupService { **/ Result joinGroup(TokenDto userDetail, PartyUserJoinGroupFormDTO formDto); /** - * @Description 我的话题列表 + * @Description 我的话题列表 * @Author songyunpeng * @Date 2020/6/11 * @Param [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result myTopicList(TokenDto userDetail, MyPartyTopicFormDTO formDto); + + /** + * 获取论坛指南信息 + * @param partyGroupId 党群ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 13:48 2020-06-17 + **/ + Result getGuideInfo(String partyGroupId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index c1a08107..07921088 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java @@ -4,10 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO; -import com.elink.esua.epdc.dto.result.PartyGroupResultDTO; -import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; -import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.PartyGroupFeignClient; import com.elink.esua.epdc.service.PartyGroupService; @@ -154,4 +151,9 @@ public class PartyGroupServiceImpl implements PartyGroupService { formDto.setUserId(userDetail.getUserId()); } return partyGroupFeignClient.myTopicList(formDto); } + + @Override + public Result getGuideInfo(String partyGroupId) { + return partyGroupFeignClient.getGuideInfo(partyGroupId); + } } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyGroupGuideResultDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyGroupGuideResultDTO.java new file mode 100644 index 00000000..5fc02c48 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyGroupGuideResultDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 获取当天(周几)的-论坛指南信息 返回值 + * + * @author zhangyong + * @since v1.0.0 2020-06-17 + */ +@Data +public class EpdcPartyGroupGuideResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 党群指南 内容 + */ + private String content; +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/EpdcPartyGroupGuideController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/EpdcPartyGroupGuideController.java new file mode 100644 index 00000000..a7373765 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/EpdcPartyGroupGuideController.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.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.result.EpdcPartyGroupGuideResultDTO; +import com.elink.esua.epdc.service.PartyGroupGuideService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 党群指南 app接口 + * + * @author zhangyong + * @since v1.0.0 2020-06-16 + */ +@RestController +@RequestMapping(Constant.EPDC_APP + "partygroupguide") +public class EpdcPartyGroupGuideController { + + @Autowired + private PartyGroupGuideService partyGroupGuideService; + + /** + * 获取当天(周几)的-论坛指南信息 + * @param partyGroupId 党群ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 13:48 2020-06-17 + **/ + @GetMapping("group/guideInfo/{partyGroupId}") + public Result guideInfo(@PathVariable("partyGroupId") String partyGroupId){ + return partyGroupGuideService.getGuideInfo(partyGroupId); + } +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupGuideDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupGuideDao.java index 146feb34..d47446f2 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupGuideDao.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupGuideDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PartyGroupGuideDTO; +import com.elink.esua.epdc.dto.result.EpdcPartyGroupGuideResultDTO; import com.elink.esua.epdc.entity.PartyGroupGuideEntity; import org.apache.ibatis.annotations.Mapper; @@ -51,4 +52,13 @@ public interface PartyGroupGuideDao extends BaseDao { * @Date 09:35 2020-06-17 **/ List selectPartyGroupGuideByDayOfWeek(String dayOfWeek); + + /** + * 获取论坛指南信息 + * @param partyGroupId 党群ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 13:48 2020-06-17 + **/ + EpdcPartyGroupGuideResultDTO selectOneGuideInfo(String partyGroupId); } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupGuideService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupGuideService.java index ef2219f7..b7f9dbb9 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupGuideService.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupGuideService.java @@ -21,6 +21,7 @@ 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.PartyGroupGuideDTO; +import com.elink.esua.epdc.dto.result.EpdcPartyGroupGuideResultDTO; import com.elink.esua.epdc.entity.PartyGroupGuideEntity; import java.util.List; @@ -93,4 +94,13 @@ public interface PartyGroupGuideService extends BaseService + * @Author zhangyong + * @Date 13:48 2020-06-17 + **/ + Result getGuideInfo(String partyGroupId); } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupGuideServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupGuideServiceImpl.java index 71c92327..0d94c070 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupGuideServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupGuideServiceImpl.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.dao.PartyGroupGuideDao; import com.elink.esua.epdc.dto.PartyGroupGuideDTO; import com.elink.esua.epdc.dto.PartyGroupGuideRelationDTO; import com.elink.esua.epdc.dto.enums.DayOfWeekEnum; +import com.elink.esua.epdc.dto.result.EpdcPartyGroupGuideResultDTO; import com.elink.esua.epdc.entity.PartyGroupGuideEntity; import com.elink.esua.epdc.redis.PartyGroupGuideRedis; import com.elink.esua.epdc.service.PartyGroupGuideRelationService; @@ -178,4 +179,10 @@ public class PartyGroupGuideServiceImpl extends BaseServiceImpl getGuideInfo(String partyGroupId) { + EpdcPartyGroupGuideResultDTO dto = baseDao.selectOneGuideInfo(partyGroupId); + return new Result().ok(dto); + } } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml index 26cd496f..811c7e7f 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml @@ -46,4 +46,14 @@ WHERE DAY_OF_WEEK = #{dayOfWeek} AND DEL_FLAG = 0 + +