diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java index 6c355d33..dd97de8a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java @@ -99,4 +99,10 @@ public class SdHbrvDic implements Serializable { * 删除时间 */ private Date deleteTime; + + /** + * 基地名称 + */ + @TableField(exist = false) + private String basename; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java index 3dde38df..2751611f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java @@ -1,8 +1,10 @@ package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.qgc_base.domain.SdHbrvDic; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -27,4 +29,16 @@ public interface SdHbrvDicMapper extends BaseMapper { * 查询所有启用的流域 */ List selectEnabledList(); + + @Select("SELECT\n" + + " shd.*,\n" + + " sh.BASENAME\n" + + "FROM\n" + + " SD_HBRV_DIC shd\n" + + " LEFT JOIN SD_HYDROBASE sh ON sh.BASEID = shd.BASEID\n" + + "WHERE\n" + + " 1 = 1 \n" + + " AND shd.IS_DELETED = 0 \n" + + " AND sh.IS_DELETED = 0") + List getWbsbList(DataSourceRequest dataSourceRequest); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java index c38003c0..ad5984bd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java @@ -62,4 +62,5 @@ public interface ISdHbrvDicService extends IService { List getHbrvdList(DataSourceRequest dataSourceRequest); + List getWbsbList(DataSourceRequest dataSourceRequest); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java index 5d58e2fe..1e41c5ba 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java @@ -52,6 +52,7 @@ public class SdHbrvDicServiceImpl extends ServiceImpl getWbsbList(DataSourceRequest dataSourceRequest) { + List sdHbrvDics = hbrvDicMapper.getWbsbList(dataSourceRequest); + return sdHbrvDics; + } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java index fbdbf065..ddaaff51 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongBController.java @@ -7,8 +7,11 @@ import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.exception.BizException; import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.service.ISdHbrvDicService; +import com.yfd.platform.qgc_env.wt.service.SdWtMonitorService; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; import com.yfd.platform.qgc_lygk.along.service.IMsAlongBService; +import com.yfd.platform.qgc_sys.mapcfg.service.IMapmoduleBService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -32,6 +35,12 @@ public class MsAlongBController { @Resource private IMsAlongBService msAlongBService; + + @Resource + private SdWtMonitorService sdWtMonitorService; + + @Resource + private ISdHbrvDicService hbrvDicService; /** * 条件过滤数据列表 */ @@ -61,10 +70,16 @@ public class MsAlongBController { return ResponseResult.success("保存成功."); } -// @Operation(summary = "沿程配置删除") -// @PostMapping("/delete") -// public ResponseResult deleteData(@RequestBody List ids) { -// mapmoduleBService.delelteByIds(ids); -// return ResponseResult.success("删除成功."); -// } + @PostMapping("/wbsb/GetKendoList") + @Operation(summary = "查询水电基地流域字典列表") + public ResponseResult getWbsbList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(hbrvDicService.getWbsbList(dataSourceRequest)); + } + + @Operation(summary = "沿程配置删除") + @PostMapping("/delete") + public ResponseResult deleteData(@RequestBody List ids) { + msAlongBService.delelteByIds(ids); + return ResponseResult.success("删除成功."); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java index dcb90386..8f489ee6 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/controller/MsAlongDetBController.java @@ -51,4 +51,14 @@ public class MsAlongDetBController { msAlongDetBService.saveOrUpdate(msAlongDetB); return ResponseResult.success("保存成功."); } + + /** + * 条件过滤数据列表定制 + */ + @Operation(summary = "条件过滤数据列表定制") + @PostMapping("/GetKendoListCust") + public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { + DataSourceResult result = msAlongDetBService.getKendoList(dataSourceRequest); + return ResponseResult.successData(result); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java index 3f23532b..9260fb42 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/IMsAlongBService.java @@ -5,6 +5,8 @@ import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.qgc_lygk.along.domain.MsAlongB; +import java.util.List; + /** * 沿程配置表 Service 接口 * @@ -19,6 +21,8 @@ public interface IMsAlongBService extends IService { */ DataSourceResult getKendoList(DataSourceRequest dataSourceRequest); + void delelteByIds(List ids); + // /** // * 保存或更新沿程配置 // * diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java index 7fd2fd93..0de796e3 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java @@ -13,6 +13,7 @@ import com.yfd.platform.utils.DataSourceRequestUtil; import com.yfd.platform.utils.QgcQueryWrapperUtil; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -52,6 +53,13 @@ public class MsAlongBServiceImpl extends ServiceImpl i return dataSourceResult; } + @Override + public void delelteByIds(List ids) { + for (String id : ids) { + this.delelteByIds(Collections.singletonList(id)); + } + } + // @Override // public boolean saveOrUpdate(MsAlongB msAlongB) { // super.saveOrUpdate(msAlongB); diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java index ee8da0e4..00b8523a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/mapper/MsMapmoduleBMapper.java @@ -109,6 +109,27 @@ public interface MsMapmoduleBMapper extends BaseMapper { + "" + "ORDER BY BMM.ORDER_INDEX, BML.ORDER_INDEX" + "") - List getModuleMapLegendList(@Param("moduleId") String moduleId); + List getModuleMapLegendListData(@Param("moduleId") String moduleId); + @Select("SELECT *\n" + + "FROM MS_MAPMODULE_B\n" + + "WHERE MODULE_ID = (\n" + + " SELECT msdmb.MODULE_ID\n" + + " FROM MS_MAPMODULE_B msdmb\n" + + " LEFT JOIN MS_MAPLEGEND_B mslmb ON msdmb.RES_ID = mslmb.ID\n" + + " LEFT JOIN MS_MAPLAYER_B msmab ON msmab.CODE = mslmb.LAYER_CODE\n" + + " WHERE msdmb.ID = #{id}\n" + + " AND msdmb.IS_DELETED = 0\n" + + ")\n" + + "AND RES_TYPE = 'layer'\n" + + "AND RES_ID = (\n" + + " SELECT msmab.id\n" + + " FROM MS_MAPMODULE_B msdmb\n" + + " LEFT JOIN MS_MAPLEGEND_B mslmb ON msdmb.RES_ID = mslmb.ID\n" + + " LEFT JOIN MS_MAPLAYER_B msmab ON msmab.CODE = mslmb.LAYER_CODE\n" + + " WHERE msdmb.ID = #{id}\n" + + " AND msdmb.IS_DELETED = 0\n" + + ")\n" + + "AND IS_DELETED = 0") + MsMapmoduleB selectLayerById(@Param("id") String id); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java index 5ca81ae0..1ad9c34e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendBizServiceImpl.java @@ -148,7 +148,7 @@ public class MapLegendBizServiceImpl implements IMapLegendBizService { public List getModuleMapLegendList(String moduleId) { List list = new ArrayList<>(); // 通过 JOIN 查询 MS_MAPLEGEND_B 和 MS_MAPMODULE_B（单参数版本） - List bbiMapLegendList = msMapmoduleBMapper.getModuleMapLegendList(moduleId); + List bbiMapLegendList = msMapmoduleBMapper.getModuleMapLegendListData(moduleId); if (bbiMapLegendList == null || bbiMapLegendList.isEmpty()) { return list; diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java index 1b7b5098..75d92b56 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/service/impl/MapmoduleBServiceImpl.java @@ -59,10 +59,12 @@ public class MapmoduleBServiceImpl extends ServiceImpl ids) { - if (ids != null) { - for (String id : ids) { - this.baseMapper.deleteById(id); + for (String id : ids) { + MsMapmoduleB msMapmoduleB = baseMapper.selectLayerById(id); + if (msMapmoduleB != null && msMapmoduleB.getId() != null){ + this.baseMapper.deleteById(msMapmoduleB.getId()); } + this.baseMapper.deleteById(id); } }