diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CustomerHeartConfigsResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CustomerHeartConfigsResultDTO.java new file mode 100644 index 0000000000..d1a5c05b6c --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CustomerHeartConfigsResultDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.result.work; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/21 12:45 + */ +@Data +public class CustomerHeartConfigsResultDTO implements Serializable { + /** + * act_customized主键 + */ + @JsonIgnore + private String actCustomizedId; + + /** + * 标题:志愿者去哪儿 + */ + private String titleName; + + /** + * 咨询热线 + */ + private String hotLine; + + /** + * 活动列表 + */ + private String actListName; + + /** + * 爱心榜 + */ + private String heartRankName; + + /** + * 活动回顾 + */ + private String actReviewName; + + /** + * 我的活动 + */ + private String myActName; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java index c65621aae9..a2ce0f1972 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.work.ActCustomizedFormDTO; import com.epmet.dto.form.work.SaveActCustomizedFormDTO; import com.epmet.dto.result.work.ActCustomizedResultDTO; +import com.epmet.dto.result.work.CustomerHeartConfigsResultDTO; import com.epmet.service.ActCustomizedService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -70,4 +71,18 @@ public class ActCustomizedController { actCustomizedService.saveConfigs(formDTO); return new Result(); } + + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 居民端根据客户id获取爱心互助自定义配置 + * @Date 2020/7/21 12:47 + **/ + @PostMapping("/resi/getconfigs") + public Result getCustomerHeartConfigs(@RequestBody ActCustomizedFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ActCustomizedFormDTO.AddUserInternalGroup.class); + CustomerHeartConfigsResultDTO resultDTO = actCustomizedService.getCustomerHeartConfigs(formDTO); + return new Result().ok(resultDTO); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActCustomizedDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActCustomizedDao.java index 80a94700f9..440c2cb81f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActCustomizedDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActCustomizedDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.work.ActCustomizedResultDTO; +import com.epmet.dto.result.work.CustomerHeartConfigsResultDTO; import com.epmet.entity.ActCustomizedEntity; import org.apache.ibatis.annotations.Mapper; @@ -39,4 +40,13 @@ public interface ActCustomizedDao extends BaseDao { * @Date 2020/7/20 17:04 **/ ActCustomizedResultDTO selectConfigsByCustomerId(String customerId); + + /** + * @return com.epmet.dto.result.work.CustomerHeartConfigsResultDTO + * @param customerId + * @author yinzuomei + * @description 居民端根据客户id获取爱心互助自定义配置 + * @Date 2020/7/21 12:48 + **/ + CustomerHeartConfigsResultDTO selectCustomerHeartConfigs(String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActCustomizedService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActCustomizedService.java index 3d539c4076..7c56084f81 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActCustomizedService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActCustomizedService.java @@ -23,6 +23,7 @@ import com.epmet.dto.ActCustomizedDTO; import com.epmet.dto.form.work.ActCustomizedFormDTO; import com.epmet.dto.form.work.SaveActCustomizedFormDTO; import com.epmet.dto.result.work.ActCustomizedResultDTO; +import com.epmet.dto.result.work.CustomerHeartConfigsResultDTO; import com.epmet.entity.ActCustomizedEntity; import java.util.List; @@ -113,4 +114,13 @@ public interface ActCustomizedService extends BaseService { * @Date 2020/7/20 17:26 **/ void saveConfigs(SaveActCustomizedFormDTO formDTO); + + /** + * @return com.epmet.dto.result.work.CustomerHeartConfigsResultDTO + * @param formDTO + * @author yinzuomei + * @description 居民端根据客户id获取爱心互助自定义配置 + * @Date 2020/7/21 12:47 + **/ + CustomerHeartConfigsResultDTO getCustomerHeartConfigs(ActCustomizedFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActCustomizedServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActCustomizedServiceImpl.java index d3f5539d70..1cd0baa3df 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActCustomizedServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActCustomizedServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dto.ActCustomizedDTO; import com.epmet.dto.form.work.ActCustomizedFormDTO; import com.epmet.dto.form.work.SaveActCustomizedFormDTO; import com.epmet.dto.result.work.ActCustomizedResultDTO; +import com.epmet.dto.result.work.CustomerHeartConfigsResultDTO; import com.epmet.entity.ActCustomizedEntity; import com.epmet.redis.ActCustomizedRedis; import com.epmet.service.ActCustomizedService; @@ -158,4 +159,17 @@ public class ActCustomizedServiceImpl extends BaseServiceImpl + + + + \ No newline at end of file