Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-02 02085db6c53adada7f96e52bde5711134d7b4b45

Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -90,7 +90,7 @@
    /**
     * 令牌有效期（分钟）
     */
    public final static long TOKEN_EXPIRE = 720;
    public final static long _EXPIRE = 720;

    /**
     * 参数管理 cache key
@@ -137,4 +137,9 @@
     * 首页商城是否展示（1.是 2.否）
     */
    public static final Integer IS_SHOP_OPEN = 2;

    /**
     * 网格综治-默认角色权限默认字符串
     */
    public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role";
}

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

File was deleted

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

File was deleted

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

@@ -8,6 +8,8 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.util.List;

import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;

@@ -73,6 +75,9 @@
    @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
    private String data;

    @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
    private List<Long> gridMemebers;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

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

@@ -11,6 +11,7 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.util.List;

/**
 * 编辑表单
@@ -76,6 +77,8 @@
    @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
    private String data;

    @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
    private List<Long> gridMemebers;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建网格和网格员的关联关系请求参数")
public class EventGridMemberAddDTO {

    @NotBlank(message = "账号昵称不能为空")
    @Length(max=50)
    @ApiModelProperty(value = "账号昵称", hidden = false, example = "")
    private String nickName;

    @NotBlank(message = "登录账号不能为空")
    @Length(max=50)
    @ApiModelProperty(value = "登录账号", hidden = false, example = "")
    private String account;

    @NotBlank(message = "登录密码不能为空")
    @Length(min = 8, max=100)
    @ApiModelProperty(value = "登录密码", hidden = false, example = "")
    private String passwd;

    @NotBlank(message = "联系电话不能为空")
    @Length(max=11)
    @ApiModelProperty(value = "联系电话", hidden = false, example = "")
    private String phone;

    @NotNull(message = "工作开始时间不能为空")
    @Max(24)
    @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
    private Integer workStartAt;

    @NotNull(message = "工作结束时间不能为空")
    @Max(24)
    @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
    private String workEndAt;

    @Length(max=255)
    @ApiModelProperty(value = "头像", hidden = false, example = "")
    private String imageUrl;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "账号状态", hidden = false, example = "")
    private String status;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;

    @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
    private Long communityId;

}

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

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑网格和网格员的关联关系请求参数")
public class EventGridMemberEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
    private Long id;

    @NotBlank()
    @Length(max=50)
    @ApiModelProperty(value = "账号昵称", hidden = false, example = "")
    private String nickName;

    @NotBlank() @Length(max=50)
    @ApiModelProperty(value = "登录账号", hidden = false, example = "")
    private String account;

    @NotBlank() @Length(min = 8, max=100)
    @ApiModelProperty(value = "登录密码", hidden = false, example = "")
    private String paswd;

    @NotBlank() @Length(max=11)
    @ApiModelProperty(value = "联系电话", hidden = false, example = "")
    private String phone;

    @NotNull()
    @Max(24)
    @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
    private Integer workStart;

    @NotNull()
    @Max(24)
    @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
    private String workEnd;

    @Length(max=255)
    @ApiModelProperty(value = "头像", hidden = false, example = "")
    private String imageUrl;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "账号状态", hidden = false, example = "")
    private String status;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;

}

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

File was deleted

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

File was deleted

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

@@ -17,21 +17,6 @@
@FeignClient(name = "grid")
public interface GridService {

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    @PostMapping("/event/add")
    R add(@RequestBody EventAddDTO eventAddDTO);

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    @PostMapping("/event/edit")
    R edit(@RequestBody EventEditDTO eventEditDTO);

    /**
     * 分页查找事件
@@ -59,19 +44,19 @@

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventgridmemberrelation/add")
    R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
    R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmemberrelation/edit")
    R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
    R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO);

    /**
     * 分页查找网格和网格员的关联关系

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

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -708,4 +709,12 @@
     */
    @PutMapping("updateUserPassByApp")
    R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);

    /**
     * 添加网格员
     * @param eventGridMemberAddDTO    请求参数
     * @return  结果
     */
    @PostMapping("addGridUser")
    R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
}

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

File was deleted

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

@@ -32,26 +32,11 @@
@Slf4j
@RestController
@RequestMapping("/eventgriddata")
@Api(tags = {"区县/街道/社区/网格员网格数据管理 @陈东"})
@Api(tags = {"网格数据管理 @chendong"})
public class EventGridDataApi extends BaseController {

