Merge branch 'four_member' into 'test'

罗元桥

2021-09-24 d091820e1068a1b7b84194aa6162b4d9e6773771

Merge branch 'four_member' into 'test'

Four member

See merge request root/zhihuishequ!188

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java

New file
@@ -0,0 +1,46 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
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;

/**
 * (ComActFourMember)表控制层
 *
 * @author makejava
 * @since 2021-09-23 10:13:31
 */
@Slf4j
@Api(tags = {"四长四员"})
@RestController
@RequestMapping("comActFourMember")
public class ComActFourMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActFourMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        commonPage.setStatus(1);
        return this.communityService.comActFourMemberSelectAll(commonPage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -4,6 +4,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -44,6 +45,11 @@
    public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
        return communityService.pageArea(comMngStructAreaVO);
    }
    @ApiOperation(value = "新分页查询小区", response = ComMngVillageVO.class)
    @PostMapping("pagevillage")
    public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
        return communityService.pageVillage(pageComMngVillageDTO);
    }

    @ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
    @PostMapping("pagedynamic")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -89,8 +89,8 @@
    public Long getAreaId() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long areaId = loginUserInfo.getAreaId();
        if (null == areaId || 0 == areaId) {
            throw new ServiceException("用户未绑定社区");
        if (null == areaId) {
            throw new ServiceException("用户未绑定小区");
        }
        return areaId;
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -51,4 +51,8 @@
    private String serialNo;
    @ApiModelProperty("小区id")
    private Long areaId;
    @ApiModelProperty("关键字")
    private String keyword;
    @ApiModelProperty("职务")
    private String position;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BuildingVO.java

New file
@@ -0,0 +1,9 @@
package com.panzhihua.common.model.vos.community;

import lombok.Data;

@Data
public class BuildingVO {
    private String label;
    private String value;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java

New file
@@ -0,0 +1,88 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.Pattern;
import java.util.Date;
import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("四长四员实体")
public class ComActFourMemberVO {
    private Integer id;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 职位
     */
    @ApiModelProperty(value = "职位")
    private String position;

    /**
     * 管辖区域
     */
    @ApiModelProperty(value = "管辖区域")
    private String jurisdiction;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    @ApiModelProperty("账户")
    @Pattern(groups = {AddGroup.class}, message = "【账户】2-20个字符，英文，数字", regexp = "^[0-9A-Za-z]{2,20}$")
    private String account;

    @ApiModelProperty("密码")
    @Pattern(groups = {AddGroup.class}, message = "【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",
            regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
    private String password;

    @ApiModelProperty("用户名称")
    @Pattern(groups = {AddGroup.class}, message = "【用户名称】2-16个字符，英文，中文，数字", regexp = "^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
    private String name;

    @ApiModelProperty("角色")
    @Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
    private Long roleId;

    @ApiModelProperty("手机号")
    @Pattern(groups = {AddGroup.class}, message = "【手机号】格式错误", regexp = "1[3|4|5|7|8][0-9]\\d{8}")
    private String phone;

    @ApiModelProperty("状态 1 启用 2 禁用")
    @Min(groups = {AddGroup.class}, value = 1, message = "账户状态不能为空")
    private Integer status;

    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty("管辖区域内容")
    private List<String> buildings;

    @ApiModelProperty("图片")
    private String url;

    @ApiModelProperty("id数组")
    private Integer[] ids;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VillageVO.java

New file
@@ -0,0 +1,12 @@
package com.panzhihua.common.model.vos.community;

import lombok.Data;

import java.util.List;

@Data
public class VillageVO {
    private String value;
    private String label;
    List<BuildingVO> children;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java

@@ -70,4 +70,7 @@

    @ApiModelProperty(value = "街路巷id")
    private Long villageId;

    @ApiModelProperty(value = "回显路径")
    private String path;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -85,4 +85,7 @@
    @ApiModelProperty(value = "用户昵称")
    private String nickName;

    @ApiModelProperty(value = "身份证")
    private String idCard;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6076,6 +6076,69 @@
    R comPropertyDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActFourMember/queryAll")
    R comActFourMemberSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActFourMember/{id}")
    R comActFourMemberSelectOne(@PathVariable("id") Integer id);

    /**
     * 新增数据
     *
     * @param comActFourMember 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActFourMember")
    R comActFourMemberInsert(@RequestBody ComActFourMemberVO comActFourMember);

    /**
     * 修改数据
     *
     * @param comActFourMember 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActFourMember/update")
    R comActFourMemberUpdate(@RequestBody ComActFourMemberVO comActFourMember);

    /**
     * 删除数据
     *
     * @param comActFourMember 主键结合
     * @return 删除结果
     */
    @PostMapping("/comActFourMember/del")
    R comActFourMemberDelete(@RequestBody ComActFourMemberVO comActFourMember);

    /**
     * 楼栋查询
     * @param communityId
     * @return
     */
    @GetMapping("/building/query")
    R comActFourMemberQueryBuilding(@RequestParam("communityId")Long communityId);

    /**
     * 查询房屋二级级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/second/list")
    R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 微心愿处理人列表
     * @param communityId   社区id
     * @param type  处理人类型（1.后台用户  2.党员  3.志愿者）

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -139,6 +139,16 @@
    R resetPassword(@RequestParam("userId") Long userId);

    /**
     * 批量重置密码用户登录密码默认admin123456
     *
     * @param userIds
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds);

    /**
     * 某社区后台人员查询
     * 
     * @param param

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java

New file
@@ -0,0 +1,103 @@
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.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
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;

/**
 * (ComActFourMember)表控制层
 *
 * @author makejava
 * @since 2021-09-23 10:13:31
 */
@Slf4j
@Api(tags = {"四长四员"})
@RestController
@RequestMapping("comActFourMember")
public class ComActFourMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActFourMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comActFourMemberSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value ="通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return this.communityService.comActFourMemberSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comActFourMember 实体对象
     * @return 新增结果
     */
    @ApiOperation(value ="新增数据")
    @PostMapping
    public R insert(@RequestBody ComActFourMemberVO comActFourMember) {
        comActFourMember.setCommunityId(this.getCommunityId());
        return this.communityService.comActFourMemberInsert(comActFourMember);
    }

    /**
     * 修改数据
     *
     * @param comActFourMember 实体对象
     * @return 修改结果
     */
    @ApiOperation(value ="修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActFourMemberVO comActFourMember) {
        return this.communityService.comActFourMemberUpdate(comActFourMember);
    }

    /**
     * 删除数据
     *
     * @param comActFourMember 主键结合
     * @return 删除结果
     */
    @ApiOperation(value ="删除数据")
    @PostMapping("del")
    public R delete(@RequestBody ComActFourMemberVO comActFourMember) {
        return this.communityService.comActFourMemberDelete(comActFourMember);
    }

    /**
     * 楼栋列表
     */
    @ApiOperation("楼栋列表")
    @GetMapping("/building")
    public R building(){
        return communityService.comActFourMemberQueryBuilding(this.getCommunityId());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyRepairApi.java

@@ -30,7 +30,9 @@
    @PostMapping("/queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        //commonPage.setAreaId(this.getAreaId());
        if(this.getAreaId()!=null&&this.getAreaId()!=0L){
            commonPage.setAreaId(this.getAreaId());
        }
        return this.propertyService.comPropertyRepairSelectAll(commonPage);
    }


 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java

@@ -2750,6 +2750,20 @@
        return communityService.getCascadeHouseAddress(cascadeHouseDTO);
    }

    /**
     * 查询房屋二级级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @ApiOperation(value = "房屋级联菜单查询")
    @PostMapping("/second/list")
    public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        cascadeHouseDTO.setCommunityId(this.getCommunityId());
        return communityService.getSecondHouseAddress(cascadeHouseDTO);
    }

    @ApiOperation(value = "分页查询实有房屋列表", response = ComMngPopulationHouseAdminVO.class)
    @PostMapping("/pageHouse")
    public R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/UserApi.java

@@ -54,6 +54,12 @@
        return userService.resetPassword(userId);
    }

    @ApiOperation("批量重置密码")
    @GetMapping("resetPasswordPatch")
    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId){
        return userService.resetPasswordPatch(userId);
    }

    @ApiOperation(value = "用户菜单获取", response = SysMenuVO.class)
    @GetMapping("listmenu")
    public R listmenu() {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.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.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.service_community.entity.ComActFourMember;
import com.panzhihua.service_community.service.ComActFourMemberService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (ComActFourMember)表控制层
 *
 * @author makejava
 * @since 2021-09-23 10:13:31
 */
@RestController
@RequestMapping("comActFourMember")
public class ComActFourMemberApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActFourMemberService comActFourMemberService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActFourMemberService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return this.comActFourMemberService.get(id);
    }

    /**
     * 新增数据
     *
     * @param comActFourMember 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActFourMemberVO comActFourMember) {
        return this.comActFourMemberService.insert(comActFourMember);
    }

    /**
     * 修改数据
     *
     * @param comActFourMember 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActFourMemberVO comActFourMember) {
        return this.comActFourMemberService.update(comActFourMember);
    }

    /**
     * 删除数据
     *
     * @param comActFourMember 主键结合
     * @return 删除结果
     */
    @PostMapping("del")
    public R delete(@RequestBody ComActFourMemberVO comActFourMember) {
        return this.comActFourMemberService.delete(comActFourMember);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java

@@ -5,6 +5,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.service_community.dao.ComMngBuildingDAO;
import com.panzhihua.service_community.model.dos.ComMngBuildingDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

@@ -40,6 +43,8 @@
    private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
    @Resource
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComMngBuildingDAO comMngBuildingDAO;

    /**
     * 新增实有房屋
@@ -263,4 +268,9 @@
        return comMngVillageService.getGridVillageListExport(villageListAppDTO);
    }

    @GetMapping("/building/query")
    public R queryBuilding(@RequestParam("communityId")Long communityId){
        return R.ok(comMngBuildingDAO.select(communityId));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -751,6 +751,17 @@
    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
    }
    /**
     * 查询房屋二级级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/population/second/list")
    public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        return comMngPopulationHouseService.getSecondHouseAddress(cascadeHouseDTO);
    }

    /**
     * 分页查询房屋列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActFourMemberDao.java

New file
@@ -0,0 +1,29 @@
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.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActFourMember;
import org.apache.ibatis.annotations.Param;

/**
 * (ComActFourMember)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-23 10:13:30
 */
@Mapper
public interface ComActFourMemberDao extends BaseMapper<ComActFourMember> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActFourMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    ComActFourMemberVO getById(Integer id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngBuildingDAO.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.vos.community.VillageVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

@@ -16,4 +17,8 @@
public interface ComMngBuildingDAO extends BaseMapper<ComMngBuildingDO> {
    @Select("select street_id,act_id,village_id,name from com_mng_building")
    List<ComMngBuildingDO> findAllBuilding();

    List<String> find(String ids);

    List<VillageVO> select(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.vos.community.VillageVO;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -686,4 +688,10 @@

    void updateAll(@Param("populationList") List<ComMngPopulationDO> populationList);

    /**
     * 房屋二级联动
     * @param communityId
     * @return
     */
    List<VillageVO> getSecondHouseAddress(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java

New file
@@ -0,0 +1,72 @@
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;


/**
 * (ComActFourMember)表实体类
 *
 * @author makejava
 * @since 2021-09-23 10:13:30
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComActFourMember implements Serializable {

    private static final long serialVersionUID = 905771115750112478L;

    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 职位
     */
    @ApiModelProperty(value = "职位")
    private String position;

    /**
     * 管辖区域
     */
    @ApiModelProperty(value = "管辖区域")
    private String jurisdiction;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    @ApiModelProperty(value = "管辖区域内容")
    private String jurisdictionContent;

    @ApiModelProperty(value = "照片")
    private String url;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java

New file
@@ -0,0 +1,43 @@
package com.panzhihua.service_community.service;

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.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.service_community.entity.ComActFourMember;

/**
 * (ComActFourMember)表服务接口
 *
 * @author makejava
 * @since 2021-09-23 10:13:31
 */
public interface ComActFourMemberService extends IService<ComActFourMember> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 新增
     * @param comActFourMemberVO
     * @return
     */
    R insert(ComActFourMemberVO comActFourMemberVO);

    /**
     * 修改
     * @param comActFourMemberVO
     * @return
     */
    R update(ComActFourMemberVO comActFourMemberVO);

    /**
     * 删除
     */
    R delete(ComActFourMemberVO comActFourMemberVO);

    R get(Integer id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java

@@ -29,6 +29,15 @@
    R getCascadeHouseAddress(CascadeHouseDTO cascadeHouseDTO);

    /**
     * 查询二级房屋级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    R getSecondHouseAddress(CascadeHouseDTO cascadeHouseDTO);

    /**
     * 分页查询房屋列表
     * 
     * @param populationHouseAdminDTO

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java

@@ -57,6 +57,7 @@
                this.comActCommitteeDao.insert(comActCommittee);
                return R.ok();
            }
            return R.fail(r.getMsg());
        }
        return R.fail();
    }
@@ -82,12 +83,10 @@
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActCommittee.getUserId());
                administratorsUserVO.setCommunityId(comActCommittee.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActCommitteeDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                userService.deleteUserBackstage(administratorsUserVO);
                this.comActCommitteeDao.deleteById(id);
                return R.ok();

            }
        }
        return R.fail("用户账号错误");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java

New file
@@ -0,0 +1,159 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
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.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComMngBuildingDAO;
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.entity.ComActFourMember;
import com.panzhihua.service_community.dao.ComActFourMemberDao;
import com.panzhihua.service_community.model.dos.ComMngBuildingDO;
import com.panzhihua.service_community.service.ComActFourMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

/**
 * (ComActFourMember)表服务实现类
 *
 * @author makejava
 * @since 2021-09-23 10:13:31
 */
@Slf4j
@Service
public class ComActFourMemberServiceImpl extends ServiceImpl<ComActFourMemberDao, ComActFourMember> implements ComActFourMemberService {
    @Resource
    private ComActFourMemberDao comActFourMemberDao;
    @Resource
    private ComMngBuildingDAO comMngBuildingDAO;
    @Resource
    private UserService userService;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R insert(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
            ComActFourMember comActFourMember=new ComActFourMember();
            List<String> jurisdictionList=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
            if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
                comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                administratorsUserVO.setType(3);
                R r=userService.addUserBackstageProperty(administratorsUserVO);
                if(R.isOk(r)){
                    comActFourMemberVO.setUserId(Long.parseLong(r.getData().toString()));
                    comActFourMemberVO.setCreateTime(DateUtil.date());
                    BeanUtils.copyProperties(comActFourMemberVO,comActFourMember);
                    this.comActFourMemberDao.insert(comActFourMember);
                    return R.ok();
                }
                return R.fail(r.getMsg());
            }
            return R.fail("绑定管辖区域不能为空或重复");
        }
        return R.fail();
    }

    @Override
    public R update(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO!=null){
            if(comActFourMemberVO.getIds()!=null){
                for(Integer id:comActFourMemberVO.getIds()){
                    ComActFourMember comActFourMember=new ComActFourMember();
                    ComActFourMember comActFourMemberBase=this.comActFourMemberDao.selectById(id);
                    if(comActFourMemberBase!=null){
                        comActFourMember.setId(comActFourMemberBase.getId());
                        comActFourMember.setUserId(comActFourMemberBase.getUserId());
                    }
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                    userService.putUserBackstage(administratorsUserVO);
                }
                return R.ok();
            }
            else {
                ComActFourMember comActFourMember=new ComActFourMember();
                ComActFourMember comActFourMemberBase=this.comActFourMemberDao.selectById(comActFourMemberVO.getId());
                if(comActFourMemberBase!=null){
                    comActFourMember.setId(comActFourMemberBase.getId());
                    comActFourMember.setUserId(comActFourMemberBase.getUserId());
                }
                if(comActFourMemberVO.getJurisdiction()!=null){
                    List<String> jurisdictionList=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
                    if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
                        comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                    }
                    else {
                        return R.fail("绑定管辖区域不能为空或重复");
                    }
                }
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                R r=userService.putUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    BeanUtils.copyProperties(comActFourMemberVO,comActFourMember);
                    this.comActFourMemberDao.updateById(comActFourMember);
                    return R.ok();
                }
                return R.fail("修改失败");
            }

        }
        return R.fail();
    }

    @Override
    public R delete(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO.getIds()!=null){
            for(Integer id: comActFourMemberVO.getIds()){
                ComActFourMember comActFourMember=comActFourMemberDao.selectById(id);
                if(comActFourMember!=null){
                    if(comActFourMember.getUserId()!=null){
                        AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                        administratorsUserVO.setUserId(comActFourMember.getUserId());
                        administratorsUserVO.setCommunityId(comActFourMember.getCommunityId());
                        userService.deleteUserBackstage(administratorsUserVO);
                        this.comActFourMemberDao.deleteById(id);
                    }
                }
            }
            return R.ok();
        }
        else {
            ComActFourMember comActFourMember=comActFourMemberDao.selectById(comActFourMemberVO.getId());
            if(comActFourMember!=null){
                if(comActFourMember.getUserId()!=null){
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    administratorsUserVO.setUserId(comActFourMember.getUserId());
                    administratorsUserVO.setCommunityId(comActFourMember.getCommunityId());
                    userService.deleteUserBackstage(administratorsUserVO);
                    this.comActFourMemberDao.deleteById(comActFourMemberVO.getId());
                    return R.ok();

                }
            }
            return R.fail("用户账号错误");
        }


    }

    @Override
    public R get(Integer id) {
        return R.ok(comActFourMemberDao.getById(id));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java

@@ -53,6 +53,8 @@
            administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
            administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            administratorsUserVO.setName(comActSocialOrgVO.getContactName());
            administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comActSocialOrg.setUserId(Long.parseLong(r.getData().toString()));
@@ -60,6 +62,7 @@
                this.comActSocialOrgDao.insert(comActSocialOrg);
                return R.ok();
            }
            return R.fail(r.getMsg());
        }
        return R.fail();
    }
@@ -84,12 +87,9 @@
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActSocialOrg.getUserId());
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActSocialOrgDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                userService.deleteUserBackstage(administratorsUserVO);
                this.comActSocialOrgDao.deleteById(id);
                return R.ok();
            }
        }
        return R.fail("用户账号错误");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java

@@ -165,6 +165,11 @@
        return R.ok(cascadeHouseVOList);
    }

    @Override
    public R getSecondHouseAddress(CascadeHouseDTO cascadeHouseDTO) {
        return R.ok(this.comMngPopulationDAO.getSecondHouseAddress(cascadeHouseDTO.getCommunityId()));
    }

    /**
     * 分页查询房屋列表
     *

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java

@@ -55,6 +55,8 @@
            administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
            administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
            administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
            administratorsUserVO.setName(comPropertyVO.getContactName());
            administratorsUserVO.setPhone(comPropertyVO.getPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comProperty.setUserId(Long.parseLong(r.getData().toString()));
@@ -62,6 +64,7 @@
                this.comPropertyDao.insert(comProperty);
                return R.ok();
            }
            return R.fail(r.getMsg());
        }
        return R.fail();
    }
@@ -85,12 +88,9 @@
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comProperty.getUserId());
                administratorsUserVO.setCommunityId(comProperty.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comPropertyDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                userService.deleteUserBackstage(administratorsUserVO);
                this.comPropertyDao.deleteById(id);
                return R.ok();
            }
        }
        return R.fail("用户账号错误");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml

@@ -14,9 +14,9 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActCommiteeVO">
        select t.*,t1.account,t1.password,t2.area_name as areaName,t3.role_id as roleId from com_act_committee t
        select t.*,t1.account,t1.password,t2.name as areaName,t3.role_id as roleId from com_act_committee t
        left join sys_user t1 on t.user_id = t1.user_id
        left join com_mng_struct_area t2 on t.area_id = t2.id
        left join com_mng_village t2 on t.area_id = t2.village_id
        left join sys_user_role t3 on t.user_id = t3.user_id
        <where>
            1=1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

New file
@@ -0,0 +1,50 @@
<?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.ComActFourMemberDao">

    <resultMap type="com.panzhihua.service_community.entity.ComActFourMember" id="ComActFourMemberBaseResultMap">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="position" column="position"/>
        <result property="jurisdiction" column="jurisdiction"/>
        <result property="communityId" column="community_id"/>
        <result property="createTime" column="create_time"/>
        <result property="jurisdictionContent" column="jurisdiction_content"/>
    </resultMap>

    <resultMap id="baseResultMap" type="com.panzhihua.common.model.vos.community.ComActFourMemberVO">
        <collection property="buildings"
                    ofType="String"
                    column="{id = jurisdiction}"
                    select="selectBuilding"
                    javaType="java.util.ArrayList" />
    </resultMap>

    <select id="pageList" resultMap="baseResultMap">
        select t.*,t1.* from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id
        <where>
            1=1
            <if test="commonPage.paramId !=null">
                and t.community_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.position !=null and commonPage.position !=''">
                and t.position like concat(#{commonPage.position},'%')
            </if>
            <if test="commonPage.keyword !=null and commonPage.keyword !=''">
                and (t1.name like concat(#{commonPage.keyword},'%') or t1.phone like concat(#{commonPage.keyword},'%') or t.jurisdiction_content like concat(#{commonPage.keyword},'%'))
            </if>
            <if test="commonPage.status !=null">
                and t1.status =#{commonPage.status}
            </if>
        </where>
    </select>

    <select id="selectBuilding" resultType="String">
        select concat(t1.group_at,t.name,'栋') from com_mng_building t left join com_mng_village t1 on t.village_id = t1.village_id where t.id in (#{id})
    </select>

    <select id="getById" resultMap="baseResultMap">
        select t.*,t1.* from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id where t.id =#{id}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml

@@ -55,7 +55,7 @@
                and t.name like concat(#{commonPage.name},'%')
            </if>
            <if test="commonPage.serialNo!=null and commonPage.serialNo!=''">
                and t.agencyCode like concat(#{commonPage.serialNo},'%')
                and t.agency_code like concat(#{commonPage.serialNo},'%')
            </if>
            <if test="commonPage.username!=null and commonPage.username!=''">
                and t.corporation_name like concat(#{commonPage.username},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

New file
@@ -0,0 +1,53 @@
<?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.ComMngBuildingDAO">

    <resultMap type="com.panzhihua.service_community.model.dos.ComMngBuildingDO" id="ComMngBuildingBaseResultMap">
        <result property="id" column="id"/>
        <result property="streetId" column="street_id"/>
        <result property="actId" column="act_id"/>
        <result property="villageId" column="village_id"/>
        <result property="name" column="name"/>
        <result property="buildFloorSum" column="build_floor_sum"/>
        <result property="everyFloorSum" column="every_floor_sum"/>
        <result property="buildUserSum" column="build_user_sum"/>
        <result property="buildType" column="build_type"/>
        <result property="buildStructure" column="build_structure"/>
        <result property="useType" column="use_type"/>
        <result property="buildDate" column="build_date"/>
        <result property="unitTotal" column="unit_total"/>
        <result property="elevatorTotal" column="elevator_total"/>
        <result property="buildStatus" column="build_status"/>
        <result property="path" column="path"/>
        <result property="lng" column="lng"/>
        <result property="lat" column="lat"/>
        <result property="buildingResponsible" column="building_responsible"/>
        <result property="buildingResponsibleCardNo" column="building_responsible_card_no"/>
        <result property="buildingResponsiblePhone" column="building_responsible_phone"/>
        <result property="buildingResponsibleType" column="building_responsible_type"/>
        <result property="createAt" column="create_at"/>
        <result property="updateAt" column="update_at"/>
        <result property="remark" column="remark"/>
        <result property="gridId" column="grid_id"/>
    </resultMap>

    <select id="find" resultType="String">
        select concat(t1.group_at,t.name,'栋') from com_mng_building t left join com_mng_village t1 on t.village_id = t1.village_id where t.id in (#{id})
    </select>

    <resultMap id="selectMap" type="com.panzhihua.common.model.vos.community.VillageVO">
        <result property="value" column="villageId"/>
        <result property="label" column="villageName"/>
        <collection property="children" ofType="com.panzhihua.common.model.vos.community.BuildingVO"
                    column="{village_id = village_id}"
                    javaType="java.util.ArrayList">
            <result property="value" column="id"/>
            <result property="label" column="name"/>
        </collection>
    </resultMap>

    <select id="select" resultMap="selectMap">
        select t.village_id as villageId,t.name as villageName,t1.id,t1.name  from com_mng_village t left join com_mng_building t1 on t.village_id = t1.village_id where t.community_id=#{id} and t1.id is not null
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -225,4 +225,19 @@
        ;
    </update>

    <resultMap id="selectMap" type="com.panzhihua.common.model.vos.community.VillageVO">
        <result property="value" column="villageId"/>
        <result property="label" column="villageName"/>
        <collection property="children" ofType="com.panzhihua.common.model.vos.community.BuildingVO"
                    column="{village_id = village_id}"
                    javaType="java.util.ArrayList">
            <result property="value" column="id"/>
            <result property="label" column="name"/>
        </collection>
    </resultMap>

    <select id="getSecondHouseAddress" resultMap="selectMap">
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋',t1.floor,'单元',t1.code,'号') as name  from com_mng_village t left join com_mng_population_house t1 on t.village_id = t1.village_id where t.community_id=#{communityId} and t1.id is not null
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml

@@ -16,9 +16,9 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComPropertyVO">
        select t.*,t1.account,t1.password,t2.area_name as areaName,t3.role_id as roleId from com_property t
        select t.*,t1.account,t1.password,t2.name as areaName,t3.role_id as roleId from com_property t
        left join sys_user t1 on t.user_id = t1.user_id
        left join com_mng_struct_area t2 on t.area_id = t2.id
        left join com_mng_village t2 on t.area_id = t2.village_id
        left join sys_user_role t3 on t.user_id = t3.user_id
        <where>
            1=1
@@ -31,6 +31,12 @@
            <if test="commonPage.phone !=null and commonPage.phone !=''">
                and t.phone like concat(#{commonPage.phone},'%')
            </if>
            <if test="commonPage.paramId !=null">
                and t.community_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.areaId !=null">
                and t.area_id =#{commonPage.areaId}
            </if>
        </where>
        order by t.create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyEquipment.java

@@ -96,4 +96,9 @@
     */
    @ApiModelProperty("街路巷id")
    private Long villageId;

    /**
     * 回显路径
     */
    private String path;
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyEquipmentMapper.xml

