springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -137,4 +137,9 @@ * 首页商城是否展示（1.是 2.否） */ public static final Integer IS_SHOP_OPEN = 2; /** * 网格综治-默认角色权限默认字符串 */ public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role"; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
@@ -25,32 +25,35 @@ @ApiModel("创建网格和网格员的关联关系请求参数") public class EventGridMemberAddDTO { @NotBlank() @NotBlank(message = "账号昵称不能为空") @Length(max=50) @ApiModelProperty(value = "账号昵称", hidden = false, example = "") private String nickName; @NotBlank() @Length(max=50) @NotBlank(message = "登录账号不能为空") @Length(max=50) @ApiModelProperty(value = "登录账号", hidden = false, example = "") private String account; @NotBlank() @Length(min = 8, max=100) @NotBlank(message = "登录密码不能为空") @Length(min = 8, max=100) @ApiModelProperty(value = "登录密码", hidden = false, example = "") private String paswd; private String passwd; @NotBlank() @Length(max=11) @NotBlank(message = "联系电话不能为空") @Length(max=11) @ApiModelProperty(value = "联系电话", hidden = false, example = "") private String phone; @NotNull() @NotNull(message = "工作开始时间不能为空") @Max(24) @ApiModelProperty(value = "工作开始时间", hidden = false, example = "") private Integer workStart; private Integer workStartAt; @NotNull() @NotNull(message = "工作结束时间不能为空") @Max(24) @ApiModelProperty(value = "工作结束时间", hidden = false, example = "") private String workEnd; private String workEndAt; @Length(max=255) @ApiModelProperty(value = "头像", hidden = false, example = "") @@ -65,4 +68,8 @@ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三") private String userName; @ApiModelProperty(value = "社区ID", hidden = true, example = "1") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO; import com.panzhihua.common.model.dtos.user.*; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.shop.ShopStoreVO; @@ -708,4 +709,12 @@ */ @PutMapping("updateUserPassByApp") R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO); /** * 添加网格员 * @param eventGridMemberAddDTO 请求参数 * @return 结果 */ @PostMapping("addGridUser") R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO); } springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
@@ -29,8 +29,8 @@ * */ @Slf4j @RestController @RequestMapping("/eventgridmemberrelation") @Api(tags = {"网格和网格员的关联关系"}) @RequestMapping("/eventgridmember") @Api(tags = {"网格员管理"}) public class EventGridMemberRelationApi extends BaseController { @Resource @@ -101,4 +101,50 @@ return gridService.eventGridMemberRelationDetails(id); } /** * 查询网格员工作轨迹 * @param userId 网格id * @return 查找结果 */ @GetMapping("/locus/{userId}") @ApiOperation(value = "查询网格员工作轨迹") R locus(@PathVariable("userId") Long userId){ return gridService.eventGridMemberRelationDetails(userId); } /** * 启用 * @param userId 网格id * @return 查找结果 */ @PutMapping("/on/{userId}") @ApiOperation(value = "启用网格员") R toggleOn(@PathVariable("userId") Long userId){ return gridService.eventGridMemberRelationDetails(userId); } /** * 禁用 * @param userId 网格id * @return 查找结果 */ @PutMapping("/off/{userId}") @ApiOperation(value = "禁用网格员") R toggleOff(@PathVariable("userId") Long userId){ return gridService.eventGridMemberRelationDetails(userId); } /** * 工作预警记录 * @param userId 网格id * @return 查找结果 */ @GetMapping("/gpslog/{userId}") @ApiOperation(value = "工作预警记录") R gpslog(@PathVariable("userId") Long userId){ return gridService.eventGridMemberRelationDetails(userId); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java
@@ -54,6 +54,14 @@ */ private Integer workStatus; /** * 工作开始时间 列: work_start_at */ private Integer workStartAt; /** * 工作结束时间 列: work_end_at */ private Integer workEndAt; /** * 创建人 列: create_by */ private Long createBy; springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; import com.panzhihua.service_grid.service.EventGridMemberRelationService; @@ -31,15 +32,22 @@ @Resource private EventGridMemberRelationMapper eventGridMemberRelationMapper; @Resource private UserService userService; /** * 新增网格和网格员的关联关系 * @param eventGridMemberAddDTO * @return 新增结果 */ public R add(EventGridMemberAddDTO eventGridMemberAddDTO){ userService.addGridUser(eventGridMemberAddDTO); EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO(); BeanUtils.copyProperties(eventGridMemberAddDTO, eventGridMemberRelationDO); eventGridMemberRelationDO.setCreateAt(new Date()); eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId()); if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){ return R.ok(); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO; import com.panzhihua.common.model.dtos.user.*; import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -903,4 +904,15 @@ public R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO){ return userService.updateUserPassByApp(userInfoAppDTO); } /** * 添加网格员 * @param eventGridMemberAddDTO 请求参数 * @return 结果 */ @PostMapping("addGridUser") R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){ return userService.addGridUser(eventGridMemberAddDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -3,6 +3,7 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO; @@ -422,4 +423,11 @@ * @return 修改结果 */ R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO); /** * 添加网格员 * @param eventGridMemberAddDTO 请求参数 * @return 结果 */ R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -11,13 +11,16 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO; import com.panzhihua.common.model.dtos.user.*; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO; import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.service.partybuilding.PartyBuildingService; import com.panzhihua.common.utlis.IdCard; import com.panzhihua.common.utlis.RealNameUtil; @@ -78,7 +81,8 @@ private SysMenuDAO sysMenuDAO; @Resource private SysUserInputDAO sysUserInputDAO; @Resource private GridService gridService; /** * 小程序微信用户信息更新 @@ -1855,4 +1859,54 @@ return R.fail(); } } @Override @Transactional(rollbackFor = Exception.class) public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) { SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY)); if(gridMemberDefaultRole==null) { //添加默认网格员角色 SysRoleDO sysRoleDO = new SysRoleDO(); sysRoleDO.setCommunityId(0L); sysRoleDO.setRoleName("网格员默认角色"); sysRoleDO.setRoleKey(Constants.GRID_DEFAULT_ROLE_KEY); sysRoleDO.setRoleSort(0); sysRoleDO.setCreateBy(eventGridMemberAddDTO.getUserId()); int insert = roleDAO.insert(sysRoleDO); if (insert!=1) { throw new ServiceException("网格员默认角色添加失败"); } } Long roleId = gridMemberDefaultRole.getRoleId(); //新角色设置所有权限 MenuRoleVO menuRoleVO = new MenuRoleVO(); menuRoleVO.setIsAll(1); menuRoleVO.setCommunityId(eventGridMemberAddDTO.getCommunityId()); menuRoleVO.setRoleId(roleId); this.putMenuRole(menuRoleVO); SysUserDO sysUserDO = new SysUserDO(); String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPasswd()); eventGridMemberAddDTO.setPasswd(encode); BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO); int insert = 0; try { insert = userDao.insert(sysUserDO); } catch (Exception e) { e.printStackTrace(); log.error("新增后台用户报错【{}】", e.getMessage()); if (e.getMessage().contains("union_phone_type")) { throw new ServiceException("手机号已经存在"); } else if (e.getMessage().contains("union_account_type")) { throw new ServiceException("账户已经存在"); } } //TODO 添加关联关系 //gridService.addEventGridMember(); return R.fail(); } }