    @Resource
    private GridService gridService;

    /**
     * 我的网格
     * @return 查找结果
     */
    @GetMapping("/myGrid")
    @ApiOperation(value = "我的网格", response= EventGridDataVO.class)
    R myGrid(){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        PageEventGridDataDTO pageEventGridDataDTO = new PageEventGridDataDTO();
        pageEventGridDataDTO.setUserId(loginUserInfoVO.getUserId());
        pageEventGridDataDTO.setType(3l);
        return gridService.userGrid(pageEventGridDataDTO);
    }


    /**
     * 新增区县/街道/社区/网格员网格数据管理
@@ -59,7 +44,7 @@
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增区县/街道/社区/网格员网格数据管理", response = R.class)
    @ApiOperation(value = "新增网格数据管理", response = R.class)
    R add(@Validated @RequestBody EventGridDataAddDTO eventGridDataAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataAddDTO);
        eventGridDataAddDTO.setUserId(getUserId());
@@ -72,7 +57,7 @@
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑区县/街道/社区/网格员网格数据管理", response = R.class)
    @ApiOperation(value = "编辑网格数据管理", response = R.class)
    R edit(@Validated @RequestBody EventGridDataEditDTO eventGridDataEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataEditDTO);
        eventGridDataEditDTO.setUserId(getUserId());
@@ -85,7 +70,7 @@
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理", response= EventGridDataVO.class)
    @ApiOperation(value = "查询网格数据管理", response= EventGridDataVO.class)
    R query(@Validated @ModelAttribute PageEventGridDataDTO pageEventGridDataDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventGridDataDTO);
        return gridService.query(pageEventGridDataDTO);
@@ -97,7 +82,7 @@
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除区县/街道/社区/网格员网格数据管理", response = R.class)
    @ApiOperation(value = "删除网格数据管理", response = R.class)
    R delete(@Validated @RequestBody EventGridDataDeleteDTO  eventGridDataDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataDeleteDTO);
        return gridService.delete(eventGridDataDeleteDTO);
@@ -105,11 +90,11 @@

    /**
     * 查询区县/街道/社区/网格员网格数据管理详细信息
     * @param id 区县/街道/社区/网格员网格数据管理 id
     * @param id 网格数据管理 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理详细信息")
    @ApiOperation(value = "查询网格数据管理详细信息")
    R<EventGridDataDetailsVO> details(@PathVariable("id") Long id){
        return gridService.eventGridDataDetails(id);
    }

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

@@ -2,6 +2,11 @@


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
@@ -9,16 +14,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;

/**
 *
@@ -29,8 +29,8 @@
 * */
@Slf4j
@RestController
@RequestMapping("/eventgridmemberrelation")
@Api(tags = {"网格和网格员的关联关系"})
@RequestMapping("/eventgridmember")
@Api(tags = {"网格员管理"})
public class EventGridMemberRelationApi extends BaseController {

    @Resource
@@ -38,28 +38,32 @@

    /**
     * 新增网格和网格员的关联关系
     * @param {classNameFirstLower}AddDTO 添加网格和网格员的关联关系传递对象
     * @param eventGridMemberAddDTO 添加网格和网格员的关联关系传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增网格和网格员的关联关系", response = R.class)
    R add(@Validated @RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationAddDTO);
        eventGridMemberRelationAddDTO.setUserId(getUserId());
        return gridService.add(eventGridMemberRelationAddDTO);
    @ApiOperation(value = "新增网格员", response = R.class)
    R add(@Validated @RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberAddDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        eventGridMemberAddDTO.setUserId(loginUserInfoVO.getUserId());
        eventGridMemberAddDTO.setUserName(loginUserInfoVO.getName());
        return gridService.add(eventGridMemberAddDTO);
    }

    /**
     * 修改
     * @param eventGridMemberRelationEditDTO 修改网格和网格员的关联关系传递对象
     * @param eventGridMemberEditDTO 修改网格和网格员的关联关系传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑网格和网格员的关联关系", response = R.class)
    R edit(@Validated @RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationEditDTO);
        eventGridMemberRelationEditDTO.setUserId(getUserId());
        return gridService.edit(eventGridMemberRelationEditDTO);
    @ApiOperation(value = "编辑网格员", response = R.class)
    R edit(@Validated @RequestBody EventGridMemberEditDTO eventGridMemberEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberEditDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        eventGridMemberEditDTO.setUserId(loginUserInfoVO.getUserId());
        eventGridMemberEditDTO.setUserName(loginUserInfoVO.getName());
        return gridService.edit(eventGridMemberEditDTO);
    }

    /**
@@ -68,7 +72,7 @@
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询网格和网格员的关联关系", response= EventGridMemberRelationVO.class)
    @ApiOperation(value = "查询网格员", response= EventGridMemberRelationVO.class)
    R query(@Validated @ModelAttribute PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventGridMemberRelationDTO);
        return gridService.query(pageEventGridMemberRelationDTO);
@@ -81,7 +85,7 @@
     */
    @DeleteMapping()
    @ApiOperation(value = "删除网格和网格员的关联关系", response = R.class)
    R delete(@Validated @RequestBody EventGridMemberRelationDeleteDTO  eventGridMemberRelationDeleteDTO){
    R delete(@Validated @RequestBody EventGridMemberRelationDeleteDTO eventGridMemberRelationDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationDeleteDTO);
        return gridService.delete(eventGridMemberRelationDeleteDTO);
    }
@@ -97,4 +101,50 @@
        return gridService.eventGridMemberRelationDetails(id);
    }


