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_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 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 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(); } } -- Gitblit v1.7.1