springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java
New file @@ -0,0 +1,93 @@ package com.panzhihua.common.model.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @author zzj */ @Data @ApiModel public class ComActSocialMemberVO { private Long id; /** * 姓名 */ @ApiModelProperty(value = "姓名") private String name; /** * 手机号 */ @ApiModelProperty(value = "手机号") private String phone; /** * 社会组织id */ @ApiModelProperty(value = "社会组织id") private Long orgId; /** * 职位 */ @ApiModelProperty(value = "职位") private String position; /** * 身份证号 */ @ApiModelProperty(value = "身份证号") private String idCard; /** * 账号 */ @ApiModelProperty(value = "账号") private String account; /** * 密码 */ @ApiModelProperty(value = "密码") private String password; /** * 状态1启用 0停用 */ @ApiModelProperty(value = "状态1启用 0停用") private Integer status; /** * 照片 */ @ApiModelProperty(value = "照片") private String image; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") private Date createTime; /** * 街道id */ @ApiModelProperty(value = "街道id") private Long streetId; /** * 所属组织 */ @ApiModelProperty(value = "所属组织") private String orgName; /** * 用户id */ private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -17,6 +17,7 @@ import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO; import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO; import io.swagger.annotations.ApiOperation; @@ -243,11 +244,6 @@ import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.DictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.BatchhouseVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; @@ -7040,4 +7036,49 @@ */ @GetMapping("/comActSocialOrg/{id}") R comActSocialOrgSelectOne(@PathVariable("id") Long id); /** * 分页查询所有数据 * * @param commonPage 查询实体 * @return 所有数据 */ @PostMapping("/comActSocialMember/queryAll") public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage); /** * 通过主键查询单条数据 * * @param id 主键 * @return 单条数据 */ @GetMapping("/comActSocialMember/{id}") public R comActSocialMemberSelectOne(@PathVariable("id") Long id); /** * 新增数据 * * @param comActSocialMember 实体对象 * @return 新增结果 */ @PostMapping("/comActSocialMember") public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember); /** * 修改数据 * * @param comActSocialMember 实体对象 * @return 修改结果 */ @PostMapping("/comActSocialMember/update") public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember); /** * 删除数据 * * @param id 主键结合 * @return 删除结果 */ @GetMapping("/comActSocialMember/del") public R comActSocialMemberDelete(@RequestParam("id") Long id); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java
New file @@ -0,0 +1,92 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.ComActSocialMemberVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * 社会组织成员表(ComActSocialMember)表控制层 * * @author makejava * @since 2021-10-22 09:52:47 */ @Slf4j @Api(tags = {"社会组织成员"}) @RestController @RequestMapping("comActSocialMember") public class ComActSocialMemberApi extends BaseController { /** * 服务对象 */ @Resource private CommunityService communityService; /** * 分页查询所有数据 * * @param commonPage 查询实体 * @return 所有数据 */ @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class) @PostMapping("queryAll") public R selectAll(@RequestBody CommonPage commonPage) { return this.communityService.comActSocialMemberSelectAll(commonPage); } /** * 通过主键查询单条数据 * * @param id 主键 * @return 单条数据 */ @ApiOperation("详情") @GetMapping("{id}") public R selectOne(@PathVariable("id") Long id) { return this.communityService.comActSocialMemberSelectOne(id); } /** * 新增数据 * * @param comActSocialMember 实体对象 * @return 新增结果 */ @ApiOperation("新增数据") @PostMapping public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) { return this.communityService.comActSocialMemberInsert(comActSocialMember); } /** * 修改数据 * * @param comActSocialMember 实体对象 * @return 修改结果 */ @ApiOperation("修改数据") @PostMapping("/update") public R update(@RequestBody ComActSocialMemberVO comActSocialMember) { return this.communityService.comActSocialMemberUpdate(comActSocialMember); } /** * 删除数据 * * @param id 主键结合 * @return 删除结果 */ @ApiOperation("删除数据") @GetMapping("del") public R delete(@RequestParam("id") Long id) { return this.communityService.comActSocialMemberDelete(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialMemberApi.java
New file @@ -0,0 +1,87 @@ package com.panzhihua.service_community.api; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.api.ApiController; import com.panzhihua.common.model.vos.ComActSocialMemberVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.dtos.property.CommonPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.service_community.entity.ComActSocialMember; import com.panzhihua.service_community.service.ComActSocialMemberService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.Serializable; import java.util.List; /** * 社会组织成员表(ComActSocialMember)表控制层 * * @author makejava * @since 2021-10-22 09:52:47 */ @RestController @RequestMapping("comActSocialMember") public class ComActSocialMemberApi { /** * 服务对象 */ @Resource private ComActSocialMemberService comActSocialMemberService; /** * 分页查询所有数据 * * @param commonPage 查询实体 * @return 所有数据 */ @PostMapping("queryAll") public R selectAll(@RequestBody CommonPage commonPage) { return this.comActSocialMemberService.pageList(commonPage); } /** * 通过主键查询单条数据 * * @param id 主键 * @return 单条数据 */ @GetMapping("{id}") public R selectOne(@PathVariable("id") Long id) { return this.comActSocialMemberService.detail(id); } /** * 新增数据 * * @param comActSocialMember 实体对象 * @return 新增结果 */ @PostMapping public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) { return this.comActSocialMemberService.insert(comActSocialMember); } /** * 修改数据 * * @param comActSocialMember 实体对象 * @return 修改结果 */ @PostMapping("/update") public R update(@RequestBody ComActSocialMemberVO comActSocialMember) { return this.comActSocialMemberService.update(comActSocialMember); } /** * 删除数据 * * @param id 主键结合 * @return 删除结果 */ @GetMapping("del") public R delete(@RequestParam("id") Long id) { return this.comActSocialMemberService.delete(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java
New file @@ -0,0 +1,33 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.ComActSocialMemberVO; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.ComActSocialMember; import org.apache.ibatis.annotations.Param; /** * 社会组织成员表(ComActSocialMember)表数据库访问层 * * @author makejava * @since 2021-10-22 09:52:46 */ @Mapper public interface ComActSocialMemberDao extends BaseMapper<ComActSocialMember> { /** * 分页查询 * @param page * @param commonPage * @return */ IPage<ComActSocialMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage); /** * 详情 * @return */ ComActSocialMemberVO detail(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java
New file @@ -0,0 +1,107 @@ package com.panzhihua.service_community.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; /** * 社会组织成员表(ComActSocialMember)表实体类 * * @author makejava * @since 2021-10-22 09:52:46 */ @Data @Builder @AllArgsConstructor @NoArgsConstructor @ApiModel("社会组织成员表") public class ComActSocialMember implements Serializable { private static final long serialVersionUID = 279847158941704646L; @TableId(type = IdType.AUTO) private Long id; /** * 姓名 */ @ApiModelProperty(value = "姓名") private String name; /** * 手机号 */ @ApiModelProperty(value = "手机号") private String phone; /** * 社会组织id */ @ApiModelProperty(value = "社会组织id") private Long orgId; /** * 职位 */ @ApiModelProperty(value = "职位") private String position; /** * 身份证号 */ @ApiModelProperty(value = "身份证号") private String idCard; /** * 账号 */ @ApiModelProperty(value = "账号") private String account; /** * 密码 */ @ApiModelProperty(value = "密码") private String password; /** * 状态1启用 0停用 */ @ApiModelProperty(value = "状态1启用 0停用") private Integer status; /** * 照片 */ @ApiModelProperty(value = "照片") private String image; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") private Date createTime; /** * 街道id */ @ApiModelProperty(value = "街道id") private Long streetId; /** * 用户id */ private Long userId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialMemberService.java
New file @@ -0,0 +1,49 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.vos.ComActSocialMemberVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.dtos.property.CommonPage; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.service_community.entity.ComActSocialMember; /** * 社会组织成员表(ComActSocialMember)表服务接口 * * @author makejava * @since 2021-10-22 09:52:46 */ public interface ComActSocialMemberService extends IService<ComActSocialMember> { /** * 分页查询 * * @param commonPage * @return */ R pageList(CommonPage commonPage); /** * 新增 * @param comActSocialMemberVO * @return */ R insert(ComActSocialMemberVO comActSocialMemberVO); /** * 修改 * @param comActSocialMemberVO * @return */ R update(ComActSocialMemberVO comActSocialMemberVO); /** * 详情 * @param id * @return */ R detail(Long id); /** * 删除 */ R delete(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java
New file @@ -0,0 +1,103 @@ package com.panzhihua.service_community.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.ComActSocialMemberVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.entity.ComActSocialMember; import com.panzhihua.service_community.dao.ComActSocialMemberDao; import com.panzhihua.service_community.service.ComActSocialMemberService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; /** * 社会组织成员表(ComActSocialMember)表服务实现类 * * @author makejava * @since 2021-10-22 09:52:47 */ @Slf4j @Service public class ComActSocialMemberServiceImpl extends ServiceImpl<ComActSocialMemberDao, ComActSocialMember> implements ComActSocialMemberService { @Resource private ComActSocialMemberDao comActSocialMemberDao; @Resource private UserService userService; @Override public R pageList(CommonPage commonPage) { return R.ok(this.comActSocialMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage)); } @Override public R insert(ComActSocialMemberVO comActSocialMemberVO) { ComActSocialMember comActSocialMember=new ComActSocialMember(); BeanUtils.copyProperties(comActSocialMemberVO,comActSocialMember); Integer count=this.comActSocialMemberDao.selectCount(new QueryWrapper<ComActSocialMember>().lambda().eq(ComActSocialMember::getAccount,comActSocialMemberVO.getAccount()).eq(ComActSocialMember::getName,comActSocialMemberVO.getName())); if(count>0){ return R.fail("姓名或账号已存在"); } AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO(); administratorsUserVO.setType(3); administratorsUserVO.setAccount(comActSocialMemberVO.getAccount()); administratorsUserVO.setPassword(comActSocialMemberVO.getPassword()); //根据roleId判断是普通社会组织还是定制三社 administratorsUserVO.setSocialType(3); administratorsUserVO.setRoleId(777777777L); if(comActSocialMemberVO.getStreetId()!=null){ administratorsUserVO.setStreetId(comActSocialMemberVO.getStreetId()); } administratorsUserVO.setName(comActSocialMemberVO.getName()); administratorsUserVO.setPhone(comActSocialMemberVO.getPhone()); R r=userService.addUserBackstageProperty(administratorsUserVO); if(R.isOk(r)){ comActSocialMember.setCreateTime(new Date()); comActSocialMember.setUserId(Long.parseLong(r.getData().toString())); this.comActSocialMemberDao.insert(comActSocialMember); return R.ok(); } return r; } @Override public R update(ComActSocialMemberVO comActSocialMemberVO) { ComActSocialMember comActSocialMember=this.comActSocialMemberDao.selectById(comActSocialMemberVO.getId()); if(comActSocialMember!=null){ if(comActSocialMemberVO.getStatus()==0){ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO(); administratorsUserVO.setUserId(comActSocialMember.getUserId()); administratorsUserVO.setStatus(0); userService.putUserBackstage(administratorsUserVO); } ComActSocialMember comActSocialMember1=new ComActSocialMember(); BeanUtils.copyProperties(comActSocialMemberVO,comActSocialMember1); return this.comActSocialMemberDao.updateById(comActSocialMember1)>0?R.ok():R.fail(); } return R.fail("参数错误"); } @Override public R detail(Long id) { return R.ok(this.comActSocialMemberDao.detail(id)); } @Override public R delete(Long id) { ComActSocialMember comActSocialMember=this.comActSocialMemberDao.selectById(id); if(comActSocialMember!=null){ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO(); administratorsUserVO.setUserId(comActSocialMember.getUserId()); userService.deleteUserBackstage(administratorsUserVO); return this.comActSocialMemberDao.deleteById(id)>0?R.ok():R.fail(); } return R.fail("参数错误"); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml
New file @@ -0,0 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.panzhihua.service_community.dao.ComActSocialMemberDao"> <resultMap type="com.panzhihua.service_community.entity.ComActSocialMember" id="ComActSocialMemberBaseResultMap"> <result property="id" column="id"/> <result property="name" column="name"/> <result property="phone" column="phone"/> <result property="orgId" column="org_id"/> <result property="position" column="position"/> <result property="idCard" column="id_card"/> <result property="account" column="account"/> <result property="password" column="password"/> <result property="status" column="status"/> <result property="image" column="image"/> <result property="createTime" column="create_time"/> <result property="streetId" column="street_id"/> </resultMap> <select id="pageList" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO"> select t.*,t1.name as orgName from com_act_social_member t left join com_act_social_org t1 on t.org_id = t1.id <where> 1=1 <if test="commonPage.keyword!=null and commonPage.keyword !=''"> and (t.name like concat('%',#{commonPage.keyword},'%') or t.phone like concat('%',#{commonPage.keyword},'%') or t.account like concat('%',#{commonPage.keyword},'%') ) </if> <if test="commonPage.status!=null "> and t.status = #{commonPage.status} </if> <if test="commonPage.paramId!=null "> and t.org_id = #{commonPage.paramId} </if> <if test="commonPage.streetId!=null "> and t.street_id = #{commonPage.streetId} </if> </where> order by t.create_time desc </select> <select id="detail" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO"> select t.*,t1.name from com_act_social_member t left join com_street t1 on t.street_id = t1.street_id where t.id =#{id} </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1163,7 +1163,7 @@ menu.add(238L); } else if(administratorsUserVO.getSocialType()==3){ sysRoleDO.setRoleKey("social_org" + administratorsUserVO.getStreetId()); sysRoleDO.setRoleKey("social_org_member" + administratorsUserVO.getStreetId()); menu.add(233L); menu.add(237L); } @@ -1174,15 +1174,15 @@ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey())); if(sysRoleDO1!=null){ sysRoleDO=sysRoleDO1; roleId = sysRoleDO.getRoleId(); }else{ roleDAO.insert(sysRoleDO); } roleId = sysRoleDO.getRoleId(); // 新街道管理员角色设置固定三社权限 MenuRoleVO menuRoleVO = new MenuRoleVO(); menuRoleVO.setMenuIds(menu); menuRoleVO.setRoleId(roleId); this.putMenuRole(menuRoleVO); } } SysRoleDO roleDO = roleDAO.selectById(roleId); if (ObjectUtils.isEmpty(roleDO)) {
