Browse Source

居民端、工作端获取海报、小组码基本信息

master
sunyuchao 5 years ago
parent
commit
3c50b64f16
  1. 33
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java
  2. 43
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java
  3. 16
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupCodeController.java
  4. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupCodeDao.java
  5. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupCodeService.java
  6. 42
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
  7. 39
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
  8. 8
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  9. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

33
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java

@ -0,0 +1,33 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @description: 获取生成海报(小组码)信息-接口入参
* @author: sun
*/
@Data
public class GroupCodeBasicInfoFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
//@NotBlank(message = "客户id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
private String customerId;
/**
* 网格id
*/
//@NotBlank(message = "网格id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
private String gridId;
/**
* 组id
*/
@NotBlank(message = "群组id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
private String groupId;
public interface GroupCodeInfo {}
}

43
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java

@ -0,0 +1,43 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
/**
* @description: 获取生成海报(小组码)信息-接口入参
* @author: sun
*/
@Data
public class GroupCodeBasicInfoResultDTO implements Serializable {
private static final long serialVersionUID = -1590972041272087570L;
/**
* 小组Id
*/
private String groupId;
/**
* 小组名称
*/
private String groupName;
/**
* 小组头像
*/
private String groupHeadPhoto;
/**
* 小组介绍
*/
private String groupIntroduction;
/**
* 小组二维码路径
*/
private String groupCodeUrl;
/**
* 小组创建人称谓(街道-姓氏+称谓)(南宁路-李先生)
*/
private String showName;
/**
* 小组创建人Id
*/
private String groupUserId;
}

16
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupCodeController.java

@ -19,7 +19,6 @@ package com.epmet.modules.group.controller;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
@ -30,11 +29,11 @@ import com.epmet.modules.group.service.ResiGroupCodeService;
import com.epmet.resi.group.dto.group.ResiGroupCodeDTO; import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map; import java.util.Map;
@ -99,4 +98,15 @@ public class ResiGroupCodeController {
return resiGroupCodeService.getGroupCode(dto); return resiGroupCodeService.getGroupCode(dto);
} }
/**
* @param formDTO
* @Description 获取生成海报(小组码)信息
* @author sun
*/
@PostMapping("groupcodebasicinfo")
public Result<GroupCodeBasicInfoResultDTO> groupCodeBasicInfo(@RequestBody GroupCodeBasicInfoFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, GroupCodeBasicInfoFormDTO.GroupCodeInfo.class);
return new Result<GroupCodeBasicInfoResultDTO>().ok(resiGroupCodeService.groupCodeBasicInfo(formDTO));
}
} }

8
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupCodeDao.java

@ -19,6 +19,8 @@ package com.epmet.modules.group.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.modules.group.entity.ResiGroupCodeEntity; import com.epmet.modules.group.entity.ResiGroupCodeEntity;
import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
@ -30,4 +32,10 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface ResiGroupCodeDao extends BaseDao<ResiGroupCodeEntity> { public interface ResiGroupCodeDao extends BaseDao<ResiGroupCodeEntity> {
/**
* @param formDTO
* @Description 获取生成海报(小组码)信息
* @author sun
*/
GroupCodeBasicInfoResultDTO selectGroupCodeBasicInfo(GroupCodeBasicInfoFormDTO formDTO);
} }

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupCodeService.java

@ -25,6 +25,8 @@ import com.epmet.modules.group.entity.ResiGroupCodeEntity;
import com.epmet.resi.group.dto.group.ResiGroupCodeDTO; import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -114,4 +116,11 @@ public interface ResiGroupCodeService extends BaseService<ResiGroupCodeEntity> {
* @Date 2020/11/16 9:37 * @Date 2020/11/16 9:37
*/ */
Result<String> getGroupCode(GetGroupCodeFormDTO dto); Result<String> getGroupCode(GetGroupCodeFormDTO dto);
/**
* @param formDTO
* @Description 获取生成海报(小组码)信息
* @author sun
*/
GroupCodeBasicInfoResultDTO groupCodeBasicInfo(GroupCodeBasicInfoFormDTO formDTO);
} }

42
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java

