Merge branch 'four_member' into test

101captain

2021-09-26 c0846f715052bfaa5c25054b8d6fe9fa419da374

Merge branch 'four_member' into test

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

@@ -64,4 +64,7 @@

    @ApiModelProperty("车辆数")
    private Integer carTotal = 0;

    @ApiModelProperty("名称")
    private String name;
}

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

@@ -111,12 +111,14 @@
     * 物业id
     */
    @ApiModelProperty(value = "物业id")
    private Integer propertyId;
    private Long propertyId;
    /**
     * 反馈人
     */
    @ApiModelProperty(value = "反馈人名称")
    private String feedback;
    @ApiModelProperty(value = "小区名称")
    private String areaName;

    /**
     * 状态 0 待处理 1待评价 2已结束

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

@@ -146,7 +146,7 @@
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds);
    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);

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

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

@@ -41,7 +41,7 @@
    @ApiOperation(value = "分页查询",response = ComPropertyAlarmVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(2L);
        commonPage.setParamId(this.getCommunityId());
        return propertyService.comPropertyAlarmSelectAll(commonPage);
    }


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

@@ -56,8 +56,8 @@

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

    @ApiOperation(value = "用户菜单获取", response = SysMenuVO.class)

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

@@ -73,4 +73,6 @@
    @ApiModelProperty(value = "社区Id")
    private Long communityId;

    private String password;

}

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

@@ -69,4 +69,6 @@
    @ApiModelProperty(value = "照片")
    private String url;

    private String password;

}

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

@@ -249,4 +249,6 @@
    @ApiModelProperty(value = "登录用户id")
    private Long userId;

    private String password;

}

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

@@ -81,4 +81,6 @@

    private Long areaId;

    private String password;

}

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

@@ -11,6 +11,7 @@
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.dao.ComActCommitteeDao;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.entity.ComProperty;
import com.panzhihua.service_community.service.ComActCommitteeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -57,7 +58,7 @@
                this.comActCommitteeDao.insert(comActCommittee);
                return R.ok();
            }
            return R.fail(r.getMsg());
            return R.fail("账号或手机号已存在");
        }
        return R.fail();
    }
@@ -68,6 +69,14 @@
        if(comActCommiteeVO!=null){
                ComActCommittee comActCommittee=new ComActCommittee();
                BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
                if(comActCommiteeVO.getRoleId()!=null){
                    ComActCommittee comPropertyBase=this.comActCommitteeDao.selectById(comActCommiteeVO.getId());
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    administratorsUserVO.setUserId(comPropertyBase.getUserId());
                    administratorsUserVO.setLastLoginTime(DateUtil.date());
                    administratorsUserVO.setRoleId(comActCommiteeVO.getRoleId());
                    this.userService.putUserBackstage(administratorsUserVO);
                }
                this.comActCommitteeDao.updateById(comActCommittee);
                return R.ok();
        }

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

@@ -73,15 +73,13 @@
        if(comActFourMemberVO!=null){
            if(comActFourMemberVO.getIds()!=null){
                for(Integer id:comActFourMemberVO.getIds()){
                    ComActFourMember comActFourMember=new ComActFourMember();
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    ComActFourMember comActFourMemberBase=this.comActFourMemberDao.selectById(id);
                    if(comActFourMemberBase!=null){
                        comActFourMember.setId(comActFourMemberBase.getId());
                        comActFourMember.setUserId(comActFourMemberBase.getUserId());
                        comActFourMemberVO.setUserId(comActFourMemberBase.getUserId());
                        BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                        userService.putUserBackstage(administratorsUserVO);
                    }
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                    userService.putUserBackstage(administratorsUserVO);
                }
                return R.ok();
            }

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.service.ComActSocialOrgService;
@@ -62,7 +63,7 @@
                this.comActSocialOrgDao.insert(comActSocialOrg);
                return R.ok();
            }
            return R.fail(r.getMsg());
            return R.fail("账号或手机号已存在");
        }
        return R.fail();
    }
@@ -72,6 +73,14 @@
        if(comActSocialOrgVO!=null){
               ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
               BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
                if(comActSocialOrgVO.getRoleId()!=null){
                    ComActSocialOrg comPropertyBase=this.comActSocialOrgDao.selectById(comActSocialOrgVO.getId());
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    administratorsUserVO.setUserId(comPropertyBase.getUserId());
                    administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
                    administratorsUserVO.setLastLoginTime(DateUtil.date());
                    this.userService.putUserBackstage(administratorsUserVO);
                }
               this.comActSocialOrgDao.updateById(comActSocialOrg);
               return R.ok();
        }

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

@@ -64,7 +64,7 @@
                this.comPropertyDao.insert(comProperty);
                return R.ok();
            }
            return R.fail(r.getMsg());
            return R.fail("账号或手机号已存在");
        }
        return R.fail();
    }
@@ -74,6 +74,14 @@
        if(comPropertyVO!=null){
            ComProperty comProperty=new ComProperty();
            BeanUtils.copyProperties(comPropertyVO,comProperty);
            if(comPropertyVO.getRoleId()!=null){
                ComProperty comPropertyBase=this.comPropertyDao.selectById(comPropertyVO.getId());
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comPropertyBase.getUserId());
                administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
                administratorsUserVO.setLastLoginTime(DateUtil.date());
                this.userService.putUserBackstage(administratorsUserVO);
            }
            this.comPropertyDao.updateById(comProperty);
            return R.ok();
        }

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

@@ -41,7 +41,7 @@
    </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 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">

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

@@ -57,10 +57,11 @@


    <select id="selectById" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.*, t1.position, t2.name as solveName
        select t.*, t3.address as position, t2.name as solveName
        from com_property_alarm t
                 left join com_property_equipment t1 on t.serial_no = t1.serial_no
                 left join sys_user t2 on t.solve_id = user_id
                 left join com_mng_population_house t3 on t1.village_id=t3.id
        where t.id=#{id}
    </select>


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

@@ -24,7 +24,7 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO" parameterType="com.panzhihua.common.model.dtos.property.CommonPage">
        select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id left join com_property t2 on t.property_id = t2.area_id
        select t.*,t1.name as feedback,t3.address as areaName from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id left join com_property t2 on t.property_id = t2.area_id left join com_mng_village t3 on t.property_id=t3.village_id
        <where>
            1=1
            <if test="commonPage.status !=null">

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

@@ -146,8 +146,8 @@
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId) {
        return userService.resetPasswordPatch(userId);
    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId,@RequestParam("password")String password) {
        return userService.resetPasswordPatch(userId,password);
    }

    /**

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

@@ -704,7 +704,7 @@
    /**
     * 批量重置密码
     */
    R resetPasswordPatch(Long[] userId);
    R resetPasswordPatch(Long[] userId,String password);

    /**
     * 便民服务新增商家账号

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

@@ -108,7 +108,7 @@
    @Override
    public R listRoleBackstage(Long communityId) {
        List<SysRoleDO> sysRoleDOS =
            roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId));
            roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
        if (ObjectUtils.isEmpty(sysRoleDOS)) {
            return R.fail("角色列表为空");
        }

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

@@ -1090,6 +1090,8 @@
                    throw new ServiceException("手机号已经存在");
                } else if (e.getMessage().contains("union_account_type")) {
                    throw new ServiceException("账户已经存在");
                }else if(e.getMessage().contains("23000")){
                    throw new ServiceException("手机号已存在");
                }

            }
@@ -2565,12 +2567,12 @@
    }

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