@@ -13,6 +13,8 @@
        <result property="createTime" column="create_time"/>
        <result property="type" column="type"/>
        <result property="username" column="username"/>
        <result property="villageId" column="villageId"/>
        <result property="path" column="path"/>
    </resultMap>

    <select id="pageList" resultMap="ComPropertyEquipmentBaseResultMap">

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml

@@ -58,6 +58,7 @@
                and t.create_by =#{commonPage.userId}
            </if>
        </where>
    order by t.create_time desc
    </select>

    <select id="selectDetail" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO">

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -139,6 +139,18 @@
    }

    /**
     * 批量重置密码
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId) {
        return userService.resetPasswordPatch(userId);
    }

    /**
     * 某社区后台人员查询
     *
     * @param param

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -702,6 +702,11 @@
    R resetPassword(Long userId);

    /**
     * 批量重置密码
     */
    R resetPasswordPatch(Long[] userId);

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO
     * @return 商家用户id

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java

@@ -30,6 +30,7 @@
import com.panzhihua.service_user.service.RoleService;

import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -137,9 +138,7 @@
        } catch (Exception e) {
            e.printStackTrace();
            log.error("新增角色失败，失败原因【{}】", e.getMessage());
            if (e.getMessage().contains("unique_role_name_community_id")) {
                return R.fail("角色已经存在");
            }
        }
        if (insert > 0) {
            SysRoleDO roleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda()
@@ -226,6 +225,12 @@
    public R putMenuRole(MenuRoleVO menuRoleVO) {
        List<Long> menuIds = new ArrayList<>();
        Long roleId = menuRoleVO.getRoleId();
        if(!StringUtils.isEmpty(menuRoleVO.getRoleName())){
            SysRoleDO sysRoleDO=new SysRoleDO();
            sysRoleDO.setRoleId(roleId);
            sysRoleDO.setRoleName(menuRoleVO.getRoleName());
            this.roleDAO.updateById(sysRoleDO);
        }
        // 删除旧的
        sysRoleMenuDAO.delete(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId));
        // 创建新的

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2564,6 +2564,20 @@
        return R.fail();
    }

    @Override
    public R resetPasswordPatch(Long[] userId) {
        if(userId!=null){
            for(Long user:userId){
                SysUserDO sysUserDO = new SysUserDO();
                sysUserDO.setUserId(user);
                String encode = new BCryptPasswordEncoder().encode("admin123456");
                sysUserDO.setPassword(encode);
                userDao.updateById(sysUserDO);
            }
        }
        return R.ok();
    }

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO
@@ -2628,30 +2642,30 @@
    }

    /**
     * 修改便民服务商家绑定账号
     * @param userId 用户id
     * @param account 修改账户
     * @return 修改结果
     */
    @Override
    public R putUserAccount(Long userId, String account) {
        SysUserDO sysUserDO = userDao.selectById(userId);
        if (isNull(sysUserDO)) {
            return R.fail("用户不存在");
        }
        String oldAccount = sysUserDO.getAccount();
        sysUserDO.setAccount(account);
        int result = userDao.updateById(sysUserDO);
        if (result > 0) {
            SysRoleDO sysRoleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>()
                    .lambda().eq(SysRoleDO::getRoleKey, Constants.CONVENIENT_MERCHANT_ROLE_KEY + oldAccount));
            if (nonNull(sysRoleDO)) {
                sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + account);
                roleDAO.updateById(sysRoleDO);
            }
        }
        return R.ok();
 * 修改便民服务商家绑定账号
 * @param userId 用户id
 * @param account 修改账户
 * @return 修改结果
 */
@Override
public R putUserAccount(Long userId, String account) {
    SysUserDO sysUserDO = userDao.selectById(userId);
    if (isNull(sysUserDO)) {
        return R.fail("用户不存在");
    }
    String oldAccount = sysUserDO.getAccount();
    sysUserDO.setAccount(account);
    int result = userDao.updateById(sysUserDO);
    if (result > 0) {
        SysRoleDO sysRoleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>()
                .lambda().eq(SysRoleDO::getRoleKey, Constants.CONVENIENT_MERCHANT_ROLE_KEY + oldAccount));
        if (nonNull(sysRoleDO)) {
            sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + account);
            roleDAO.updateById(sysRoleDO);
        }
    }
    return R.ok();
}

    @Override
    public R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -170,6 +170,7 @@
                u.account like concat(#{administratorsUserVO.account},'%')
            </if>
        </where>
        order by u.create_at desc
    </select>

    <select id="selectCommunityActiveUserOrder" resultType="com.panzhihua.service_user.model.dtos.DataKanbanDTO">