Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-03 33fdf147bdaa73d2f97479d809597a99ad50a8bb

Merge branch 'haucheng_panzhihua' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

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

@@ -40,6 +40,7 @@
     * 通知类型id
     */
    @ApiModelProperty(value = "通知类型id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long columnId;

    /**

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

@@ -16,6 +16,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
@@ -47,11 +48,13 @@
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    /**
     * 社区id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty("账号")
@@ -61,6 +64,7 @@
    private String password;

    @ApiModelProperty("权限id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;

    @ApiModelProperty("小区名称")

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

@@ -5,6 +5,8 @@

import com.fasterxml.jackson.annotation.JsonFormat;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,6 +16,7 @@
public class ComActEasyPhotoActivityVO {

    @ApiModelProperty("活动id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束  4.已取消）")

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

@@ -28,6 +28,7 @@
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    /**
@@ -46,6 +47,7 @@
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
@@ -69,6 +71,7 @@

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

    @ApiModelProperty("手机号")

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

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
     * ID
     */
    @ApiModelProperty(value = "ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
@@ -225,13 +228,14 @@
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateAt;

    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
     * 登录用户id
     */
    @ApiModelProperty(value = "登录用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("账号")
@@ -241,6 +245,7 @@
    private String password;

    @ApiModelProperty("权限id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;

    @ApiModelProperty("状态")
@@ -259,6 +264,7 @@
    private String serviceType;

    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    @ApiModelProperty("服务类型名称")

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

@@ -40,12 +40,12 @@
     * 街道id
     */
    @ApiModelProperty("街道id")
    private Integer streetId;
    private Long streetId;
    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Integer actId;
    private Long actId;
    /**
     * 小区id（实有房屋id）
     */

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

@@ -99,6 +99,7 @@
    private Long teamId;

    @ApiModelProperty(value = "技能id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long skillId;

    @ApiModelProperty(value = "关键词")

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

@@ -6,6 +6,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +24,7 @@
public class ComActWarehouseDonatesVO {

    @ApiModelProperty("捐赠物品id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("捐赠人")

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

@@ -67,6 +67,7 @@
    private String position;

    @ApiModelProperty(value = "报道单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")

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

@@ -67,6 +67,7 @@
    private Integer type;

    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty("动态内容富文本--纯文本")

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

@@ -158,7 +158,7 @@
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
        R r = partyBuildingService.addPartyOrganization(partyOrganizationVO);
        R r = partyBuildingWestService.addPartyOrganization(partyOrganizationVO);
        return r;
    }


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
        service-id: huacheng-config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:6193/
  profiles:

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
        service-id: huacheng-config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:6193/
  profiles:

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

@@ -4,6 +4,8 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -31,6 +33,7 @@
    private static final long serialVersionUID = -26741210716448548L;

    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
@@ -55,6 +58,7 @@
     * 通知类型id
     */
    @ApiModelProperty(value = "通知类型id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long columnId;

    /**

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

@@ -31,7 +31,7 @@
    private static final long serialVersionUID = 905771115750112478L;

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

    /**
     * 用户id

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

@@ -1199,7 +1199,7 @@

    @Override
    public R selectCount(Integer type, String phone,Long communityId) {
        return R.ok(this.baseMapper.selectCount(type,phone));
        return R.ok(this.baseMapper.selectCount(type,phone,communityId));
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
        service-id: huacheng-config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:6193/
  profiles:

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

@@ -373,7 +373,7 @@
     * @return 删除结果
     */
    @PostMapping("deletedynamic")
    public R deleteYnamic(@RequestParam("id") Integer id) {
    public R deleteYnamic(@RequestParam("id") Long id) {
        return comPbMemberWestService.deleteYnamic(id);

    }

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

@@ -141,7 +141,7 @@
     *            动态主键
     * @return 删除结果
     */
    R deleteYnamic(Integer id);
    R deleteYnamic(Long id);

    /**
     * 增加阅读记录

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

@@ -575,7 +575,7 @@
     * @return 删除结果
     */
    @Override
    public R deleteYnamic(Integer id) {
    public R deleteYnamic(Long id) {
        int delete = comPbDynDAO.deleteById(id);
        if (delete > 0) {
            return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -759,11 +759,13 @@
               t4.name           as communityName,
               t1.address,
               t1.village_name as unitVillageName,
               t1.belong_to
               t1.belong_to,
               su.nick_name
        from com_pb_member t
                 left join com_pb_check_unit t1 on t.check_unit_id = t1.id
                 left join com_mng_village t2 on t.village_id = t2.village_id
                 left join com_act t4 on t.community_id = t4.community_id where t.id = #{id}
        LEFT JOIN sys_user su ON t.user_id = su.user_id
         left join com_pb_check_unit t1 on t.check_unit_id = t1.id
         left join com_mng_village t2 on t.village_id = t2.village_id
         left join com_act t4 on t.community_id = t4.community_id where t.id = #{id}
    </select>
</mapper>