修改bug以及综治后台网格员与网格接口改动

huanghongfa

2021-07-07 302acda2c957091a878bd9e2cc35076554faa22e

修改bug以及综治后台网格员与网格接口改动

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java

@@ -59,4 +59,7 @@

    @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
    private Long lcGridId;

    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java

@@ -41,6 +41,8 @@
    private String data;
    @ApiModelProperty(value = "所在社区")
    private String communityName;
    @ApiModelProperty(value = "关联市平台id")
    private String lcGirdId;
    @ApiModelProperty(value = "关联市平台网格")
    private String lcGirdName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java

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

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;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@Data
@ApiModel("管理后台-社区返回参数")
public class EventGridCommunityAdminVO {

    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "社区名称")
    private String name;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventLcGridAdminVO.java

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

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;

@Data
@ApiModel("管理后台-市平台网格返回参数")
public class EventLcGridAdminVO {

    @ApiModelProperty(value = "市平台网格关联id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "浪潮市平台网格名称")
    private String lcGridName;
}

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

@@ -3589,4 +3589,11 @@
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    R getCommunityLists();
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1217,4 +1217,11 @@
     */
    @PostMapping("/eventgridmemberrelation/cascade/list")
    R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/eventgriddata/lc/list")
    R getLcGridLists();
}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
@@ -33,6 +34,8 @@

    @Resource
    private GridService gridService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "网格分页查询", response = EventGridAdminVO.class)
    @PostMapping("/event/list")
@@ -90,4 +93,16 @@
        return gridService.deleteGridData(Ids);
    }

    @ApiOperation(value = "查询所有社区列表",response = EventGridCommunityAdminVO.class)
    @GetMapping("/community/list")
    public R getCommunityLists(){
        return communityService.getCommunityLists();
    }

    @ApiOperation(value = "查询所有关联市平台列表",response = EventLcGridAdminVO.class)
    @GetMapping("/lc/grid/list")
    public R getLcGridLists(){
        return gridService.getLcGridLists();
    }

}

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

@@ -1731,4 +1731,13 @@
    public R easyPhotoStatistics(@RequestParam("communityId")Long communityId) {
        return comActEasyPhotoService.easyPhotoStatistics(communityId);
    }

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists(){
        return comActService.getCommunityLists();
    }
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -78,4 +79,7 @@
    IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
    void updateAccountPassword(@Param("password") String password, @Param("account") String account, @Param("communityId")Long communityId);

    @Select("select community_id,`name` from com_act where state = 0")
    List<EventGridCommunityAdminVO> getCommunityLists();
}

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

@@ -83,6 +83,15 @@
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.activityType != null'>" +
            "AND p.activity_type =#{comActEasyPhotoVO.activityType}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
            " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
            " AND p.status > 1 and is_need_feed_back = 1 " +
            " </if> " +
            "group by p.id "+

            "union all "+

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

@@ -53,4 +53,10 @@
     * @return 删除结果
     */
    R delectCommunity(Long communityId);

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    R getCommunityLists();
}

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

@@ -195,5 +195,14 @@
        return R.fail();
    }

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @Override
    public R getCommunityLists(){
        return R.ok(this.comActDAO.getCommunityLists());
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

@@ -27,6 +28,8 @@

    @Resource
    private EventGridDataService eventGridDataService;
    @Resource
    private LcCompareCodeService lcCompareCodeService;


    /**
@@ -166,4 +169,15 @@
    public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
        return eventGridDataService.deleteGridDataByAdmin(Ids);
    }

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/lc/list")
    public R getLcGridLists(){
        return lcCompareCodeService.getLcGridLists();
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/LcCompareCodeMapper.java

@@ -2,8 +2,14 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.grid.EventLcGridAdminVO;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
 * program 攀枝花智慧社区项目
@@ -15,5 +21,11 @@
@Mapper
public interface LcCompareCodeMapper extends BaseMapper<LcCompareCodeDO> {

    @Update("update lc_compare_code set local_grid_id = null,grid_name = null where local_grid_id = #{gridId}")
    void updateLcCompareCode(@Param("gridId")Long gridId);

    @Select("select id,lc_grid_name from lc_compare_code")
    List<EventLcGridAdminVO> getLcGridLists();


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/LcCompareCodeService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;

/**
@@ -30,4 +31,10 @@
     * @date 2021/6/10 17:00
     */
    String getLcUserIdByLocal(String localUserId);

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    R getLcGridLists();
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -252,6 +253,25 @@
                        eventGridMemberRelationService.saveBatch(memberRelationDOList);
                    }
                }

                if(eventGridDataDTO.getLcGridId() != null){

                    //查询已存在的关系需要清除
                    LcCompareCodeDO oldCompareCodeDO = lcCompareCodeMapper.selectOne(new QueryWrapper<LcCompareCodeDO>()
                            .lambda().eq(LcCompareCodeDO::getLocalGridId,gridDataDO.getId()));
                    if(oldCompareCodeDO != null){
                        lcCompareCodeMapper.updateLcCompareCode(gridDataDO.getId());
                    }

                    //关联市平台网格
                    LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectById(eventGridDataDTO.getLcGridId());
                    if(compareCodeDO != null){
                        compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
                        compareCodeDO.setGridName(gridDataDO.getGridName());
                        lcCompareCodeMapper.updateById(compareCodeDO);
                    }
                }

                return R.ok();
            }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.dao.LcCompareCodeMapper;
import com.panzhihua.service_grid.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
@@ -51,4 +52,13 @@
        }
        return null;
    }

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @Override
    public R getLcGridLists(){
        return R.ok(this.baseMapper.getLcGridLists());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -45,6 +45,7 @@
        egd.create_at,
        egd.create_by,
        (select lc_grid_name from lc_compare_code where local_grid_id = egd.id) as lcGirdName,
        (select local_grid_id from lc_compare_code where local_grid_id = egd.id) as lcGirdId,
        ca.`name` AS communityName
        FROM
        event_grid_data AS egd

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

@@ -2035,11 +2035,12 @@
        try {
            insert = userDao.updateById(sysUserDO);

            //清除原本关联网格员信息
            this.userDao.delLcMember(sysUserDO.getUserId());
            //关联市平台网格员
            if(gridMemberDTO.getLcMemberId() != null){
                //关联现有的网格员信息
                this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
            }else{
                this.userDao.delLcMember(sysUserDO.getUserId());
            }
            //清除原网格员与楼栋关联关系
            this.userDao.delGridMemberRelation(sysUserDO.getUserId());