    /**
     * 查询网格员工作轨迹
     * @param userId 网格id
     * @return 查找结果
     */
    @GetMapping("/locus/{userId}")
    @ApiOperation(value = "查询网格员工作轨迹")
    R locus(@PathVariable("userId") Long userId){
        return gridService.eventGridMemberRelationDetails(userId);
    }

    /**
     * 启用
     * @param userId 网格id
     * @return 查找结果
     */
    @PutMapping("/on/{userId}")
    @ApiOperation(value = "启用网格员")
    R toggleOn(@PathVariable("userId") Long userId){
        return gridService.eventGridMemberRelationDetails(userId);
    }

    /**
     * 禁用
     * @param userId 网格id
     * @return 查找结果
     */
    @PutMapping("/off/{userId}")
    @ApiOperation(value = "禁用网格员")
    R toggleOff(@PathVariable("userId") Long userId){
        return gridService.eventGridMemberRelationDetails(userId);
    }


    /**
     * 工作预警记录
     * @param userId 网格id
     * @return 查找结果
     */
    @GetMapping("/gpslog/{userId}")
    @ApiOperation(value = "工作预警记录")
    R gpslog(@PathVariable("userId") Long userId){
        return gridService.eventGridMemberRelationDetails(userId);
    }

}

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

@@ -29,26 +29,6 @@
    private EventService eventService;

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventAddDTO eventAddDTO){
        return eventService.add(eventAddDTO);
    };

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventEditDTO eventEditDTO){
        return eventService.edit(eventEditDTO);
    };

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果

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

@@ -2,9 +2,9 @@


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
@@ -32,22 +32,22 @@

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
        return eventGridMemberRelationService.add(eventGridMemberRelationAddDTO);
    R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
        return eventGridMemberRelationService.add(eventGridMemberAddDTO);
    };

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
        return eventGridMemberRelationService.edit(eventGridMemberRelationEditDTO);
    R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO){
        return eventGridMemberRelationService.edit(eventGridMemberEditDTO);
    };

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java

@@ -50,6 +50,18 @@
     */
    private Long gridMemberId;
    /**
     * 网格员工作状态   列: work_status
     */
    private Integer workStatus;
    /**
     * 工作开始时间   列: work_start_at
     */
    private Integer workStartAt;
    /**
     * 工作结束时间   列: work_end_at
     */
    private Integer workEndAt;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;

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

