springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -122,9 +123,14 @@ @ApiModelProperty("小区名字") private String alley; @ApiModelProperty("房屋成员") @ApiModelProperty("户主关系") private List<ComHouseMemberVo> comMngFamilyInfoVOS; @ApiModelProperty("家庭成员信息") private List<ComMngFamilyInfoVO> familyInfoVOList; @ApiModelProperty("用户电子档信息") private UserElectronicFileVO userElectronicFileVO; @ApiModelProperty("是否租住 是否租住(0.否 1.是)") @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserElectronicFileVO.java
New file @@ -0,0 +1,34 @@ package com.panzhihua.common.model.vos.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("电子档用户信息") public class UserElectronicFileVO { /** * 用户id */ @ApiModelProperty(value = "用户id",hidden = true) private Long userId; /** * 证件照（人面像）照片 */ @ApiModelProperty("证件照（人面像）照片") private String cardPhotoFront; /** * 证件照（国徽面）照片 */ @ApiModelProperty("证件照（国徽面）照片") private String cardPhotoBack; /** * 户口本照片(多张以,号隔开) */ @ApiModelProperty("户口本照片(多张以,号隔开)") private String familyBook; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1648,6 +1648,14 @@ @PostMapping("/common/data/population/detail") R detailPopulation(@RequestParam(value = "populationId") Long populationId); /** * 根据id查询实有人口电子档案信息 * @param populationId 实有人口id * @return 实有人口电子档信息 */ @PostMapping("/common/data/population/electronicArchives") R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId); /** * 根据id修改实有人口标签列表 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -23,6 +23,7 @@ import com.panzhihua.common.model.vos.user.ComMngTagVO; import com.panzhihua.common.model.vos.user.ComMngUserTagVO; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.FileUtil; @@ -814,6 +815,12 @@ return communityService.detailPopulation(populationId); } @ApiOperation(value = "查询实有人口电子档案", response = UserElectronicFileVO.class) @PostMapping("/population/electronicArchives") public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) { return communityService.electronicArchivesPopulation(populationId); } @ApiOperation(value = "实有人口标签修改", response = ComMngPopulationVO.class) @PostMapping("/population/editTag") public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -298,6 +298,16 @@ return comMngPopulationService.detailPopulation(populationId); } /** * 查询实有人口电子档信息 * @param populationId 实有人口id * @return 实有人口电子档信息 */ @PostMapping("/population/electronicArchives") public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) { return comMngPopulationService.electronicArchivesPopulation(populationId); } /** * 根据实有人口id修改标签列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.vos.user.ComHouseMemberVo; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.service_community.model.dos.ComMngPopulationDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -92,7 +93,7 @@ List<ComMngPopulationVO> listPopulation(ComMngPopulationDTO populationVO); @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at from com_mng_family_info where user_id=#{userId}") @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at,card_photo_front,card_photo_back,family_book from com_mng_family_info where user_id=#{userId}") List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId); @Select("select id,`name`,phone,relation from com_mng_population where road = #{comMngPopulationDO.road} and door_no = #{comMngPopulationDO.doorNo} and floor = #{comMngPopulationDO.floor} and unit_no = #{comMngPopulationDO.unitNo} and house_no = #{comMngPopulationDO.houseNo} and id != #{comMngPopulationDO.id}") @@ -186,5 +187,8 @@ "</script>") IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO); @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}") UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -74,4 +74,9 @@ @Select("delete from sys_role where role_key = #{account}") void deleteSysRoleByAccount(@Param("account") String account); @Select("select count(user_id) from sys_user where phone=#{phone} and type=5 ") int reasonableUserByPhone(@Param("phone") String phone); @Select("select count(user_id) from sys_user where account=#{account} and type=5 ") int reasonableUserByAccount(@Param("account") String account); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -121,4 +121,11 @@ * @return 删除结果 */ R deleteSpecialInputUser(Long id); /** * 查询实有人口电子档信息 * @param populationId 实有人口id * @return 实有人口电子档信息 */ R electronicArchivesPopulation(Long populationId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -17,7 +17,9 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActVillageDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; @@ -31,6 +33,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; import javax.crypto.BadPaddingException; @@ -124,15 +127,28 @@ public R detailPopulation(Long populationId) { ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId); if (ObjectUtils.isEmpty(comMngPopulationDO)) { return R.fail(); return R.fail("用户信息不存在"); } ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO(); BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO); //查询房屋成员信息 //查询户主关系信息 List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO); if (!comMngFamilyInfoVOS.isEmpty()) { comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS); } //查询当前用户电子档信息 if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){ UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo()); if(electronicFileVO != null){ comMngPopulationVO.setUserElectronicFileVO(electronicFileVO); //查询家庭成员信息 List<ComMngFamilyInfoVO> familyInfoVOList = populationDAO.listFamilyByUserId(electronicFileVO.getUserId()); if(!familyInfoVOList.isEmpty()){ comMngPopulationVO.setFamilyInfoVOList(familyInfoVOList); } } } return R.ok(comMngPopulationVO); } @@ -453,4 +469,25 @@ return R.fail(); } } /** * 查询实有人口电子档信息 * @param populationId 实有人口id * @return 实有人口电子档信息 */ @Override public R electronicArchivesPopulation(Long populationId){ ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId); if (ObjectUtils.isEmpty(comMngPopulationDO)) { return R.fail("用户信息不存在"); } //查询当前用户电子档信息 if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){ UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo()); if(electronicFileVO != null){ return R.ok(electronicFileVO); } } return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -15,7 +15,6 @@ import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO; import com.panzhihua.service_community.dao.ComShopGoodsDAO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.dao.ComShopStoreDAO; import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO; import com.panzhihua.service_community.model.dos.ComShopGoodsDO; @@ -158,20 +157,26 @@ public R addStore(ShopStoreVO storeVO){ //判断店铺是否存在 ComShopStoreDO oldComShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>() .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()).eq(ComShopStoreDO::getDeleteStatus,ComShopStoreDO.deleteStatus.no)); .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()).eq(ComShopStoreDO::getDeleteStatus, ComShopStoreDO.deleteStatus.no)); if (oldComShopStoreDO != null) { return R.fail("商家账号已注册"); } //TODO 判断用户 //this.baseMapper.select(storeVO.getPhone()); int reasonable1 = this.baseMapper.reasonableUserByPhone(storeVO.getPhone()); int reasonable2 = this.baseMapper.reasonableUserByAccount(storeVO.getStoreAccount()); if (reasonable1 > 0) { return R.fail("手机号:" + storeVO.getPhone() + "在系统用户中已存在"); } if (reasonable2 > 0) { return R.fail("账号:" + storeVO.getStoreAccount() + "在系统用户中已存在"); } //新增店铺先判断是否拥有已删除的店铺 ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>() .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()).eq(ComShopStoreDO::getDeleteStatus,ComShopStoreDO.deleteStatus.yes)); if(comShopStoreDO != null){ .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()).eq(ComShopStoreDO::getDeleteStatus, ComShopStoreDO.deleteStatus.yes)); if (comShopStoreDO != null) { //删除店铺规格信息 comShopGoodsAttrDAO.delete(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getStoreId,comShopStoreDO.getId())); comShopGoodsAttrDAO.delete(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getStoreId, comShopStoreDO.getId())); //删除店铺商品 shopGoodsDAO.delete(new QueryWrapper<ComShopGoodsDO>().lambda().eq(ComShopGoodsDO::getStoreId,comShopStoreDO.getId())); shopGoodsDAO.delete(new QueryWrapper<ComShopGoodsDO>().lambda().eq(ComShopGoodsDO::getStoreId, comShopStoreDO.getId())); //删除关联的sysUser用户权限 this.baseMapper.deleteSysRoleByAccount(Constants.SHOP_ROLE_KEY + comShopStoreDO.getStoreAccount()); //删除关联的sysUser用户
