Browse Source

家庭成员增删改查

dev
Jackwang 3 years ago
parent
commit
2a1ba5e488
  1. 42
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/HomeMemberOperationEnum.java
  2. 7
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java
  3. 25
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmGetDTO.java
  4. 165
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
  5. 75
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
  6. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java
  7. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
  8. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserConfirmEntity.java
  9. 41
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java
  10. 59
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
  11. 9
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml
  12. 17
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

42
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/HomeMemberOperationEnum.java

@ -0,0 +1,42 @@
package com.epmet.commons.tools.enums;
/**
* 组织级别枚举类
* dev|test|prod
*
* @author jianjun liu
* @date 2020-07-03 11:14
**/
public enum HomeMemberOperationEnum {
ADD("add", "新增"),
UPDATE("update", "修改"),
DELETE("delele", "删除");
private String code;
private String name;
HomeMemberOperationEnum(String code, String name) {
this.code = code;
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

7
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java

@ -1,8 +1,9 @@
package com.epmet.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
@ -144,7 +145,7 @@ public class IcResiUserConfirmDTO implements Serializable {
/**
* ic_resi_user表id
*/
private String icUserId;
private String icResiUserId;
/**
* 操作类型新增add 修改 update 删除 delete
@ -161,4 +162,4 @@ public class IcResiUserConfirmDTO implements Serializable {
*/
private String operationDescribe;
}
}

25
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmGetDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 查询家庭成员信息
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-01
*/
@Data
public class IcResiUserConfirmGetDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ic_resi_user表id
*/
private String icResiUserId;
}

165
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java

@ -0,0 +1,165 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 居民信息审核表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-01
*/
@Data
public class IcResiUserConfirmSubmitDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 组织Id
*/
private String agencyId;
/**
* 组织的pids
*/
private String pids;
/**
* 网格ID
*/
private String gridId;
/**
*
*/
private String surname;
/**
*
*/
private String name;
/**
* 手机号
*/
private String mobile;
/**
* 性别
*/
private String gender;
/**
* 身份证号
*/
private String idCard;
/**
* 出生日期
*/
private String birthday;
/**
* 户籍所在地地区码
*/
private String hjszdCode;
/**
* 户籍所在地
*/
private String hjszd;
/**
* 现居住地地区码
*/
private String xjzdCode;
/**
* 现居住地
*/
private String xjzd;
/**
* 民族字典表
*/
private String mz;
/**
* 与户主关系
*/
private String yhzgx;
/**
* 审核状态0未审核1审核通过2审核不通过
*/
private String confirmResult;
/**
* 审核不通过的原因
*/
private String reason;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* ic_resi_user表id
*/
private String icResiUserId;
/**
* 操作类型新增add 修改 update 删除 delete
*/
private String submitType;
/**
* 删除原因
*/
private String deleteReason;
/**
* 操作说明
*/
private String operationDescribe;
}

75
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java

@ -1,6 +1,18 @@
package com.epmet.controller;
import com.epmet.commons.tools.enums.HomeMemberOperationEnum;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.IcResiUserConfirmDTO;
import com.epmet.dto.form.IcResiUserConfirmGetDTO;
import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
import com.epmet.service.IcResiUserConfirmService;
import lombok.extern.slf4j.Slf4j;
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;
@ -13,4 +25,67 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("myHome")
public class MyHomeController {
@Autowired
private IcResiUserConfirmService icResiUserConfirmService;
/**
* @describe: 新增家庭成员
* @author wangtong
* @date 2022/6/1 15:50
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping("addMember")
public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setOperationDescribe(HomeMemberOperationEnum.ADD.getCode());
return icResiUserConfirmService.addMember(dto);
}
/**
* @describe: 修改家庭成员
* @author wangtong
* @date 2022/6/1 15:27
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping("editMember")
public Result save(@RequestBody IcResiUserConfirmSubmitDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setOperationDescribe(HomeMemberOperationEnum.UPDATE.getCode());
return icResiUserConfirmService.editMember(dto);
}
/**
* @describe: 删除家庭成员
* @author wangtong
* @date 2022/6/1 16:10
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping("delMember")
public Result delMember(@RequestBody IcResiUserConfirmSubmitDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setOperationDescribe(HomeMemberOperationEnum.DELETE.getCode());
return icResiUserConfirmService.delMember(dto);
}
/**
* @describe: 查询家庭成员信息
* @author wangtong
* @date 2022/6/1 16:14
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping("getMemberDetail")
public Result<IcResiUserConfirmDTO> getMemberDetail(@RequestBody IcResiUserConfirmGetDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return icResiUserConfirmService.getMemberDetail(dto);
}
}

13
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java

@ -3,6 +3,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.IcResiUserConfirmEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 居民信息审核表
@ -12,5 +13,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface IcResiUserConfirmDao extends BaseDao<IcResiUserConfirmEntity> {
}
/**
* @describe: 根据icResiUserId查询
* @author wangtong
* @date 2022/6/1 16:01
* @params [icResiUserId]
* @return com.epmet.entity.IcResiUserConfirmEntity
*/
IcResiUserConfirmEntity selectByIcResiUserId(@Param("icResiUserId") String icResiUserId);
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
import com.epmet.dto.IcResiUserConfirmDTO;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.IcVolunteerPolyDTO;
import com.epmet.dto.form.EpidemicPreventionFormDTO;
@ -328,4 +329,13 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
* @Date 2022/5/19 10:40
*/
List<IcVolunteerPolyDTO> getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId);
/**
* @describe: 查询家庭成员信息
* @author wangtong
* @date 2022/6/1 16:16
* @params [icResiUserId]
* @return com.epmet.dto.IcResiUserConfirmDTO
*/
IcResiUserConfirmDTO selectMemberDetail(@Param("icResiUserId") String icResiUserId);
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserConfirmEntity.java