@ -23,14 +23,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.enums.EnvEnum;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.CustomerTokensResultDTO; import com.epmet.dto.result.CustomerTokensResultDTO;
import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.OssFeignClient; import com.epmet.feign.OssFeignClient;
import com.epmet.modules.group.dao.ResiGroupCodeDao; import com.epmet.modules.group.dao.ResiGroupCodeDao;
import com.epmet.modules.group.entity.ResiGroupCodeEntity; import com.epmet.modules.group.entity.ResiGroupCodeEntity;
@ -41,6 +45,8 @@ import com.epmet.resi.group.dto.QRCodeMultipartFileDTO;
import com.epmet.resi.group.dto.group.ResiGroupCodeDTO; import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -50,10 +56,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 小组二维码 小组唯一二维码海报码和小组码是同一个二维码长期有效的 * 小组二维码 小组唯一二维码海报码和小组码是同一个二维码长期有效的
@ -72,6 +75,9 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
@Autowired @Autowired
private OssFeignClient ossFeignClient; private OssFeignClient ossFeignClient;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Override @Override
public PageData<ResiGroupCodeDTO> page(Map<String, Object> params) { public PageData<ResiGroupCodeDTO> page(Map<String, Object> params) {
IPage<ResiGroupCodeEntity> page = baseDao.selectPage( IPage<ResiGroupCodeEntity> page = baseDao.selectPage(
@ -251,4 +257,32 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
} }
return resiAccessToken; return resiAccessToken;
} }
/**
* @param formDTO
* @Description 获取生成海报(小组码)信息
* @author sun
*/
@Override
public GroupCodeBasicInfoResultDTO groupCodeBasicInfo(GroupCodeBasicInfoFormDTO formDTO) {
//1.获取小组基本信息
GroupCodeBasicInfoResultDTO resultDTO = baseDao.selectGroupCodeBasicInfo(formDTO);
if (null == resultDTO) {
logger.error(String.format("获取小组码基本信息失败,小组Id:%s", formDTO.getGroupId()));
throw new RenException("获取小组码基本信息失败");
}
//2.获取小组创建人称谓信息
UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
List<String> userIdList = new ArrayList<>();
userIdList.add(resultDTO.getGroupUserId());
userResiInfoListFormDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> resultList = epmetUserOpenFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
if (!resultList.success() || null == resultList.getData() || resultList.getData().size() < NumConstant.ONE) {
logger.error(String.format("调用user服务,查询用户基本信息失败,userId:%s", resultDTO.getGroupUserId()));
throw new RenException("获取小组创建人基本信息失败");
}
resultDTO.setShowName(resultList.getData().get(NumConstant.ZERO).getShowName());
return resultDTO;
}
} }

39
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml

@ -1,22 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.resi.group.dto.group.ResiGroupCodeDTO"> <mapper namespace="com.epmet.modules.group.dao.ResiGroupCodeDao">
<resultMap type="com.epmet.modules.group.entity.ResiGroupCodeEntity" id="resiGroupCodeMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="gridId" column="GRID_ID"/>
<result property="groupId" column="GROUP_ID"/>
<result property="type" column="TYPE"/>
<result property="url" column="URL"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<select id="selectGroupCodeBasicInfo" resultType="com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO">
SELECT
rgc.GROUP_ID AS "groupId",
rgc.URL AS "groupCodeUrl",
rg.GROUP_NAME AS "groupName",
rg.GROUP_HEAD_PHOTO AS "groupHeadPhoto",
rg.GROUP_INTRODUCTION AS "groupIntroduction",
rg.CREATED_BY AS "groupUserId"
FROM
resi_group_code rgc
INNER JOIN resi_group rg ON rgc.GROUP_ID = rg.ID
WHERE
rgc.DEL_FLAG = '0'
AND rg.DEL_FLAG = '0'
AND rgc.GROUP_ID = #{groupId}
<if test='null != customerId and "" != customerId'>
and rgc.customer_id = #{customerId}
</if>
<if test='null != gridId and "" != gridId'>
and rgc.grid_id = #{gridId}
</if>
</select>
</mapper> </mapper>

8
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@ -334,4 +334,12 @@ public interface EpmetUserOpenFeignClient {
*/ */
@PostMapping("/epmetuser/customerstaff/getstaffbasicinfo") @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO); Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
/**
* 根据userId集合查询用户注册信息
* @author sun
*/
@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
} }

5
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@ -225,4 +225,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
public Result<BasicInfoResultDTO> getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) { public Result<BasicInfoResultDTO> getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO); return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
} }
@Override
public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
}
} }

Loading…
Cancel
Save