数据库所有主键修改为bigint

huanghongfa

2020-12-07 880183edcf14844996e5f515b0c83c69c7dcb2d4

数据库所有主键修改为bigint

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

@@ -75,7 +75,7 @@
            return R.fail("微信用户参数不全");
        }
        WxMaService maService = wxMaConfiguration.getMaService();
        Integer userId = this.getUserId();
        Long userId = this.getUserId();
        boolean empty2 = ObjectUtils.isEmpty(userId);
        if (empty2) {
            throw new UnAuthenticationException();
@@ -105,7 +105,7 @@
            return R.fail("微信用户参数不全");
        }
        WxMaService maService = wxMaConfiguration.getMaService();
        Integer userId = this.getUserId();
        Long userId = this.getUserId();
        boolean empty2 = ObjectUtils.isEmpty(userId);
        if (empty2) {
            throw new UnAuthenticationException();

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

@@ -28,7 +28,7 @@
    @ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
        Integer communityId=1;//todo 获取社区id
        Long communityId=1l;//todo 获取社区id
        Integer type = partyBuildingComPbDynVO.getType();
        if (ObjectUtils.isEmpty(type)) {
            return R.fail("类型不能为空");
@@ -47,18 +47,18 @@

    @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Integer id) {
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingService.infoYnamic(id);
        return r;
    }

    @ApiOperation(value = "增加阅读记录")
    @GetMapping("adddynuser")
    public R addDynUser(@RequestParam("id") Integer id) {
    public R addDynUser(@RequestParam("id") Long id) {
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("主键id不能为空");
        }
        Integer userId = this.getUserId();
        Long userId = this.getUserId();
        ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
        comPbDynUserVO.setCreateAt(new Date());
        comPbDynUserVO.setDynId(id);
@@ -71,7 +71,7 @@
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        //todo 获取用户的社区信息
        Integer communityId = 1;
        Long communityId = 1l;
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.pagePartyCommittee(partyCommitteeVO);
        return r;
@@ -79,7 +79,7 @@

    @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
    @GetMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Integer id) {
    public R activityinfo(@RequestParam("id") Long id) {
        R r = partyBuildingService.activityinfo(id);
        return r;
    }

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

@@ -30,7 +30,7 @@
    @ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
    @GetMapping("info")
    public R getUserInfo(){
        Integer userId = this.getUserId();
        Long userId = this.getUserId();
        boolean empty = ObjectUtils.isEmpty(userId);
        if (empty) {
           throw new UnAuthenticationException();

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

@@ -29,7 +29,7 @@
    @ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
    @GetMapping("info")
    public R getUserInfo(){
        Integer userId = this.getUserId();
        Long userId = this.getUserId();
        boolean empty2 = ObjectUtils.isEmpty(userId);
        if (empty2) {
            throw new UnAuthenticationException();

 springcloud_k8s_panzhihuazhihuishequ/common/pom.xml

@@ -92,6 +92,10 @@
            <artifactId>jsch</artifactId>
            <version>0.1.53</version>
        </dependency>
        <dependency>
            <groupId>jakarta.validation</groupId>
            <artifactId>jakarta.validation-api</artifactId>
        </dependency>
    </dependencies>



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

@@ -28,9 +28,9 @@
     * 获取登录对象信息
     * @return
     */
    public Integer getUserId(){
    public Long getUserId(){
        HttpServletRequest request = this.getRequest();
        Integer header = Integer.valueOf(request.getHeader(UserConstants.USER_ID));
        Long header = Long.valueOf(request.getHeader(UserConstants.USER_ID));
        boolean empty = ObjectUtils.isEmpty(header);
        if (empty) {
            return null;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java

@@ -3,6 +3,7 @@

import com.panzhihua.common.constants.Constants;
import lombok.Data;
import org.springframework.util.ObjectUtils;

import java.io.Serializable;

@@ -77,7 +78,12 @@
        R<T> apiResult = new R<>();
        apiResult.setCode(code);
        apiResult.setData(data);
        apiResult.setMsg(msg);
        if (ObjectUtils.isEmpty(msg)) {
            apiResult.setMsg("失败");
        }else{
            apiResult.setMsg(msg);
        }

        return apiResult;
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java

@@ -17,13 +17,13 @@
public class ComPbDynUserVO {

    @ApiModelProperty("id")
    private Integer id;
    private Long id;

    @ApiModelProperty("党员动态、政策文件id")
    private Integer dynId;
    private Long dynId;

    @ApiModelProperty("小程序用户id")
    private Integer userId;
    private Long userId;

    @ApiModelProperty("阅读时间")
    private Date createAt;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -19,7 +19,7 @@
public class
PartyBuildingActivityVO {
    @ApiModelProperty("党员id")
    private Integer id;
    private Long id;

    @ApiModelProperty("活动名称")
    private String name;
@@ -76,7 +76,7 @@
    private String createBy;

    @ApiModelProperty("社区id")
    private Integer communityId;
    private Long communityId;

    @ApiModelProperty("活动党员列表")
    private List<PartyBuildingMemberVO> partyBuildingMemberVOS;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java

@@ -18,7 +18,7 @@
public class PartyBuildingComPbDynVO {

    @ApiModelProperty("党建动态id")
    private Integer id;
    private Long id;

    @ApiModelProperty("标题")
    private String title;
@@ -45,7 +45,7 @@
    private String content;

    @ApiModelProperty("发布人id")
    private Integer createBy;
    private Long createBy;

    @ApiModelProperty("发布人名字")
    private String createByName;
@@ -63,5 +63,5 @@
    private Integer type;

    @ApiModelProperty("社区id")
    private Integer communityId;
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java

@@ -27,13 +27,13 @@
    @ApiModelProperty(value = "转正时间")
    private Date employmentTime;
    @ApiModelProperty(value = "所属党组织id")
    private Integer orgId;
    private Long orgId;
    @ApiModelProperty(value = "头像图片路径")
    private String photoPath;
    @ApiModelProperty(value = "社区ID",hidden=true)
    private Integer communityId;
    private Long communityId;
    @ApiModelProperty(value = "社区名字")
    private Integer communityName;
    private String communityName;
    @ApiModelProperty(value = "党组织名字")
    private String orgName;
    @ApiModelProperty(value = "手机号")
@@ -43,6 +43,6 @@
    @ApiModelProperty(value = "状态")
    private String status;
    @ApiModelProperty(value = "党员唯一标识id")
    private Integer id;
    private Long id;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java

@@ -14,15 +14,15 @@
@ApiModel("党委")
public class PartyCommitteeVO {
    @ApiModelProperty(value = "党员id")
    private Integer PartyMemberId;
    private Long PartyMemberId;
    @ApiModelProperty(value = "身份id")
    private Integer roleId;
    private Long roleId;
    @ApiModelProperty(value = "身份名字")
    private String roleName;
    @ApiModelProperty(value = "社区id")
    private Integer communityId;
    private Long communityId;
    @ApiModelProperty(value = "主键")
    private Integer id;
    private Long id;
    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java

@@ -14,7 +14,7 @@
@ApiModel("党组织")
public class PartyOrganizationVO {
    @ApiModelProperty(value = "党组织id")
    private String id;
    private Long id;
    @ApiModelProperty(value = "党组织名字")
    private String name;
}

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 修改密码
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 10:23
 **/
@Data
@ApiModel("修改密码")
public class ChangePasswordVO {

    @ApiModelProperty("旧密码")
    @NotEmpty(message = "旧密码不能为空")
    private String oldPassword;

    @ApiModelProperty("新密码")
    @NotEmpty(message = "新密码不能为空")
    @Pattern(message="密码格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
    private String newPassword;


    @ApiModelProperty(hidden = true,value = "当前登录用户id")
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -77,7 +77,7 @@
     * @return 活动详情内容
     */
    @PostMapping("/partybuildIng/activityinfo")
    R activityinfo(@RequestParam("id") Integer id);
    R activityinfo(@RequestParam("id") Long id);

    /**
     * 查询指定社区的所有党员
@@ -146,7 +146,7 @@
     * @return 详情
     */
    @PostMapping("/partybuildIng/infodynamic")
    R infoYnamic(@RequestParam("id") Integer id);
    R infoYnamic(@RequestParam("id") Long id);

    /**
     * 分页查询党员动态/政策文件
@@ -162,7 +162,7 @@
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletedynamic")
    R deleteYnamic(@RequestParam("id") Integer id);
    R deleteYnamic(@RequestParam("id") Long id);

    /**
     * 新增党员活动
@@ -186,7 +186,7 @@
     * @return 发布结果
     */
    @PostMapping("/partybuildIng/releaseactivity")
    R releaseActivity(@RequestParam("id") Integer id);
    R releaseActivity(@RequestParam("id") Long id);

    /**
     * 删除党员活动
@@ -194,7 +194,7 @@
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deleteactivity")
    R deleteActivity(@RequestParam("id") Integer id);
    R deleteActivity(@RequestParam("id") Long id);

    /**
     * 分页查询党员活动
@@ -217,7 +217,7 @@
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartybuildingmember")
    R deleteDynUser(@RequestParam("id") Integer id);
    R deleteDynUser(@RequestParam("id") Long id);

    /**
     * 取消活动

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

@@ -3,8 +3,10 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
@@ -37,7 +39,7 @@
     * @return 维护结果
     */
    @PostMapping("/updateUserWeiXinInfo")
    R updateUserWeiXinInfo(@RequestParam("userId")Integer userId, @RequestParam("nickName")String nickName, @RequestParam("gender")int gender, @RequestParam("avatarUrl")String avatarUrl);
    R updateUserWeiXinInfo(@RequestParam("userId")Long userId, @RequestParam("nickName")String nickName, @RequestParam("gender")int gender, @RequestParam("avatarUrl")String avatarUrl);

    /**
     * 维护微信用户手机号
@@ -46,7 +48,7 @@
     * @return 维护结果
     */
    @PostMapping("/updateUserWeiXinPhone")
    R updateUserWeiXinPhone(@RequestParam("userId")Integer userId, @RequestParam("purePhoneNumber")String purePhoneNumber);
    R updateUserWeiXinPhone(@RequestParam("userId")Long userId, @RequestParam("purePhoneNumber")String purePhoneNumber);

    /**
     * 获取平台用户
@@ -86,4 +88,12 @@
     */
    @PostMapping("/role/listidentity")
    R listIdentity(@RequestParam("communityId")Integer communityId);

    /**
     * 修改用户登录密码
     * @param changePasswordVO 新密码
     * @return 修改结果
     */
    @PostMapping("/user/changepassword")
    R changePassword(@RequestBody ChangePasswordVO changePasswordVO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/controller/BaseController.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/R.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/ChangePasswordVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

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

@@ -59,7 +59,7 @@
    @ApiOperation(value = "社区所有党组织",response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganization")
    public R listPartyOrganization() {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        List<PartyOrganizationVO> partyOrganizationVOList = new ArrayList<>();
        partyOrganizationVOList = partyBuildingService.listPartyOrganization();
        return R.ok(partyOrganizationVOList);
@@ -69,9 +69,9 @@
    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        Long communityId = 1l;
        partyBuildingMemberVO.setCommunityId(communityId);
        R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
        return r;
@@ -80,7 +80,7 @@
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Integer id = partyBuildingMemberVO.getId();
        Long id = partyBuildingMemberVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员id不能为空");
        }
@@ -168,7 +168,7 @@

    @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
    @GetMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Integer id) {
    public R activityinfo(@RequestParam("id") Long id) {
        R r = partyBuildingService.activityinfo(id);
        return r;
    }
@@ -183,7 +183,7 @@
    @ApiOperation(value = "编辑党员活动")
    @PutMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Integer id = partyBuildingActivityVO.getId();
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {//todo 修改报名人数 最低人数 0 的判断
            return R.fail("主键不能为空");
        }
@@ -194,7 +194,7 @@
    @ApiOperation(value = "发布党员活动")
    @PutMapping("releaseactivity")
    public R releaseActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Integer id = partyBuildingActivityVO.getId();
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("主键不能为空");
        }
@@ -205,7 +205,7 @@
    @ApiOperation(value = "删除党员活动")
    @DeleteMapping("deleteactivity")
    public R deleteActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Integer id = partyBuildingActivityVO.getId();
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("主键不能为空");
        }
@@ -216,7 +216,7 @@
    @ApiOperation(value = "取消党员活动")
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Integer id = partyBuildingActivityVO.getId();
        Long id = partyBuildingActivityVO.getId();
        String createBy = partyBuildingActivityVO.getCreateBy();
        String cancelReason = partyBuildingActivityVO.getCancelReason();
        boolean empty = ObjectUtils.isEmpty(createBy);
@@ -233,7 +233,7 @@
    @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Integer CommunityId=1;//todo 获取社区id
        Long CommunityId=1l;//todo 获取社区id
        partyBuildingActivityVO.setCommunityId(CommunityId);
        R r = partyBuildingService.pageActivity(partyBuildingActivityVO);
        return r;
@@ -242,7 +242,7 @@
    @ApiOperation(value = "社区下拉选择党员",response = PartyBuildingMemberVO.class)
    @GetMapping("listpartymember")
    public R listPartyMember() {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        R r = partyBuildingService.listPartyMember(communityId);
@@ -252,7 +252,7 @@
    @ApiOperation(value = "社区下拉选择身份",response = RoleVO.class)
    @GetMapping("listidentity")
    public R listIdentity() {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        R r = userService.listIdentity(communityId);
@@ -262,9 +262,9 @@
    @ApiOperation(value = "新增党委")
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        Long communityId = 1l;
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.addPartyCommittee(partyCommitteeVO);
        return r;
@@ -273,9 +273,9 @@
    @ApiOperation(value = "编辑党委")
    @PutMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        Long communityId = 1l;
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.updatePartyCommittee(partyCommitteeVO);
        return r;
@@ -284,9 +284,9 @@
    @ApiOperation(value = "删除党委")
    @DeleteMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        Long communityId = 1l;
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.deletePartyCommittee(partyCommitteeVO);
        return r;
@@ -295,9 +295,9 @@
    @ApiOperation(value = "分页党委查询",response = PartyCommitteeVO.class)
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Integer userId = this.getUserId();
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        Long communityId = 1l;
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.pagePartyCommittee(partyCommitteeVO);
        return r;
@@ -306,8 +306,8 @@
    @ApiOperation(value = "新建动态/政策文件")
    @PostMapping("adddynamic")
    public R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO) {
        final Integer userId = this.getUserId();
        Integer communityId=1;//todo 获取社区id
        final Long userId = this.getUserId();
        Long communityId=1l;//todo 获取社区id
        partyCommitteeVO.setCreateBy(userId);
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.adddYnamic(partyCommitteeVO);
@@ -317,7 +317,7 @@
    @ApiOperation(value = "编辑动态/政策文件")
    @PutMapping("updatedynamic")
    public R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO) {
        Integer id = partyCommitteeVO.getId();
        Long id = partyCommitteeVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
@@ -327,7 +327,7 @@

    @ApiOperation(value = "动态/政策文件详情",response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Integer id) {
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingService.infoYnamic(id);
        return r;
    }
@@ -339,8 +339,8 @@
        if (ObjectUtils.isEmpty(type)) {
            return R.fail("类型不能为空");
        }
        Integer userId = this.getUserId();
        Integer communityId=1;//todo 获取社区id
        Long userId = this.getUserId();
        Long communityId=1l;//todo 获取社区id
        partyBuildingComPbDynVO.setCommunityId(communityId);
        R r = partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return r;
@@ -349,7 +349,7 @@
    @ApiOperation(value = "删除动态/政策文件")
    @DeleteMapping("deletedynamic")
    public R deleteYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Integer id = partyBuildingComPbDynVO.getId();
        Long id = partyBuildingComPbDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
@@ -363,7 +363,7 @@
    @ApiOperation(value = "删除党员")
    @DeleteMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        Integer id = partyBuildingMemberVO.getId();
        Long id = partyBuildingMemberVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员主键不能为空");//todo 加限制只能删除自己小区的党员 或者日志记录
        }

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

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

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.community_backstage.model.vos.LoginBody;
import com.panzhihua.common.model.vos.R;
@@ -9,6 +10,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -59,4 +61,6 @@
        R r=tokenService.logout(token);
        return r;
    }


}

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

@@ -1,16 +1,17 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -29,7 +30,7 @@
    @ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
    @GetMapping("info")
    public R getUserInfo(){
        Integer userId = this.getUserId();
        Long userId = this.getUserId();
        boolean empty2 = ObjectUtils.isEmpty(userId);
        if (empty2) {
            throw new UnAuthenticationException();
@@ -39,4 +40,21 @@
        return R.ok(loginUserInfoVO);
    }

    @ApiOperation(value = "修改密码")
    @PutMapping("changepassword")
    public R changePassword(@Validated @RequestBody ChangePasswordVO changePasswordVO){
        Long userId = this.getUserId();
        if (ObjectUtils.isEmpty(userId)) {
            return R.fail(HttpStatus.UNAUTHORIZED);
        }
        String newPassword = changePasswordVO.getNewPassword();
        String oldPassword=changePasswordVO.getOldPassword();
        if (newPassword.equals(oldPassword)) {
            return R.fail("修改失败，新密码和原密码一致");
        }
        changePasswordVO.setUserId(userId);
        R r=userService.changePassword(changePasswordVO);
        return r;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -75,7 +75,7 @@
     */
    @PostMapping("listpartymemberactivities")
    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        Integer id = partyBuildingActivityVO.getId();
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员id不能为空");
        }
@@ -111,7 +111,7 @@
     * @return 活动详情内容
     */
    @PostMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Integer id){
    public R activityinfo(@RequestParam("id") Long id){
        R r=comBpActivityService.activityinfo(id);
        return r;
    }
@@ -254,7 +254,7 @@
     * @return 发布结果
     */
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestParam("id") Integer id){
    public R releaseActivity(@RequestParam("id") Long id){
        R r=comBpActivityService.releaseActivity(id);
        return r;
    }
@@ -265,7 +265,7 @@
     * @return 删除结果
     */
    @PostMapping("deleteactivity")
    public R deleteActivity(@RequestParam("id") Integer id){
    public R deleteActivity(@RequestParam("id") Long id){
        R r=comBpActivityService.deleteActivity(id);
        return r;
    }

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComBpActivityDO.java

@@ -23,7 +23,7 @@
     * id
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 活动名称
@@ -101,5 +101,5 @@
    /**
     * 社区id
     */
    private Integer communityId;
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java

@@ -20,17 +20,17 @@
    /**
     * id
     */
    private Integer id;
    private Long id;

    /**
     * 党员活动id
     */
    private Integer activityId;
    private Long activityId;

    /**
     * 党员id
     */
    private Integer memberId;
    private Long memberId;

    /**
     * 报名时间

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java

@@ -23,7 +23,7 @@
     * 党建动态id
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 标题
@@ -58,7 +58,7 @@
    /**
     * 党员表创建人主键id
     */
    private Integer createBy;
    private Long createBy;
    /**
     * 1动态 2政策文件
     */
@@ -66,5 +66,5 @@
    /**
     * 社区id
     */
    private Integer communityId;
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynUserDO.java

@@ -20,17 +20,17 @@
    /**
     * id
     */
    private Integer id;
    private Long id;

    /**
     * 党员动态id
     */
    private Integer dynId;
    private Long dynId;

    /**
     * 党员id
     */
    private Integer userId;
    private Long userId;

    /**
     * 阅读时间

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java

@@ -25,12 +25,12 @@
     * 党员在表中的id
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 所属党组织id
     */
    private Integer orgId;
    private Long orgId;

    /**
     * 身份证号

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java

@@ -23,20 +23,20 @@
     * id
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 党员id
     */
    private Integer memberId;
    private Long memberId;

    /**
     * 党员身份id
     */
    private Integer roleId;
    private Long roleId;

    /**
     * 社区id
     */
    private Integer communityId;
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java

@@ -18,7 +18,7 @@
    /**
     * 党组织id
     */
    private Integer id;
    private Long id;

    /**
     * 党组织等级
@@ -28,7 +28,7 @@
    /**
     * 父节点id
     */
    private Integer parentId;
    private Long parentId;

    /**
     * 组织名称

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java

@@ -30,7 +30,7 @@
     * @param id 活动id
     * @return 活动详情内容
     */
    R activityinfo(Integer id);
    R activityinfo(Long id);
    /**
     * 新增党员活动
     * @param partyBuildingActivityVO 参数
@@ -48,13 +48,13 @@
     * @param id 主键id
     * @return 发布结果
     */
    R releaseActivity(Integer id);
    R releaseActivity(Long id);
    /**
     * 删除党员活动
     * @param id 主键id
     * @return 删除结果
     */
    R deleteActivity(Integer id);
    R deleteActivity(Long id);
    /**
     * 分页查询党员活动
     * @param partyBuildingActivityVO 查询条件

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -81,7 +81,7 @@
     * @return 活动详情内容
     */
    @Override
    public R activityinfo(Integer id) {
    public R activityinfo(Long id) {
        ComBpActivityDO comBpActivityDO = comBpActivityDAO.selectById(id);
        if (ObjectUtils.isEmpty(comBpActivityDO)) {
            return R.fail();
@@ -90,7 +90,7 @@
        BeanUtils.copyProperties(comBpActivityDO,partyBuildingActivityVO);
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id));
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            List<Integer> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
            List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
            List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().in(ComPbMemberDO::getId, collect));
            List<PartyBuildingMemberVO> partyBuildingMemberVOS=new ArrayList<>();
            comPbMemberDOS.forEach(comPbMemberDO -> {
@@ -145,7 +145,7 @@
     * @return 发布结果
     */
    @Override
    public R releaseActivity(Integer id) {
    public R releaseActivity(Long id) {
        ComBpActivityDO comBpActivityDO=new ComBpActivityDO();
        comBpActivityDO.setId(id);
        comBpActivityDO.setStatus(2);
@@ -164,7 +164,7 @@
     * @return 删除结果
     */
    @Override
    public R deleteActivity(Integer id) {
    public R deleteActivity(Long id) {
        int delete = comBpActivityDAO.deleteById(id);
        if (delete>0) {
            return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -97,7 +97,7 @@
                List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>();
                comPbOrgDOS.forEach(comPbOrgDO -> {
                    PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
                    partyOrganizationVO.setId(comPbOrgDO.getId()+"");
                    partyOrganizationVO.setId(comPbOrgDO.getId());
                    partyOrganizationVO.setName(comPbOrgDO.getName());
                    partyOrganizationVOList.add(partyOrganizationVO);
                });
@@ -118,7 +118,7 @@
                if (ObjectUtils.isEmpty(collect)) {
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName());
                }else{
                    comPbMemberDO.setOrgId(Integer.parseInt(collect.get(0).getId()));
                    comPbMemberDO.setOrgId(collect.get(0).getId());
                }
                comPbMemberDO.setEmploymentTime(partyBuildingMemberExcelVO.getEmploymentTime());
                comPbMemberDO.setJoinTime(partyBuildingMemberExcelVO.getJoinTime());
@@ -167,7 +167,7 @@
    @Override
    public R updatePartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) {
        ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
        Integer orgId = partyBuildingMemberVO.getOrgId();
        Long orgId = partyBuildingMemberVO.getOrgId();
        if (null!=orgId&&0==orgId) {
            partyBuildingMemberVO.setOrgId(null);
        }
@@ -329,7 +329,7 @@
            return R.fail("动态不存在");
        }
        PartyBuildingComPbDynVO partyBuildingComPbDynVO=new PartyBuildingComPbDynVO();
        Integer createBy = comPbDynDO.getCreateBy();
        Long createBy = comPbDynDO.getCreateBy();
        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
        if (ObjectUtils.isEmpty(comPbMemberDO)) {
            return R.fail("发布人不存在");

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java

@@ -33,7 +33,7 @@
        if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
            comPbOrgDOS.forEach(comPbOrgDO -> {
                PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
                partyOrganizationVO.setId(comPbOrgDO.getId()+"");
                partyOrganizationVO.setId(comPbOrgDO.getId());
                partyOrganizationVO.setName(comPbOrgDO.getName());
                partyOrganizationVOS.add(partyOrganizationVO);
            });

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

@@ -2,8 +2,10 @@

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.service_user.service.UserService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@@ -78,4 +80,14 @@
    public R<LoginUserInfoVO> getUserInfoByUserId(@RequestParam("userId") String userId){
        return userService.getUserInfo(userId);
    }

    /**
     * 修改用户登录密码
     * @param changePasswordVO 新密码
     * @return 修改结果
     */
    @PostMapping("changepassword")
    public R changePassword(@RequestBody ChangePasswordVO changePasswordVO){
        return userService.changePassword(changePasswordVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java

@@ -90,7 +90,7 @@
    /**
     * 社区id
     */
    private Integer communityId;
    private Long communityId;




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

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

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -49,4 +50,11 @@
     * @return 用户基本信息、角色
     */
    R<LoginUserInfoVO> getUserInfo(String userId);

    /**
     * 修改用户登录密码
     * @param changePasswordVO 新密码
     * @return 修改结果
     */
    R changePassword(ChangePasswordVO changePasswordVO);
}

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.service_user.dao.RoleDAO;
import com.panzhihua.service_user.dao.UserDao;
import com.panzhihua.service_user.model.dos.SysRoleDO;
@@ -187,6 +188,27 @@
        return R.ok(loginUserInfoVO);
    }

    /**
     * 修改用户登录密码
     *
     * @param changePasswordVO 新密码
     * @return 修改结果
     */
    @Override
    public R changePassword(ChangePasswordVO changePasswordVO) {
        Long userId = changePasswordVO.getUserId();
        String newPassword = changePasswordVO.getNewPassword();
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userId);
        String encode = new BCryptPasswordEncoder().encode(newPassword);
        sysUserDO.setPassword(encode);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    public static void main(String[] args) {
        String encode = new BCryptPasswordEncoder().encode("123456");
        System.out.println(encode);