Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-30 b200b681bc401bb11c133a79273ba78cb6ebedf8

 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();
@@ -231,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){
                //移除网格员和网格关系
@@ -254,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();
            }
        }