From 1cae0f1e4c36469cde68bfa97bd391c5ea1ff57b Mon Sep 17 00:00:00 2001 From: weitang Date: Wed, 14 May 2025 10:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AE=97=E6=B3=95=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AlgorithmClassComponentController.java | 2 + .../controller/AlgorithmClassController.java | 14 +++++ .../controller/AlgorithmDeviceController.java | 2 + .../controller/AlgorithmParamsController.java | 52 +++++++++++++++++-- .../algorithm/domain/AlgorithmClass.java | 11 +++- .../domain/AlgorithmClassComponent.java | 17 ++++++ .../algorithm/domain/AlgorithmDevice.java | 19 +++++++ .../algorithm/domain/AlgorithmParams.java | 21 ++++++++ .../service/IAlgorithmClassService.java | 3 ++ .../service/IAlgorithmParamsService.java | 8 +++ .../impl/AlgorithmClassServiceImpl.java | 39 ++++++++++++++ .../impl/AlgorithmParamsServiceImpl.java | 20 +++++++ .../controller/SubstationController.java | 13 ++++- .../service/impl/SubstationServiceImpl.java | 2 +- 14 files changed, 215 insertions(+), 8 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java index 4790920..a0d1dd5 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java @@ -5,6 +5,7 @@ import com.yfd.platform.config.ResponseResult; import com.yfd.platform.modules.algorithm.domain.AlgorithmClassComponent; import com.yfd.platform.modules.algorithm.service.IAlgorithmClassComponentService; import com.yfd.platform.modules.auxcontrol.domain.DeviceSignal; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,6 +25,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/algorithm/algorithm-class-component") +@Api(value = "AlgorithmClassComponentController", tags = "算法分类和部件关联") public class AlgorithmClassComponentController { @Resource diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java index 8654938..4026ccf 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java @@ -4,7 +4,9 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; +import com.yfd.platform.modules.algorithm.domain.AlgorithmParamsRequest; import com.yfd.platform.modules.algorithm.service.IAlgorithmClassService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -22,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/algorithm/algorithm-class") +@Api(value = "AlgorithmClassController", tags = "算法分类") public class AlgorithmClassController { @Resource @@ -48,6 +51,17 @@ public class AlgorithmClassController { } } + @PostMapping("/addAlgorithmClassAndParams") + @ApiOperation("保存算法分类和算法参数") + public ResponseResult addAlgorithmClassAndParams(@RequestBody AlgorithmParamsRequest algorithmParamsRequest) { + boolean isOK = algorithmClassService.addAlgorithmClassAndParams(algorithmParamsRequest); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } + @PostMapping("/updateAlgorithmClass") @ApiOperation("修改算法分类") public ResponseResult updateAlgorithmClass(@RequestBody AlgorithmClass algorithmClass) { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java index 5714f07..a8bbbbf 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java @@ -4,6 +4,7 @@ import com.yfd.platform.config.ResponseResult; import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; import com.yfd.platform.modules.algorithm.domain.AlgorithmDevice; import com.yfd.platform.modules.algorithm.service.IAlgorithmDeviceService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,6 +25,7 @@ import java.util.List; */ @RestController @RequestMapping("/algorithm/algorithm-device") +@Api(value = "AlgorithmDeviceController", tags = "算法分类部件点位关联") public class AlgorithmDeviceController { @Resource diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java index 1eeadbe..06862af 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java @@ -2,12 +2,12 @@ package com.yfd.platform.modules.algorithm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; import com.yfd.platform.modules.algorithm.domain.AlgorithmParams; import com.yfd.platform.modules.algorithm.service.IAlgorithmParamsService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -24,16 +24,60 @@ import java.util.Map; */ @RestController @RequestMapping("/algorithm/algorithm-params") +@Api(value = "AlgorithmParamsController", tags = "算法分类参数") public class AlgorithmParamsController { @Resource private IAlgorithmParamsService algorithmParamsService; @GetMapping("/getAlgorithmParamsList") - @ApiOperation("查询算法分类") + @ApiOperation("查询算法参数") public ResponseResult getAlgorithmParamsList(String algorithmId) { List> algorithmClassList = algorithmParamsService.getAlgorithmParamsList(algorithmId); return ResponseResult.successData(algorithmClassList); } + @PostMapping("/addAlgorithmParams") + @ApiOperation("新增算法参数") + public ResponseResult addAlgorithmParams(@RequestBody AlgorithmParams algorithmParams) { + boolean isOK = algorithmParamsService.addAlgorithmParams(algorithmParams); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } + + @PostMapping("/batchAddAlgorithmParams") + @ApiOperation("批量新增算法参数") + public ResponseResult batchAddAlgorithmParams(@RequestBody List algorithmParamsList) { + boolean isOK = algorithmParamsService.batchAddAlgorithmParams(algorithmParamsList); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } + + @PostMapping("/batchUpdateAlgorithmParams") + @ApiOperation("批量修改算法参数") + public ResponseResult batchUpdateAlgorithmParams(@RequestBody List algorithmParamsList) { + boolean isOK = algorithmParamsService.batchUpdateAlgorithmParams(algorithmParamsList); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } + + @PostMapping("/deleteAlgorithmParams") + @ApiOperation("删除算法参数") + public ResponseResult deleteAlgorithmParams(String id) { + boolean isOK = algorithmParamsService.deleteAlgorithmParams(id); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClass.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClass.java index c45ef01..840d602 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClass.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClass.java @@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** *

- * + * 算法分类 *

* * @author zhengsl @@ -18,6 +21,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @TableName("iis_algorithm_class") +@ApiModel("算法分类") public class AlgorithmClass implements Serializable { private static final long serialVersionUID = 1L; @@ -26,26 +30,31 @@ public class AlgorithmClass implements Serializable { * 算法分类id */ @TableId(type = IdType.ASSIGN_UUID) + @ApiModelProperty("算法分类id") private String id; /** * 算法分类编号 */ + @ApiModelProperty("算法分类编号") private String algorithmClassCode; /** * 算法分类名称 */ + @ApiModelProperty("算法分类名称") private String algorithmClassName; /** * 描述 */ + @ApiModelProperty("描述") private String description; /** * 服务地址 */ + @ApiModelProperty("服务地址") private String serviceAddress; diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClassComponent.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClassComponent.java index c0024d3..3f5798b 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClassComponent.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClassComponent.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,6 +21,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @TableName("iis_algorithm_class_component") +@ApiModel("算法分类部件") public class AlgorithmClassComponent implements Serializable { private static final long serialVersionUID = 1L; @@ -26,66 +30,79 @@ public class AlgorithmClassComponent implements Serializable { * id */ @TableId(type = IdType.ASSIGN_UUID) + @ApiModelProperty("算法分类部件id") private String id; /** * 算法分类id */ + @ApiModelProperty("算法分类id") private String algorithmId; /** * 变电站编号 */ + @ApiModelProperty("变电站编号") private String stationCode; /** * 变电站名称 */ + @ApiModelProperty("变电站名称") private String stationName; /** * 区域id */ + @ApiModelProperty("区域id") private String areaId; /** * 区域名称 */ + @ApiModelProperty("区域名称") private String areaName; /** * 间隔id */ + @ApiModelProperty("间隔id") private String bayId; /** * 间隔名称 */ + @ApiModelProperty("间隔名称") private String bayName; /** * 主设备id */ + @ApiModelProperty("主设备id") private String mainDeviceId; /** * 主设备类型 */ + @ApiModelProperty("主设备类型") private String deviceType; /** * 主设备名称 */ + @ApiModelProperty("主设备名称") private String mainDeviceName; /** * 部件id */ + @ApiModelProperty("部件id") private String componentId; /** * 部件名称 */ + @ApiModelProperty("部件名称") private String componentName; diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmDevice.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmDevice.java index c6c9e2c..f6ea899 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmDevice.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmDevice.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,6 +22,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @TableName("iis_algorithm_device") +@ApiModel("算法分类绑定点位") public class AlgorithmDevice implements Serializable { private static final long serialVersionUID = 1L; @@ -26,77 +30,92 @@ public class AlgorithmDevice implements Serializable { /** * ID */ + @ApiModelProperty("ID") @TableId(type = IdType.ASSIGN_UUID) private String id; /** * 算法分类id */ + @ApiModelProperty("算法分类id") private String algorithm_id; /** * 参数id */ + @ApiModelProperty("参数id") private String paramId; /** * 参数名称 */ + @ApiModelProperty("参数名称") private String paramName; /** * 参数值 */ + @ApiModelProperty("参数值") private String paramValue; /** * 部件id */ + @ApiModelProperty("部件id") private String componentId; /** * 巡视点位名称(信号名称) */ + @ApiModelProperty("巡视点位名称(信号名称)") private String deviceName; /** * 巡视点位id（信号id） */ + @ApiModelProperty("巡视点位id（信号id）") private String deviceId; /** * 来源类型（1:巡视点位；2：辅控信号） */ + @ApiModelProperty("来源类型（1:巡视点位；2：辅控信号）") private String sourceType; /** * 数据状态 */ + @ApiModelProperty("数据状态") private String datastatus; /** * 修改人 */ + @ApiModelProperty("修改人") private String lastmodifier; /** * 最近修改时间 */ + @ApiModelProperty("最近修改时间") private LocalDateTime lastmodifydate; /** * 备用1 */ + @ApiModelProperty("备用1") private String custom1; /** * 备用2 */ + @ApiModelProperty("备用2") private String custom2; /** * 备用3 */ + @ApiModelProperty("备用3") private String custom3; diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmParams.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmParams.java index ac0e849..4a98276 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmParams.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmParams.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,6 +22,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @TableName("iis_algorithm_params") +@ApiModel("算法分类参数") public class AlgorithmParams implements Serializable { private static final long serialVersionUID = 1L; @@ -27,86 +31,103 @@ public class AlgorithmParams implements Serializable { * id */ @TableId(type = IdType.ASSIGN_UUID) + @ApiModelProperty("算法分类参数id") private String id; /** * 算法分类id */ + @ApiModelProperty("算法分类id") private String algorithmId; /** * 参数序号 */ + @ApiModelProperty("参数序号") private String paramOrder; /** * 参数名称 */ + @ApiModelProperty("参数名称") private String paramName; /** * 参数中文描述 */ + @ApiModelProperty("参数中文描述") private String paramDesc; /** * 参数类型：[('01', '单个文本'), ('02', '文本数组'), ('03', '单个数值'), ('04', '数值数组'), ('05', 'Json对象'),('06', 'Json数组'), ('07', 'csv数据文件'), ('08', '单张图片'),('09', '图片文件包'),('10', 'Json文件')] */ + @ApiModelProperty("参数类型") private String paramType; /** * 自定义描述参数单位 */ + @ApiModelProperty("自定义描述参数单位") private String paramUnit; /** * 参数范围 */ + @ApiModelProperty("参数范围") private String paramRange; /** * 默认值 */ + @ApiModelProperty("默认值") private String defaultValues; /** * 参数描述 */ + @ApiModelProperty("参数描述") private String description; /** * 是否固定参数，0：否；1：是；当为否时需要关联巡视点位或者信号 */ + @ApiModelProperty("是否固定参数,0：否；1：是") private String paramFixed; /** * 数据状态 */ + @ApiModelProperty("数据状态") private String datastatus; /** * 修改人 */ + @ApiModelProperty("修改人") private String lastmodifier; /** * 最近修改时间 */ + @ApiModelProperty("最近修改时间") private LocalDateTime lastmodifydate; /** * 备用1 */ + @ApiModelProperty("custom1") private String custom1; /** * 备用2 */ + @ApiModelProperty("备用2") private String custom2; /** * 备用3 */ + @ApiModelProperty("备用3") private String custom3; diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassService.java index 994766c..1c5bf82 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassService.java @@ -2,6 +2,7 @@ package com.yfd.platform.modules.algorithm.service; import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.modules.algorithm.domain.AlgorithmParamsRequest; /** *

@@ -35,4 +36,6 @@ public interface IAlgorithmClassService extends IService { ***********************************/ boolean deleteAlgorithmClass(String id); + boolean addAlgorithmClassAndParams(AlgorithmParamsRequest algorithmParamsRequest); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java index 2ba0e8a..550ab1c 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java @@ -18,4 +18,12 @@ import java.util.Map; public interface IAlgorithmParamsService extends IService { List> getAlgorithmParamsList(String algorithmId); + + boolean addAlgorithmParams(AlgorithmParams algorithmParams); + + boolean batchAddAlgorithmParams(List algorithmParamsList); + + boolean batchUpdateAlgorithmParams(List algorithmParamsList); + + boolean deleteAlgorithmParams(String id); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassServiceImpl.java index e193ebd..491f701 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassServiceImpl.java @@ -1,10 +1,23 @@ package com.yfd.platform.modules.algorithm.service.impl; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.StrUtil; import com.yfd.platform.modules.algorithm.domain.AlgorithmClass; +import com.yfd.platform.modules.algorithm.domain.AlgorithmParams; +import com.yfd.platform.modules.algorithm.domain.AlgorithmParamsRequest; import com.yfd.platform.modules.algorithm.mapper.AlgorithmClassMapper; +import com.yfd.platform.modules.algorithm.mapper.AlgorithmParamsMapper; import com.yfd.platform.modules.algorithm.service.IAlgorithmClassService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.modules.algorithm.service.IAlgorithmParamsService; +import com.yfd.platform.utils.SecurityUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; /** *

@@ -15,8 +28,12 @@ import org.springframework.stereotype.Service; * @since 2025-05-13 */ @Service +@Transactional public class AlgorithmClassServiceImpl extends ServiceImpl implements IAlgorithmClassService { + @Resource + private IAlgorithmParamsService algorithmParamsService; + /********************************** * 用途说明: 新增算法分类 * 参数说明 algorithmClass @@ -46,4 +63,26 @@ public class AlgorithmClassServiceImpl extends ServiceImpl algorithmParamsList = algorithmParamsRequest.getAlgorithmParamsList(); + algorithmParamsList.forEach(r -> { + r.setAlgorithmId(algorithmClass.getId()); + r.setLastmodifier(currentUsername); + r.setLastmodifydate(LocalDateTime.now()); + }); + return algorithmParamsService.saveOrUpdateBatch(algorithmParamsList); + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java index 412b7ce..6767ce7 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java @@ -28,4 +28,24 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl> getAlgorithmParamsList(String algorithmId) { return algorithmParamsMapper.getAlgorithmParamsList(algorithmId); } + + @Override + public boolean addAlgorithmParams(AlgorithmParams algorithmParams) { + return this.saveOrUpdate(algorithmParams); + } + + @Override + public boolean batchAddAlgorithmParams(List algorithmParamsList) { + return this.saveBatch(algorithmParamsList); + } + + @Override + public boolean batchUpdateAlgorithmParams(List algorithmParamsList) { + return this.saveOrUpdateBatch(algorithmParamsList); + } + + @Override + public boolean deleteAlgorithmParams(String id) { + return this.removeById(id); + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java index 67954ee..39b8bca 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java @@ -118,8 +118,8 @@ public class SubstationController { return ResponseResult.error("参数为空"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SubstationArea::getStationCode, stationCode).eq(SubstationArea::getDatastatus, "1"); - List list = substationAreaService.list(queryWrapper); + queryWrapper.eq(SubstationArea::getStationCode, stationCode).eq(SubstationArea::getDatastatus, "1").select(SubstationArea::getStationCode,SubstationArea::getStationName,SubstationArea::getAreaId,SubstationArea::getAreaName); + List> list = substationAreaService.listMaps(queryWrapper); return ResponseResult.successData(list); } @@ -509,4 +509,13 @@ public class SubstationController { return ResponseResult.success(); } + + @GetMapping("/getSubstationMaindeviceList") + @ApiOperation("获取间隔下的主设备") + public ResponseResult getSubstationMaindeviceList(String bayId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SubstationMaindevice::getDatastatus, "1").eq(SubstationMaindevice::getBayId, bayId).select(SubstationMaindevice::getAreaId, SubstationMaindevice::getAreaName, SubstationMaindevice::getBayId, SubstationMaindevice::getBayName, SubstationMaindevice::getStationCode, SubstationMaindevice::getMainDeviceName, SubstationMaindevice::getMainDeviceId); + List> mapList = substationMaindeviceService.listMaps(queryWrapper); + return ResponseResult.successData(mapList); + } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java index 420c00e..842e7ed 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java @@ -182,7 +182,7 @@ public class SubstationServiceImpl extends ServiceImpl> list = substationBayMapper.selectMaps(queryWrapper); return list; }