@ -111,7 +111,7 @@ public class IcResiUserConfirmEntity extends BaseEpmetEntity {
/**
* ic_resi_user表id
*/
private String icUserId;
private String icResiUserId;
/**
* 操作类型新增add 修改 update 删除 delete

41
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java

@ -2,7 +2,10 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcResiUserConfirmDTO;
import com.epmet.dto.form.IcResiUserConfirmGetDTO;
import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
import com.epmet.entity.IcResiUserConfirmEntity;
import java.util.List;
@ -75,4 +78,40 @@ public interface IcResiUserConfirmService extends BaseService<IcResiUserConfirmE
* @date 2022-06-01
*/
void delete(String[] ids);
}
/**
* @describe: 新增家庭成员
* @author wangtong
* @date 2022/6/1 15:30
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
Result editMember(IcResiUserConfirmSubmitDTO dto);
/**
* @describe: 新增家庭成员
* @author wangtong
* @date 2022/6/1 15:50
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
Result addMember(IcResiUserConfirmSubmitDTO dto);
/**
* @describe: 删除家庭成员
* @author wangtong
* @date 2022/6/1 16:11
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
Result delMember(IcResiUserConfirmSubmitDTO dto);
/**
* @describe: 查询家庭成员信息
* @author wangtong
* @date 2022/6/1 16:15
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto);
}

59
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java

@ -3,12 +3,17 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IcResiUserConfirmDao;
import com.epmet.dao.IcResiUserDao;
import com.epmet.dto.IcResiUserConfirmDTO;
import com.epmet.dto.form.IcResiUserConfirmGetDTO;
import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
import com.epmet.entity.IcResiUserConfirmEntity;
import com.epmet.entity.IcResiUserEntity;
import com.epmet.redis.IcResiUserConfirmRedis;
import com.epmet.service.IcResiUserConfirmService;
import org.apache.commons.lang3.StringUtils;
@ -32,6 +37,9 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
@Autowired
private IcResiUserConfirmRedis icResiUserConfirmRedis;
@Autowired
private IcResiUserDao icResiUserDao;
@Override
public PageData<IcResiUserConfirmDTO> page(Map<String, Object> params) {
IPage<IcResiUserConfirmEntity> page = baseDao.selectPage(
@ -84,4 +92,51 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}
@Override
public Result editMember(IcResiUserConfirmSubmitDTO dto) {
IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId());
if(null != oldEntity){
dto.setId(oldEntity.getId());
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class);
updateById(entity);
}else{
addMember(dto);
}
return new Result().ok("修改成功");
}
@Override
public Result addMember(IcResiUserConfirmSubmitDTO dto) {
IcResiUserEntity user = icResiUserDao.selectById(dto.getIcResiUserId());
dto.setCustomerId(user.getCustomerId());
dto.setAgencyId(user.getAgencyId());
dto.setPids(user.getPids());
dto.setGridId(user.getGridId());
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class);
entity.setIcResiUserId(null);
insert(entity);
return new Result().ok("新增成功");
}
@Override
public Result delMember(IcResiUserConfirmSubmitDTO dto) {
IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId());
if(null != oldEntity){
dto.setId(oldEntity.getId());
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class);
updateById(entity);
}else{
addMember(dto);
}
return new Result().ok("删除成功");
}
@Override
public Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto) {
IcResiUserConfirmDTO result = icResiUserDao.selectMemberDetail(dto.getIcResiUserId());
return new Result().ok(result);
}
}

9
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml

@ -29,11 +29,16 @@
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="icUserId" column="IC_USER_ID"/>
<result property="icResiUserId" column="IC_RESI_USER_ID"/>
<result property="submitType" column="SUBMIT_TYPE"/>
<result property="deleteReason" column="DELETE_REASON"/>
<result property="operationDescribe" column="OPERATION_DESCRIBE"/>
</resultMap>
<select id="selectByIcResiUserId" resultType="com.epmet.entity.IcResiUserConfirmEntity">
select * from ic_resi_user_confirm
where IC_RESI_USER_ID=#{icResiUserId}
and del_flag='0'
</select>
</mapper>
</mapper>

17
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@ -1059,5 +1059,22 @@
AND a.ID = #{userId}
</if>
</select>
<select id="selectMemberDetail" resultType="com.epmet.dto.IcResiUserConfirmDTO">
select
ID as icResiUserId,
name,
ID_CARD,
gender,
birthday,
MOBILE,
mz,
HJSZD as hjszdCode,
yhzgx,
XJZD as xjzdCode,
xjzd
from ic_resi_user
where DEL_FLAG='0'
and id=#{icResiUserId}
</select>
</mapper>

Loading…
Cancel
Save