@@ -2,9 +2,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
@@ -23,17 +23,17 @@

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
    R add(EventGridMemberAddDTO eventGridMemberAddDTO);

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
    R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
    R edit(EventGridMemberEditDTO eventGridMemberEditDTO);

    /**
     * 分页查找网格和网格员的关联关系

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

@@ -20,20 +20,6 @@
public interface EventService extends IService<EventDO> {

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    R add(EventAddDTO eventAddDTO);

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    R edit(EventEditDTO eventEditDTO);

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果

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

@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
@@ -31,15 +32,22 @@

    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;
    @Resource
    private UserService userService;

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
    public R add(EventGridMemberAddDTO eventGridMemberAddDTO){

        userService.addGridUser(eventGridMemberAddDTO);



        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
        eventGridMemberRelationDO.setCreateAt(new Date());
        eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId());
        if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
            return R.ok();
        }
@@ -48,12 +56,12 @@

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
    public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
    public R edit(EventGridMemberEditDTO eventGridMemberEditDTO){
        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
        BeanUtils.copyProperties(eventGridMemberEditDTO, eventGridMemberRelationDO);
        //eventGridMemberRelationDO.setUpdateAt(new Date());
        if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
            return R.ok();

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

@@ -50,35 +50,6 @@
    @Resource
    private CommunityService communityService;

    /**
     * 新增事件
     * @param eventAddDTO 事件新增DTO
     * @return 新增结果
     */
    public R add(EventAddDTO eventAddDTO){
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(eventAddDTO, eventDO);
        eventDO.setCreateAt(new Date());
        if(eventMapper.insert(eventDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    public R edit(EventEditDTO eventEditDTO){
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(eventEditDTO, eventDO);
        //eventDO.setUpdateAt(new Date());
        if(eventMapper.updateById(eventDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找事件

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

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -903,4 +904,15 @@
    public R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO){
        return userService.updateUserPassByApp(userInfoAppDTO);
    }


    /**
     * 添加网格员
     * @param eventGridMemberAddDTO    请求参数
     * @return  结果
     */
    @PostMapping("addGridUser")
    R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
        return userService.addGridUser(eventGridMemberAddDTO);
    }
}

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

@@ -3,6 +3,7 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -422,4 +423,11 @@
     * @return  修改结果
     */
    R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO);

    /**
     * 添加网格员
     * @param eventGridMemberAddDTO    请求参数
     * @return  结果
     */
    R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO);
}

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

@@ -11,13 +11,16 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
@@ -78,7 +81,8 @@
    private SysMenuDAO sysMenuDAO;
    @Resource
    private SysUserInputDAO sysUserInputDAO;

    @Resource
    private GridService gridService;

    /**
     * 小程序微信用户信息更新
@@ -864,6 +868,29 @@
                throw new ServiceException("账户已经存在");
            }

        }

        if(insert>0 && sysUserDO.getType()==3){//添加的用户是社区账号时
            //添加网格综合治理管理后台用户
            SysUserDO sysUserDOWangGe = new SysUserDO();
            BeanUtils.copyProperties(sysUserDO, sysUserDOWangGe);
            sysUserDOWangGe.setUserId(null);
            sysUserDOWangGe.setType(7);//网格综治后台
            try {
                int addWange = userDao.insert(sysUserDOWangGe);
                if(addWange!=1){
                    throw new ServiceException("新增网格综合治理管理后台用户失败");
                }
            } catch (Exception e) {
                e.printStackTrace();
                log.error("网格综合治理管理后台用户报错【{}】", e.getMessage());
                if (e.getMessage().contains("union_phone_type")) {
                    throw new ServiceException("手机号已经存在");
                } else if (e.getMessage().contains("union_account_type")) {
                    throw new ServiceException("账户已经存在");
                }

            }
        }
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
@@ -1832,4 +1859,54 @@
            return R.fail();
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) {

        SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY));
        if(gridMemberDefaultRole==null) {
            //添加默认网格员角色
            SysRoleDO sysRoleDO = new SysRoleDO();
            sysRoleDO.setCommunityId(0L);
            sysRoleDO.setRoleName("网格员默认角色");
            sysRoleDO.setRoleKey(Constants.GRID_DEFAULT_ROLE_KEY);
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(eventGridMemberAddDTO.getUserId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert!=1) {
                throw new ServiceException("网格员默认角色添加失败");
            }
        }
        Long roleId = gridMemberDefaultRole.getRoleId();
        //新角色设置所有权限
        MenuRoleVO menuRoleVO = new MenuRoleVO();
        menuRoleVO.setIsAll(1);
        menuRoleVO.setCommunityId(eventGridMemberAddDTO.getCommunityId());
        menuRoleVO.setRoleId(roleId);
        this.putMenuRole(menuRoleVO);

        SysUserDO sysUserDO = new SysUserDO();
        String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPasswd());
        eventGridMemberAddDTO.setPasswd(encode);
        BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("新增后台用户报错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                throw new ServiceException("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
            }

        }
        //TODO 添加关联关系
        //gridService.addEventGridMember();


        return R.fail();
    }
}