From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
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 06eb4e4..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
@@ -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;
@@ -11,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;
@@ -40,6 +42,8 @@
private EventMapper eventMapper;
@Resource
private EventGridMemberRelationService eventGridMemberRelationService;
+ @Resource
+ private LcCompareCodeMapper lcCompareCodeMapper;
/**
* 新增区县/街道/社区/网格员网格数据管理
* @param eventGridDataAddDTO
@@ -201,6 +205,26 @@
}
}
+ if(eventGridDataDTO.getLcGridId() != null){
+ //关联市平台网格
+ 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();
}
}
@@ -219,6 +243,7 @@
EventGridDataDO gridDataDO = this.baseMapper.selectById(eventGridDataDTO.getGridId());
if(gridDataDO != null){
BeanUtils.copyProperties(eventGridDataDTO,gridDataDO);
+ gridDataDO.setRemarks(eventGridDataDTO.getRemarks());
gridDataDO.setUpdateBy(eventGridDataDTO.getUserId());
if(this.baseMapper.updateById(gridDataDO) > 0){
//移除网格员和网格关系
@@ -241,6 +266,30 @@
eventGridMemberRelationService.saveBatch(memberRelationDOList);
}
}
+
+ //查询已存在的关系需要清除
+ lcCompareCodeMapper.delete(new QueryWrapper<LcCompareCodeDO>()
+ .lambda().eq(LcCompareCodeDO::getLocalGridId,gridDataDO.getId()));
+ if(eventGridDataDTO.getLcGridId() != null){
+ //关联市平台网格
+ 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();
}
}
@@ -248,6 +297,18 @@
}
@Override
+ public R getGridMemberListsByGrid(Long gridId) {
+ List<EventGridMemberAdminVO> eventGridMemberAdminVOList = this.getBaseMapper().getGridMemberListsByGrid(gridId);
+ return R.ok(eventGridMemberAdminVOList);
+ }
+
+ @Override
+ public R getGridDataListByCommunity(Long communityId) {
+ List<EventGridDataAreaVO> eventGridDataAreaVOList = this.getBaseMapper().getGridDataListByCommunity(communityId);
+ return R.ok(eventGridDataAreaVOList);
+ }
+
+ @Override
public R deleteGridDataByAdmin(List<Long> Ids){
Integer count = eventMapper.getEventCountByGridIds(Ids);
if(count > 0){
--
Gitblit v1.7.1