springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityCommonDataApi.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.applets.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; 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 javax.annotation.Resource; /** * @description: 社区管理/基础数据 * @author: Null * @date: 2021/3/11 13:19 */ @Slf4j @Api(tags = {"社区管理/基础数据"}) @RestController @RequestMapping("/common/data") public class CommunityCommonDataApi extends BaseController { @Resource private CommunityService communityService; @PostMapping("/car/add") public R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null!=communityId && 0!=communityId) { comMngCarAppletDTO.setCommunityId(communityId); } return communityService.addComMngCarApplet(comMngCarAppletDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarAppletDTO.java
New file @@ -0,0 +1,62 @@ package com.panzhihua.common.model.dtos.community; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; /** * @description: 车辆登记 * @author: Null * @date: 2021/3/16 14:37 */ @Data @ApiModel("小程序车辆登记参数") public class ComMngCarAppletDTO implements Serializable { @ApiModelProperty(value = "车辆主键ID",hidden = true) private Long id; @ApiModelProperty(value = "车牌号") @NotBlank(groups = {AddGroup.class},message = "车牌号不能为空") private String plateNum; @ApiModelProperty(value = "车辆品牌") @NotBlank(groups = {AddGroup.class},message = "车辆品牌不能为空") private String brand; @ApiModelProperty(value = "车身颜色") @NotBlank(groups = {AddGroup.class},message = "车身颜色不能为空") private String color; @ApiModelProperty(value = "车辆型号") @NotBlank(groups = {AddGroup.class},message = "车辆型号不能为空") private String model; @ApiModelProperty(value = "社区ID",hidden = true) private Long communityId; @ApiModelProperty(value = "小区名称",hidden = true) private String areaName; @ApiModelProperty(value = "小区ID",hidden = true) private Long areaId; @ApiModelProperty(value = "车主姓名",hidden = true) private String userName; @ApiModelProperty(value = "车主ID",hidden = true) private Long userId; @ApiModelProperty(value = "车主手机号码",hidden = true) private String mobile; @ApiModelProperty(value = "创建人",hidden = true) private Long createBy; @ApiModelProperty(value = "数据来源：1-小程序 2-后台录入",hidden = true) private Integer source; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -7,7 +7,6 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberExcelVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -1106,4 +1105,12 @@ @PostMapping("/house/export") R houseExport(@RequestParam("areaId") Long areaId); /** * 小程序添加车辆信息 * @param comCvtBusinessDTO * @return */ @PostMapping("/common/data/car/add") R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java
New file @@ -0,0 +1,42 @@ package com.panzhihua.common.utlis; /** * @description: 身份证手机号脱敏处理 * @author: Null * @date: 2021/3/16 15:53 */ public class SensitiveUtil { /** * 手机号码脱敏处理 * * @param phoneNumber * @return */ public static String desensitizedPhoneNumber(String phoneNumber) { if (StringUtils.isNotEmpty(phoneNumber)) { phoneNumber = phoneNumber.replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2"); } return phoneNumber; } /** * 身份证号码脱敏处理 * * @param idNumber * @return */ public static String desensitizedIdNumber(String idNumber) { if (!StringUtils.isEmpty(idNumber)) { if (idNumber.length() == 15) { idNumber = idNumber.replaceAll("(\\w{6})\\w*(\\w{3})", "$1******$2"); } if (idNumber.length() == 18) { idNumber = idNumber.replaceAll("(\\w{6})\\w*(\\w{4})", "$1********$2"); } } return idNumber; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityCommonDataApi.java
New file @@ -0,0 +1,32 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComMngCarService; import lombok.extern.slf4j.Slf4j; 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 javax.annotation.Resource; /** * @description: 社区管理/基础数据 * @author: Null * @date: 2021/3/11 13:19 */ @Slf4j @RestController @RequestMapping("/common/data") public class CommunityCommonDataApi { @Resource private ComMngCarService comMngCarService; @PostMapping("/car/add") public R addComCvtBusiness(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO) { return comMngCarService.addComMngCarApplet(comCvtBusinessDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
New file @@ -0,0 +1,15 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComMngCarDO; import org.apache.ibatis.annotations.Mapper; /** * @description: 车辆管理 * @author: Null * @date: 2021/3/16 14:28 */ @Mapper public interface ComMngCarDAO extends BaseMapper<ComMngCarDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCarDO.java
New file @@ -0,0 +1,61 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @description: 车辆管理 * @author: Null * @date: 2021/3/16 14:28 */ @Data @TableName(value = "com_mng_car") public class ComMngCarDO implements Serializable { /**主键*/ @TableId(type = IdType.AUTO) private Long id; /**社区ID*/ private Long communityId; /**小区名称*/ private String areaName; /**小区ID*/ private Long areaId; /**车主姓名*/ private String userName; /**车主用户ID*/ private Long userId; /**车主手机号码*/ private String mobile; /**车牌号*/ private String plateNum; /**车辆品牌*/ private String brand; /**车身颜色*/ private String color; /**车辆型号*/ private String model; /**创建时间*/ @TableField(fill = FieldFill.INSERT) private Date createAt; /**创建人*/ private Long createBy; /**数据来源：1-小程序 2-后台录入*/ private Integer source; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngCarService.java
New file @@ -0,0 +1,14 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.vos.R; public interface ComMngCarService { /** * 小程序端：添加车辆信息 * @param comCvtBusinessDTO * @return */ R addComMngCarApplet(ComMngCarAppletDTO comCvtBusinessDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_community.dao.ComActEasyPhotoCommentDAO; import com.panzhihua.service_community.dao.ComActEasyPhotoCommentUserDAO; import com.panzhihua.service_community.dao.ComActEasyPhotoDAO; @@ -76,6 +77,7 @@ }else { comActEasyPhotoVO1.setHaveGiveThumbsUp(1); } comActEasyPhotoVO1.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO1.getPhone())); }); iPage.setRecords(records); } @@ -102,12 +104,14 @@ } else { comActEasyPhotoVO.setHaveGiveThumbsUp(1); } if (status.intValue()==4) { Date feedbackAt = comActEasyPhotoVO.getFeedbackAt(); if (null==feedbackAt) { comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt()); } } comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone())); return R.ok(comActEasyPhotoVO); }
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_community.dao.ComActMicroWishDAO; import com.panzhihua.service_community.dao.ComActMicroWishUserDAO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; @@ -63,6 +64,8 @@ } else { comActMicroWishVO1.setHaveGiveThumbsUp(1); } comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone())); }); iPage.setRecords(records); } @@ -95,6 +98,7 @@ }else { comActMicroWishVO.setHaveGiveThumbsUp(1); } comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone())); return R.ok(comActMicroWishVO); }
New file @@ -0,0 +1,42 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.dao.ComMngCarDAO; import com.panzhihua.service_community.model.dos.ComMngCarDO; import com.panzhihua.service_community.service.ComMngCarService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; /** * @description: * @author: Null * @date: 2021/3/16 14:33 */ @Service public class ComMngCarServiceImpl extends ServiceImpl<ComMngCarDAO, ComMngCarDO> implements ComMngCarService { @Resource private ComMngCarDAO comMngCarDAO; @Override public R addComMngCarApplet(ComMngCarAppletDTO comCvtBusinessDTO) { int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getPlateNum, comCvtBusinessDTO.getPlateNum())); if (count > 0) { return R.ok("车辆已存在"); } ComMngCarDO comMngCarDO = new ComMngCarDO(); BeanUtils.copyProperties(comCvtBusinessDTO, comMngCarDO); comMngCarDO.setCreateAt(new Date()); boolean insert = this.save(comMngCarDO); if (insert) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO; import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO; import com.panzhihua.service_community.service.ComMngVolunteerMngService; @@ -105,6 +106,9 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComMngVolunteerMngVO> iPage = comMngVolunteerMngDAO.pageVolunteer(page, comMngVolunteerMngVO); iPage.getRecords().forEach(record->{ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone())); }); return R.ok(iPage); }
@@ -12,6 +12,7 @@ import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_dangjian.dao.ComBpActivityDAO; import com.panzhihua.service_dangjian.dao.ComPbActivityMemberDAO; import com.panzhihua.service_dangjian.dao.ComPbMemberDAO; @@ -81,6 +82,9 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<PageActivityMembersVO> iPage = comPbActivityMemberDAO.pageActivityMembers(page, pageActivityMembersVO); iPage.getRecords().forEach(record->{ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone())); }); Map<String,Object> map=new HashMap<>(3); ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(activityId); map.put("page",iPage); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.utlis.RichTextUtil; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_dangjian.dao.*; import com.panzhihua.service_dangjian.model.dos.*; import com.panzhihua.service_dangjian.service.ComPbMemberService; @@ -159,6 +160,9 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyOrganization(page, pagePartyOrganizationVO); iPage.getRecords().forEach(record->{ record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard())); }); return R.ok(iPage); } @@ -298,6 +302,9 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<PartyCommitteeVO> iPage=comPbMemberRoleDAO.pagePartyOrganization(page, partyCommitteeVO); iPage.getRecords().forEach(record->{ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone())); }); return R.ok(iPage); }
@@ -21,6 +21,7 @@ import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.utlis.IdCard; import com.panzhihua.common.utlis.RealNameUtil; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_user.dao.*; import com.panzhihua.service_user.model.dos.*; import com.panzhihua.service_user.model.dtos.DataKanbanDTO; @@ -388,6 +389,10 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO); iPage.getRecords().forEach(record->{ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone())); record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard())); }); return R.ok(iPage); } @@ -452,9 +457,9 @@ } Integer isRent = sysUserInputDO1.getIsRent(); ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO(); comMngFamilyInfoVO.setIdCard(sysUserInputDO1.getIdCard()); comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard())); comMngFamilyInfoVO.setName(name); comMngFamilyInfoVO.setPhone(sysUserInputDO1.getPhone()); comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone())); if (isRent.intValue()==0) { comMngFamilyInfoVO.setRelationship("家人"); }else{ @@ -471,6 +476,8 @@ if (!ObjectUtils.isEmpty(comActVO)) { loginUserInfoVO.setCommunityName(comActVO.getName()); } loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard())); loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone())); return R.ok(loginUserInfoVO); }
