springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbCheckUserDTO.java
New file @@ -0,0 +1,13 @@ package com.panzhihua.common.model.dtos.partybuilding; import lombok.Data; /** * @author zzj */ @Data public class ComPbCheckUserDTO { private String account; private String password; private Long checkUnitId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -241,6 +241,8 @@ @JsonSerialize(using = ToStringSerializer.class) private Long checkUnitId; private Long bindingCheckUnitId; public String retrieveRelationName() { return this.type == 3 ? relationName : name; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -1279,4 +1280,7 @@ @GetMapping("/accept") R accept(@RequestParam("userId")Long userId); @PostMapping("/addComPbCheckUser") R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java
@@ -12,11 +12,13 @@ import com.panzhihua.common.model.dtos.common.EditComPbCheckUnitDto; import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto; import com.panzhihua.common.model.dtos.common.PagePbCheckUnitCommonDto; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo; import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO; import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.community_backstage.config.SFTPConfig; @@ -64,6 +66,8 @@ private StringRedisTemplate stringRedisTemplate; @Resource private SFTPConfig sftpConfig; @Resource private UserService userService; /** * description queryByPage 分页查询 @@ -77,9 +81,12 @@ @PostMapping("/page") public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) { //comPbCheckUnit.setCommunityId(this.getCommunityId()); String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ comPbCheckUnit.setBelongTo(this.getLoginUserInfo().getName()); } if(this.getLoginUserInfo().getBindingCheckUnitId()!=null){ comPbCheckUnit.setId(this.getLoginUserInfo().getBindingCheckUnitId()); } return this.comPbCheckUnitService.queryByPage(comPbCheckUnit); } @@ -248,7 +255,7 @@ public R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId, @RequestParam(value = "belongTo", required = false) String choice) { String belongTo = ""; String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ belongTo = this.getLoginUserInfo().getName(); } @@ -258,7 +265,7 @@ @ApiOperation(value = "报到单位统计", response = PbCheckUnitStatisticsVo.class) @PostMapping("/statistics") public R unitStatistics(@RequestBody PagePbCheckUnitCommonDto commonDto) { String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ commonDto.setBelongTo(this.getLoginUserInfo().getName()); } @@ -276,7 +283,7 @@ @RequestParam(value = "choice", required = false) String choice, @RequestParam(value = "checkUnitId", required = false) Long checkUnitId) { String belongTo = ""; String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ belongTo = this.getLoginUserInfo().getName(); } @@ -286,7 +293,7 @@ @ApiOperation(value = "报到党员统计-按单位归属统计", response = PbCheckUnitStatisticsVo.class) @PostMapping("/pbStatistics/belong") public R pbStatisticsBelong(@RequestBody PagePbCheckUnitCommonDto commonDto) { String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ commonDto.setBelongTo(this.getLoginUserInfo().getName()); } @@ -296,10 +303,16 @@ @ApiOperation(value = "报到党员统计-按单位统计", response = ComPbCheckUnitVo.class) @PostMapping("/pbStatistics/unit") public R pbStatisticsUnit(@RequestBody PagePbCheckUnitCommonDto commonDto) { String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ commonDto.setBelongTo(this.getLoginUserInfo().getName()); } return this.comPbCheckUnitService.pbStatisticsUnit(commonDto); } @ApiOperation("添加报道单位账号") @PostMapping("/addComPbCheckUser") public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){ return userService.addComPbCheckUser(comPbCheckUserDTO); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -203,7 +203,7 @@ @ApiOperation(value = "新增党员") @PostMapping("addpartybuildingmember") public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) { String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ partyBuildingMemberVO.setBelongTo(this.getLoginUserInfo().getName()); } @@ -294,10 +294,13 @@ @PostMapping("pagepartyorganization") public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) { //pagePartyOrganizationVO.setCommunityId(this.getCommunityId()); String[] area={"东区","仁和区","米易县","盐边县"}; String[] area={"东区","仁和区","米易县","盐边县","西区"}; if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){ pagePartyOrganizationVO.setBelongTo(this.getLoginUserInfo().getName()); } if(this.getLoginUserInfo().getBindingCheckUnitId()!=null){ pagePartyOrganizationVO.setCheckUnitId(this.getLoginUserInfo().getBindingCheckUnitId()); } return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO); } @ApiOperation(value = "党员时长信息导出", response = PartyBuildingMemberVO.class) springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_dangjian.api; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO; import com.panzhihua.service_dangjian.service.ComPbCheckUnitService; import com.panzhihua.common.model.dtos.common.*; springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
@@ -30,6 +30,9 @@ cpcu.* from com_pb_check_unit as cpcu <where> <if test="dto.id != null"> and cpcu.id = #{dto.id} </if> <if test="dto.type != null"> and cpcu.`type` = #{dto.type} </if> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -1455,4 +1456,9 @@ public R accept(@RequestParam("userId")Long userId){ return userService.accept(userId); } @PostMapping("/addComPbCheckUser") public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){ return userService.addComPbCheckUser(comPbCheckUserDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -210,4 +210,6 @@ private String appId; private Integer isAccept; private Long bindingCheckUnitId; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO; @@ -927,4 +928,6 @@ * @return */ R accept(Long userId); R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import com.panzhihua.common.model.vos.community.ComAreaTownCommunityVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO; @@ -3671,6 +3672,31 @@ return R.ok(); } @Override @Transactional public R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO) { SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,comPbCheckUserDTO.getAccount()).eq(SysUserDO::getType,3).eq(SysUserDO::getAppId,"wx118de8a734d269f0")); if(sysUserDO!=null){ return R.fail("账户名已存在"); } SysUserDO sysUserDO1=new SysUserDO(); sysUserDO1.setUserId(Snowflake.getId()); sysUserDO1.setAccount(comPbCheckUserDTO.getAccount()); sysUserDO1.setPassword(new BCryptPasswordEncoder().encode(comPbCheckUserDTO.getPassword())); sysUserDO1.setType(3); sysUserDO1.setAppId("wx118de8a734d269f0"); sysUserDO1.setCommunityId(0L); sysUserDO1.setBindingCheckUnitId(comPbCheckUserDTO.getCheckUnitId()); int restlt=userDao.insert(sysUserDO1); if(restlt>0){ SysUserRoleDO sysUserRoleDO=new SysUserRoleDO(); sysUserRoleDO.setRoleId(123321L); sysUserRoleDO.setUserId(sysUserDO1.getUserId()); sysUserRoleDAO.insert(sysUserRoleDO); } return R.ok(); } @Override public R getAreaAndStreet() { springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -710,7 +710,7 @@ </select> <select id="selectStreetByAreaCode" resultType="com.panzhihua.common.model.vos.user.StreetVOS"> select street_id as id,name as name from com_street where area_code=#{code} select street_id as id,name as name from com_street where area_code=#{code} and app_id ='wx118de8a734d269f0' </select> <select id="selectStreetsByAreaCode" resultType="com.panzhihua.common.model.vos.user.StreetVO"> select street_id as id,name as name from com_street where area_code=#{code} @@ -745,7 +745,7 @@ </if> </select> <select id="selectCommunityByStreetId" resultType="com.panzhihua.common.model.vos.user.CommunityVO"> select community_id as id,name from com_act where street_id =#{id} select community_id as id,name from com_act where street_id =#{id} and app_id = 'wx118de8a734d269f0' <if test="type == 1"> and name like concat('%','社区') </if>
