活动类别字典

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 002、活动类别下拉框查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 14:16
+ */
+@Data
+public class ActCategoryFormDTO implements Serializable {
+
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 组Id
+     */
+    @NotBlank(message = "categoryCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
+    private String categoryCode;
+
+    @NotBlank(message = "tokenDto获取customerId为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActMenuFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 001、活动类别列表 入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:13
+ */
+@Data
+public class ActMenuFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 组Id
+     */
+    @NotBlank(message = "groupId不能为空", groups =AddUserInternalGroup.class)
+    private String groupId;
+
+    @NotBlank(message = "tokenDto获取customerId为空", groups =AddUserInternalGroup.class)
+    private String customerId;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActMenuResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.resi.group.dto.act.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 001、活动类别列表 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:14
+ */
+@Data
+public class ActMenuResultDTO implements Serializable {
+    private static final long serialVersionUID = 7376609450780826924L;
+
+    /**
+     * 活动应参加人数
+     */
+    private Integer shouldAttend;
+
+    /**
+     * 一级菜单列表
+     */
+    private List<CategoryDTO> categoryList;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryCodeResultDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.resi.group.dto.act.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  002、活动类别下拉框查询 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 14:18
+ */
+@Data
+public class CategoryCodeResultDTO implements Serializable {
+    private static final long serialVersionUID = 8615713807759844661L;
+    @JsonIgnore
+    private String customerId;
+    private String categoryCode;
+    private String categoryName;
+    private String parentCode;
+    private List<CategoryCodeResultDTO> children;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.resi.group.dto.act.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 001、活动类别列表 返参-一级类别信息
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:28
+ */
+@Data
+public class CategoryDTO implements Serializable {
+    private String categoryCode;
+    private String categoryName;
+    private String parentCode;
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCategoryDictController.java

@@ -17,11 +17,23 @@
 
 package com.epmet.modules.act.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.act.service.ActCategoryDictService;
+import com.epmet.resi.group.dto.act.form.ActCategoryFormDTO;
+import com.epmet.resi.group.dto.act.form.ActMenuFormDTO;
+import com.epmet.resi.group.dto.act.result.ActMenuResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * 活动类别字典
@@ -37,4 +49,33 @@ public class ActCategoryDictController {
     private ActCategoryDictService actCategoryDictService;
 
 
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActMenuResultDTO>
+     * @author yinzuomei
+     * @description 001、活动类别列表
+     * @Date 2021/4/19 13:25
+     **/
+    @PostMapping("menulist")
+    public Result<ActMenuResultDTO> queryMenuList(@LoginUser TokenDto tokenDto, @RequestBody ActMenuFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, ActMenuFormDTO.AddUserInternalGroup.class);
+        return new Result<ActMenuResultDTO>().ok(actCategoryDictService.queryMenuList(formDTO));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO>>
+     * @param tokenDto
+     * @param formDTO
+     * @author yinzuomei
+     * @description 002、活动类别下拉框查询
+     * @Date 2021/4/19 14:22 
+     **/
+    @PostMapping("categorylist")
+    public Result<List<CategoryCodeResultDTO>> queryCategoryList(@LoginUser TokenDto tokenDto, @RequestBody ActCategoryFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, ActCategoryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<CategoryCodeResultDTO>>().ok(actCategoryDictService.queryCategoryList(formDTO));
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCategoryDictDao.java

@@ -19,7 +19,12 @@ package com.epmet.modules.act.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.act.entity.ActCategoryDictEntity;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 活动类别字典
@@ -30,4 +35,21 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ActCategoryDictDao extends BaseDao<ActCategoryDictEntity> {
 
+    /**
+     * 查询一级类别
+     *
+     * @param customerId
+     * @return com.epmet.resi.group.dto.act.result.CategoryDTO
+     */
+    List<CategoryDTO> selectFirstLevelCategory(String customerId);
+
+    /**
+     * 查询一级类别
+     *
+     * @param parentCode
+     * @param customerId
+     * @return com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO
+     */
+    List<CategoryCodeResultDTO> selectCategoryList(@Param("parentCode") String parentCode,
+                                                   @Param("customerId") String customerId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCategoryDictService.java

@@ -19,6 +19,12 @@ package com.epmet.modules.act.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.modules.act.entity.ActCategoryDictEntity;
+import com.epmet.resi.group.dto.act.form.ActCategoryFormDTO;
+import com.epmet.resi.group.dto.act.form.ActMenuFormDTO;
+import com.epmet.resi.group.dto.act.result.ActMenuResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+
+import java.util.List;
 
 /**
  * 活动类别字典
@@ -28,4 +34,19 @@ import com.epmet.modules.act.entity.ActCategoryDictEntity;
  */
 public interface ActCategoryDictService extends BaseService<ActCategoryDictEntity> {
 
+    /**
+     * 001、活动类别列表
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActMenuResultDTO
+     */
+    ActMenuResultDTO queryMenuList(ActMenuFormDTO formDTO);
+
+    /**
+     * 002、活动类别下拉框查询
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO
+     */
+    List<CategoryCodeResultDTO> queryCategoryList(ActCategoryFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java

@@ -21,16 +21,64 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.modules.act.dao.ActCategoryDictDao;
 import com.epmet.modules.act.entity.ActCategoryDictEntity;
 import com.epmet.modules.act.service.ActCategoryDictService;
+import com.epmet.modules.constant.GroupActConstant;
+import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.resi.group.dto.act.form.ActCategoryFormDTO;
+import com.epmet.resi.group.dto.act.form.ActMenuFormDTO;
+import com.epmet.resi.group.dto.act.result.ActMenuResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 活动类别字典
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-04-16
  */
+@Slf4j
 @Service
 public class ActCategoryDictServiceImpl extends BaseServiceImpl<ActCategoryDictDao, ActCategoryDictEntity> implements ActCategoryDictService {
 
+    @Autowired
+    private ResiGroupMemberService resiGroupMemberService;
+
+
+    /**
+     * 001、活动类别列表
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActMenuResultDTO
+     */
+    @Override
+    public ActMenuResultDTO queryMenuList(ActMenuFormDTO formDTO) {
+        ActMenuResultDTO resultDTO = new ActMenuResultDTO();
+        resultDTO.setShouldAttend(resiGroupMemberService.selectCountMember(formDTO.getGroupId()));
+        List<CategoryDTO> categoryList = baseDao.selectFirstLevelCategory(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(categoryList)) {
+            categoryList = baseDao.selectFirstLevelCategory(GroupActConstant.DEFAULT_CUSTOMER_ID);
+        }
+        resultDTO.setCategoryList(categoryList);
+        return resultDTO;
+    }
 
+    /**
+     * 002、活动类别下拉框查询
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO
+     */
+    @Override
+    public List<CategoryCodeResultDTO> queryCategoryList(ActCategoryFormDTO formDTO) {
+        List<CategoryCodeResultDTO> list = baseDao.selectCategoryList(formDTO.getCategoryCode(), formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(list)) {
+            list = baseDao.selectCategoryList(formDTO.getCategoryCode(), GroupActConstant.DEFAULT_CUSTOMER_ID);
+        }
+        return list;
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/GroupActConstant.java

@@ -0,0 +1,11 @@
+package com.epmet.modules.constant;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:41
+ */
+public interface GroupActConstant {
+    String DEFAULT_CUSTOMER_ID = "default";
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@@ -144,4 +144,13 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Date 2021/4/6 12:50
 	 **/
     List<ResiGroupMemberDTO> queryMemberRemovedRecs(@Param("groupId")String groupId, @Param("userId")String userId);
+
+    /**
+     * @return java.lang.Integer
+     * @param groupId
+     * @author yinzuomei
+     * @description 查询组内成员总数
+     * @Date 2021/4/19 13:54
+     **/
+	Integer selectCountMember(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java

@@ -225,4 +225,13 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Date 2021/4/6 12:48
      **/
     List<ResiGroupMemberDTO> queryMemberRemovedRecs(String groupId, String userId);
+
+    /**
+     * @return java.lang.Integer
+     * @param groupId
+     * @author yinzuomei
+     * @description 查询组内成员总数
+     * @Date 2021/4/19 13:53
+     **/
+    Integer selectCountMember(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -339,6 +339,18 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		return baseDao.queryMemberRemovedRecs(groupId,userId);
 	}
 
+	/**
+	 * @param groupId
+	 * @return java.lang.Integer
+	 * @author yinzuomei
+	 * @description 查询组内成员总数
+	 * @Date 2021/4/19 13:53
+	 **/
+	@Override
+	public Integer selectCountMember(String groupId) {
+		return baseDao.selectCountMember(groupId);
+	}
+
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCategoryDictDao.xml

@@ -2,7 +2,45 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.modules.act.dao.ActCategoryDictDao">
+        <!--   查询一级类别  -->
+        <select id="selectFirstLevelCategory" resultType="com.epmet.resi.group.dto.act.result.CategoryDTO" parameterType="java.lang.String">
+                SELECT
+                    acd.CATEGORY_CODE as categoryCode,
+                    acd.CATEGORY_NAME as categoryName,
+                    acd.PARENT_CODE as parentCode
+                FROM
+                    act_category_dict acd
+                WHERE
+                    acd.DEL_FLAG = '0'
+                    AND acd.CUSTOMER_ID = #{customerId}
+                    AND acd.`LEVEL` = '1'
+                    order by acd.sort asc
+        </select>
 
+    <resultMap id="CategoryCodeResultMap" type="com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO">
+        <result property="customerId" column="CUSTOMER_ID"></result>
+        <result property="categoryCode" column="CATEGORY_CODE"></result>
+        <result property="categoryName" column="CATEGORY_NAME"></result>
+        <result property="parentCode" column="PARENT_CODE"></result>
+        <collection property="children" column="{parentCode=CATEGORY_CODE,customerId=CUSTOMER_ID}"
+        ofType="com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO"
+        select="selectCategoryList">
+        </collection>
+    </resultMap>
+
+    <select id="selectCategoryList" parameterType="map" resultMap="CategoryCodeResultMap">
+        SELECT
+            acd.CUSTOMER_ID,
+            acd.CATEGORY_CODE,
+            acd.CATEGORY_NAME,
+            acd.PARENT_CODE
+        FROM
+            act_category_dict acd
+        WHERE
+            acd.PARENT_CODE = #{parentCode}
+            AND acd.CUSTOMER_ID = #{customerId}
+            ORDER BY ACD.SORT ASC
+    </select>
 
 
 </mapper>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@@ -191,4 +191,15 @@
         ORDER BY
             rgm.CREATED_TIME DESC
     </select>
+
+    <!--    查询组内成员总数 -->
+    <select id="selectCountMember" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            resi_group_member rgm
+        WHERE
+            rgm.RESI_GROUP_ID = #{groupId}
+            AND rgm.DEL_FLAG = '0'
+    </select>
 </mapper>