From f8466a8905261edc14c3d8015748a9a617d8fe3c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 11:10:13 +0800
Subject: [PATCH] 修改综治后台关联市平台网格员以及网格接口
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java | 8 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/LcCompareMemberCodeMapper.java | 19 +++
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java | 27 ++++
springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java | 50 ++++++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java | 38 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java | 5
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java | 15 ++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 41 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java | 31 +++++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 39 ++++-
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java | 8 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java | 12 ++
20 files changed, 286 insertions(+), 30 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java
index 81f3ee5..ec115af 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java
@@ -64,7 +64,7 @@
/**
* 获取所有或者根据姓名和工号查询,分页
*/
- public static final String GRID_GET_GETALL_SEARCH_PAGE_URL = "http://171.217.92.33:53303/gridOperator/getAllOrSearchByPage?areaId=jhRxqEQp&limit=200&page=1";
+ public static final String GRID_GET_GETALL_SEARCH_PAGE_URL = "http://171.217.92.33:53303/gridOperator/getAllOrSearchByPage?areaId=jhRxqEQp";
/**
* 下面的接口全部都是走访任务接口
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java
new file mode 100644
index 0000000..1960818
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.api;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目
+ * description 浪潮网格员接口返回对象
+ *
+ * @author manailin
+ * Date 2021-06-22 15:30
+ **/
+@Data
+public class GridMemberPageListDTO {
+
+ private String bindUserId;
+ private String bindUserName;
+ private String birthDate;
+ private String contactPhone;
+ private String createBy;
+ private String createTime;
+ private String dutyType;
+ private String educationCode;
+ private String educationName;
+ private String genderCode;
+ private String genderName;
+ private String gridDutyId;
+ private String gridDutyName;
+ private String id;
+ private String imei;
+ private Integer isLeader;
+ private Integer jobNum;
+ private String lastReportTime;
+ private String latitude;
+ private String locateUpdateTime;
+ private String longitude;
+ private String name;
+ private String nationCode;
+ private String nationName;
+ private String orgDuty;
+ private String orgDutyDate;
+ private String orgId;
+ private String orgName;
+ private String password;
+ private String politicalAffiliationCode;
+ private String politicalAffiliationName;
+ private String standbyPhone;
+ private String updateBy;
+ private String updateTime;
+ private String workState;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
index 331dd2b..a7c1588 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
@@ -55,7 +55,10 @@
private Long gridCommunityId;
@ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
- private Long lcGridId;
+ private String lcGridId;
+
+ @ApiModelProperty(value = "市平台网格关联名称", hidden = false, example = "")
+ private String lcGridName;
@ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
private Long userId;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java
index bda0688..dadac2d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java
@@ -58,7 +58,10 @@
private Long userId;
@ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
- private Long lcGridId;
+ private String lcGridId;
+
+ @ApiModelProperty(value = "市平台网格关联名称", hidden = false, example = "")
+ private String lcGridName;
@ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
private Long gridCommunityId;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
index fb44e33..560c72f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
@@ -77,7 +77,13 @@
private Long gridMemberId;
@ApiModelProperty(value = "市平台网格员关联id")
- private Long lcMemberId;
+ private String lcMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
+
+ @ApiModelProperty(value = "市平台网格员关联用户id")
+ private String lcBingUserId;
@ApiModelProperty(value = "楼栋id集合")
private List<Long> buildingIds;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java
index 48e5fdd..e2b63de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java
@@ -68,7 +68,13 @@
private Long gridMemberId;
@ApiModelProperty(value = "市平台网格员关联id")
- private Long lcMemberId;
+ private String lcMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
+
+ @ApiModelProperty(value = "市平台网格员关联用户id")
+ private String lcBingUserId;
@ApiModelProperty(value = "楼栋id集合")
private List<Long> buildingIds;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java
new file mode 100644
index 0000000..a345a41
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("修改网格员状态请求参数")
+public class LcGridMemberDTO {
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "工号或者名字", example = "")
+ private String param;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java
index 81adf0a..d52e80c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java
@@ -17,5 +17,7 @@
private String lcGridMemberId;
@ApiModelProperty(value = "市平台网格员名称")
private String lcGridMemberName;
+ @ApiModelProperty(value = "浪潮网格员绑定的用户ID")
+ private String lcBindUserId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
index 4204f79..b304ab4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
@@ -72,4 +72,16 @@
@ApiOperation(value = "自动上传重点人员和流动人员走访记录")
@GetMapping("lc/auto/upload/visit_record")
void automationUploadVisitRecord();
+
+ @ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
+ @GetMapping("lc/event/getGridMemberListByAreaIdOrName")
+ R getGridMemberListByAreaIdOrName(@RequestParam("areaId") String areaId,@RequestParam("param") String param,@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);
+
+ @ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
+ @GetMapping("lc/grid/tree")
+ R getGridTreeByAreaId(@RequestParam("areaId") String areaId);
+
+ @ApiOperation(value = "获取指定区域网格列表")
+ @GetMapping("lc/grid/list")
+ R getGridDataListByAreaId(@RequestParam("areaId") String areaId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
index 162baa7..6d67918 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
@@ -1,15 +1,19 @@
package com.panzhihua.grid_backstage.api;
+import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.api.GridMemberPageListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
+import com.panzhihua.common.model.dtos.grid.admin.LcGridMemberDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogAdminVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberLcListVO;
+import com.panzhihua.common.service.api.ApiServiceFeign;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.DateUtils;
@@ -22,6 +26,7 @@
import com.panzhihua.common.service.grid.GridService;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -41,6 +46,8 @@
private GridService gridService;
@Resource
private UserService userService;
+ @Resource
+ private ApiServiceFeign apiService;
/**
* 网格员分页查询
@@ -116,9 +123,23 @@
}
@ApiOperation(value = "查询市平台网格员列表",response = GridMemberLcListVO.class)
- @GetMapping("/member/lc/list")
- public R gridMemberLcList(){
- return gridService.gridMemberLcList();
+ @PostMapping("/member/lc/list/noToken")
+ public R gridMemberLcList(@RequestBody LcGridMemberDTO memberDTO){
+ List<GridMemberLcListVO> gridMemberLcList = new ArrayList<>();
+ R r = apiService.getGridMemberListByAreaIdOrName("jhRxqEQp",memberDTO.getParam(),memberDTO.getPageNum(),memberDTO.getPageSize());
+ if(R.isOk(r)){
+ List<GridMemberPageListDTO> memberList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), GridMemberPageListDTO.class);
+ if(!memberList.isEmpty()){
+ memberList.forEach(member -> {
+ GridMemberLcListVO memberLcListVO = new GridMemberLcListVO();
+ memberLcListVO.setLcBindUserId(member.getBindUserId());
+ memberLcListVO.setLcGridMemberId(member.getId());
+ memberLcListVO.setLcGridMemberName(member.getName());
+ gridMemberLcList.add(memberLcListVO);
+ });
+ }
+ }
+ return R.ok(gridMemberLcList);
}
@ApiOperation(value = "添加网格员时级联列表",response = GridMemberCascadeVO.class)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
index 8395ee2..17148bb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
+++ b/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.api.ApiServiceFeign;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.StringUtils;
@@ -36,6 +37,8 @@
private GridService gridService;
@Resource
private CommunityService communityService;
+ @Resource
+ private ApiServiceFeign apiService;
@ApiOperation(value = "网格分页查询", response = EventGridAdminVO.class)
@PostMapping("/event/list")
@@ -100,9 +103,15 @@
}
@ApiOperation(value = "查询所有关联市平台列表",response = EventLcGridAdminVO.class)
- @GetMapping("/lc/grid/list")
- public R getLcGridLists(){
- return gridService.getLcGridLists();
+ @GetMapping("/lc/grid/list/noToken")
+ public R getLcGridLists(@RequestParam("areaId") String areaId){
+ return apiService.getGridDataListByAreaId(areaId);
+ }
+
+ @ApiOperation(value = "查询西区所有关联市平台树形结构列表",response = EventLcGridAdminVO.class)
+ @GetMapping("/lc/grid/tree/list/noToken")
+ public R getLcGridTreeLists(){
+ return apiService.getGridTreeByAreaId("jhRxqEQp");
}
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
index 9ea9166..bfe7875 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
@@ -104,9 +104,9 @@
*/
@ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
@GetMapping("lc/event/getGridMemberListByAreaIdOrName")
- public R getGridMemberListByAreaIdOrName(String areaId,String param) {
+ public R getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize) {
try {
- return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param));
+ return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param,pageNum,pageSize));
} catch (Exception e) {
log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
index 619206a..6556f92 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
@@ -97,7 +97,7 @@
* @author manailin
* @date 2021/6/10 17:00
*/
- List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param);
+ List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize);
/**
* description 提交事件登记关联的文件或者图片信息
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
index 5e08768..5b867f3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
@@ -169,10 +169,12 @@
}
@Override
- public List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param) {
+ public List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize) {
HttpRequest request = HttpUtil.createGet(LcApiConstants.GRID_GET_GETALL_SEARCH_PAGE_URL);
request.auth(getAuthToken());
request.form("areaId", areaId);
+ request.form("limit", pageSize);
+ request.form("page", pageNum);
if(param !=null){
request.form("param", param);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
index 4fe1a37..33c5abe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
@@ -211,7 +211,7 @@
@Test
void getGridMemberListByAreaIdOrName() {
- List<GridMemberPageListDTO> data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp", "");
+ List<GridMemberPageListDTO> data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp", "",1L,20L);
// log.info(data);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
index 72f9e52..6dee69f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridDataService;
@@ -206,11 +207,22 @@
if(eventGridDataDTO.getLcGridId() != null){
//关联市平台网格
- LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectById(eventGridDataDTO.getLcGridId());
+ LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectOne(new QueryWrapper<LcCompareCodeDO>().lambda()
+ .eq(LcCompareCodeDO::getLcGridId,eventGridDataDTO.getLcGridId()));
if(compareCodeDO != null){
compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
compareCodeDO.setGridName(gridDataDO.getGridName());
+ compareCodeDO.setUpdateAt(new Date());
lcCompareCodeMapper.updateById(compareCodeDO);
+ }else{
+ compareCodeDO = new LcCompareCodeDO();
+ compareCodeDO.setId(Snowflake.getId());
+ compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
+ compareCodeDO.setGridName(gridDataDO.getGridName());
+ compareCodeDO.setLcGridId(eventGridDataDTO.getLcGridId());
+ compareCodeDO.setLcGridName(eventGridDataDTO.getLcGridName());
+ compareCodeDO.setCreateAt(new Date());
+ lcCompareCodeMapper.insert(compareCodeDO);
}
}
return R.ok();
@@ -255,24 +267,29 @@
}
}
+ //查询已存在的关系需要清除
+ lcCompareCodeMapper.delete(new QueryWrapper<LcCompareCodeDO>()
+ .lambda().eq(LcCompareCodeDO::getLocalGridId,gridDataDO.getId()));
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());
+ LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectOne(new QueryWrapper<LcCompareCodeDO>().lambda()
+ .eq(LcCompareCodeDO::getLcGridId,eventGridDataDTO.getLcGridId()));
if(compareCodeDO != null){
compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
compareCodeDO.setGridName(gridDataDO.getGridName());
+ compareCodeDO.setUpdateAt(new Date());
lcCompareCodeMapper.updateById(compareCodeDO);
+ }else{
+ compareCodeDO = new LcCompareCodeDO();
+ compareCodeDO.setId(Snowflake.getId());
+ compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
+ compareCodeDO.setGridName(gridDataDO.getGridName());
+ compareCodeDO.setLcGridId(eventGridDataDTO.getLcGridId());
+ compareCodeDO.setLcGridName(eventGridDataDTO.getLcGridName());
+ compareCodeDO.setCreateAt(new Date());
+ lcCompareCodeMapper.insert(compareCodeDO);
}
}
-
return R.ok();
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/LcCompareMemberCodeMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/LcCompareMemberCodeMapper.java
new file mode 100644
index 0000000..7326bd8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/LcCompareMemberCodeMapper.java
@@ -0,0 +1,19 @@
+package com.panzhihua.service_user.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * program 攀枝花智慧社区项目
+ * description 本地网格和浪潮的对码表管理API
+ *
+ * @author manailin
+ * Date 2021-01-22 15:30
+ **/
+@Mapper
+public interface LcCompareMemberCodeMapper extends BaseMapper<LcCompareCodeMemberDO> {
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 27b094b..5871bb6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -414,7 +414,7 @@
@Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}")
void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") String userName);
- @Update("update lc_compare_code_member set local_grid_member_id = null,grid_member_name = null where local_grid_member_id = #{gridMemberId}")
+ @Delete("delete from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
void delLcMember(@Param("gridMemberId") Long gridMemberId);
@Select("select id,village_id,act_id from com_mng_building where id = #{buildingId}")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java
new file mode 100644
index 0000000..1d68aba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.service_user.model.dos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Description 本地网格和浪潮的对码表
+ * ClassName LcCompareCode
+ * @author manailin
+ */
+ @Data
+ @TableName("lc_compare_code_member")
+public class LcCompareCodeMemberDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**主键*/
+ @TableId(type = IdType.INPUT)
+ private Long id;
+ /**本地网格ID*/
+ private String localGridMemberId;
+ /**网格名称*/
+ private String gridMemberName;
+ /**浪潮市平台网格ID*/
+ private String lcGridMemberId;
+ /**浪潮市平台网格名称*/
+ private String lcGridMemberName;
+ /**浪潮网格员绑定的用户ID*/
+ private String lcBindUserId;
+ /**创建时间*/
+ private Date createAt;
+ /**修改时间*/
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 174bbb1..5cb937a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -27,6 +27,7 @@
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -88,6 +89,8 @@
private EventGridMemberBuildingRelationService buildingRelationService;
@Resource
private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
+ @Resource
+ private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
// @Resource
// private GridService gridService;
@@ -1938,7 +1941,24 @@
//关联市平台网格员
if(eventGridMemberAddDTO.getLcMemberId() != null){
- this.userDao.addLcMember(eventGridMemberAddDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ LcCompareCodeMemberDO compareCodeMemberDO = lcCompareMemberCodeMapper.selectOne(new QueryWrapper<LcCompareCodeMemberDO>().lambda()
+ .eq(LcCompareCodeMemberDO::getLcGridMemberId,eventGridMemberAddDTO.getLcMemberId()));
+ if(compareCodeMemberDO != null){
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setUpdateAt(new Date());
+ lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
+ }else{
+ compareCodeMemberDO = new LcCompareCodeMemberDO();
+ compareCodeMemberDO.setId(Snowflake.getId());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setLcGridMemberId(eventGridMemberAddDTO.getLcMemberId());
+ compareCodeMemberDO.setLcBindUserId(eventGridMemberAddDTO.getLcBingUserId());
+ compareCodeMemberDO.setLcGridMemberName(eventGridMemberAddDTO.getLcMemberName());
+ compareCodeMemberDO.setCreateAt(new Date());
+ lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
+ }
}
//网格员关联楼栋
@@ -2041,7 +2061,24 @@
//关联市平台网格员
if(gridMemberDTO.getLcMemberId() != null){
//关联现有的网格员信息
- this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ LcCompareCodeMemberDO compareCodeMemberDO = lcCompareMemberCodeMapper.selectOne(new QueryWrapper<LcCompareCodeMemberDO>().lambda()
+ .eq(LcCompareCodeMemberDO::getLcGridMemberId,gridMemberDTO.getLcMemberId()));
+ if(compareCodeMemberDO != null){
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setUpdateAt(new Date());
+ lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
+ }else{
+ compareCodeMemberDO = new LcCompareCodeMemberDO();
+ compareCodeMemberDO.setId(Snowflake.getId());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setLcGridMemberId(gridMemberDTO.getLcMemberId());
+ compareCodeMemberDO.setLcBindUserId(gridMemberDTO.getLcBingUserId());
+ compareCodeMemberDO.setLcGridMemberName(gridMemberDTO.getLcMemberName());
+ compareCodeMemberDO.setCreateAt(new Date());
+ lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
+ }
}
//清除原网格员与楼栋关联关系
this.userDao.delGridMemberRelation(sysUserDO.getUserId());
--
Gitblit v1.7.1