ThbTech/SmartSubstationPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增算法分类配置逻辑

Browse Source
This commit is contained in:
weitang 2025-05-14 10:55:03 +08:00
parent 172404f84d
commit 1cae0f1e4c
14 changed files with 215 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java
View File

@ -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

14
riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassController.java
View File

@ -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) {

2
riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmDeviceController.java
View File

@ -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

52
riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmParamsController.java
View File

@ -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<Map<String, Object>> 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<AlgorithmParams> algorithmParamsList) {
boolean isOK = algorithmParamsService.batchAddAlgorithmParams(algorithmParamsList);
if (isOK) {
return ResponseResult.success();
} else {
return ResponseResult.error();
}
}
@PostMapping("/batchUpdateAlgorithmParams")
@ApiOperation("批量修改算法参数")
public ResponseResult batchUpdateAlgorithmParams(@RequestBody List<AlgorithmParams> 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();
}
}
}

11
riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClass.java
View File

@ -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;
/**
* <p>
*
* 算法分类
* </p>
*
* @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;

17
riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmClassComponent.java
View File

@ -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;

19
riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmDevice.java
View File

@ -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;

21
riis-system/src/main/java/com/yfd/platform/modules/algorithm/domain/AlgorithmParams.java
View File

@ -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;

3
riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassService.java
View File

@ -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;
/**
* <p>
@ -35,4 +36,6 @@ public interface IAlgorithmClassService extends IService<AlgorithmClass> {
***********************************/
boolean deleteAlgorithmClass(String id);
boolean addAlgorithmClassAndParams(AlgorithmParamsRequest algorithmParamsRequest);
}

8
riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmParamsService.java
View File

@ -18,4 +18,12 @@ import java.util.Map;
public interface IAlgorithmParamsService extends IService<AlgorithmParams> {
List<Map<String, Object>> getAlgorithmParamsList(String algorithmId);
boolean addAlgorithmParams(AlgorithmParams algorithmParams);
boolean batchAddAlgorithmParams(List<AlgorithmParams> algorithmParamsList);
boolean batchUpdateAlgorithmParams(List<AlgorithmParams> algorithmParamsList);
boolean deleteAlgorithmParams(String id);
}

39
riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassServiceImpl.java
View File

@ -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;
/**
* <p>
@ -15,8 +28,12 @@ import org.springframework.stereotype.Service;
* @since 2025-05-13
*/
@Service
@Transactional
public class AlgorithmClassServiceImpl extends ServiceImpl<AlgorithmClassMapper, AlgorithmClass> implements IAlgorithmClassService {
@Resource
private IAlgorithmParamsService algorithmParamsService;
/**********************************
* 用途说明: 新增算法分类
* 参数说明 algorithmClass
@ -46,4 +63,26 @@ public class AlgorithmClassServiceImpl extends ServiceImpl<AlgorithmClassMapper,
public boolean deleteAlgorithmClass(String id) {
return this.removeById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean addAlgorithmClassAndParams(AlgorithmParamsRequest algorithmParamsRequest) {
AlgorithmClass algorithmClass = algorithmParamsRequest.getAlgorithmClass();
if (ObjUtil.isEmpty(algorithmClass)) {
return false;
}
if (StrUtil.isBlank(algorithmClass.getId())) {
String uuid = IdUtil.fastSimpleUUID();
algorithmClass.setId(uuid);
}
String currentUsername = SecurityUtils.getCurrentUsername();
this.saveOrUpdate(algorithmClass);
List<AlgorithmParams> algorithmParamsList = algorithmParamsRequest.getAlgorithmParamsList();
algorithmParamsList.forEach(r -> {
r.setAlgorithmId(algorithmClass.getId());
r.setLastmodifier(currentUsername);
r.setLastmodifydate(LocalDateTime.now());
});
return algorithmParamsService.saveOrUpdateBatch(algorithmParamsList);
}
}

20
riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java
View File

@ -28,4 +28,24 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl<AlgorithmParamsMappe
public List<Map<String, Object>> getAlgorithmParamsList(String algorithmId) {
return algorithmParamsMapper.getAlgorithmParamsList(algorithmId);
}
@Override
public boolean addAlgorithmParams(AlgorithmParams algorithmParams) {
return this.saveOrUpdate(algorithmParams);
}
@Override
public boolean batchAddAlgorithmParams(List<AlgorithmParams> algorithmParamsList) {
return this.saveBatch(algorithmParamsList);
}
@Override
public boolean batchUpdateAlgorithmParams(List<AlgorithmParams> algorithmParamsList) {
return this.saveOrUpdateBatch(algorithmParamsList);
}
@Override
public boolean deleteAlgorithmParams(String id) {
return this.removeById(id);
}
}

13
riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java
View File

@ -118,8 +118,8 @@ public class SubstationController {
return ResponseResult.error("参数为空");
}
LambdaQueryWrapper<SubstationArea> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SubstationArea::getStationCode, stationCode).eq(SubstationArea::getDatastatus, "1");
List<SubstationArea> list = substationAreaService.list(queryWrapper);
queryWrapper.eq(SubstationArea::getStationCode, stationCode).eq(SubstationArea::getDatastatus, "1").select(SubstationArea::getStationCode,SubstationArea::getStationName,SubstationArea::getAreaId,SubstationArea::getAreaName);
List<Map<String, Object>> 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<SubstationMaindevice> 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<Map<String, Object>> mapList = substationMaindeviceService.listMaps(queryWrapper);
return ResponseResult.successData(mapList);
}
}

2
riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java
View File

@ -182,7 +182,7 @@ public class SubstationServiceImpl extends ServiceImpl<SubstationMapper, Substat
if (StrUtil.isNotBlank(areaId)) {
queryWrapper.eq(SubstationBay::getAreaId, areaId);
}
queryWrapper.eq(SubstationBay::getDatastatus, "1").orderByAsc(SubstationBay::getCustom1);
queryWrapper.eq(SubstationBay::getDatastatus, "1").select(SubstationBay::getAreaId,SubstationBay::getAreaName,SubstationBay::getBayId,SubstationBay::getBayName,SubstationBay::getStationCode,SubstationBay::getStationName).orderByAsc(SubstationBay::getCustom1);
List<Map<String, Object>> list = substationBayMapper.selectMaps(queryWrapper);
return list;
}