Compare commits

..

No commits in common. "4aff06ac8b5b7b6509b6f45202bf750660529f5a" and "7928e671de9e6097616421ce275e792a5cfb3685" have entirely different histories.

14 changed files with 5 additions and 338 deletions

View File

@ -1,20 +0,0 @@
package com.yfd.platform.modules.algorithm.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
@RestController
@RequestMapping("/algorithm/algorithm-arrange")
public class AlgorithmArrangeController {
}

View File

@ -1,20 +0,0 @@
package com.yfd.platform.modules.algorithm.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
@RestController
@RequestMapping("/algorithm/algorithm-arrange-device")
public class AlgorithmArrangeDeviceController {
}

View File

@ -1,115 +0,0 @@
package com.yfd.platform.modules.algorithm.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("iis_algorithm_arrange")
public class AlgorithmArrange implements Serializable {
private static final long serialVersionUID = 1L;
/**
* uuid
*/
private String id;
/**
* 布点方案名称
*/
private String arrangeName;
/**
* 变电站id
*/
private String stationId;
/**
* 变电站名称
*/
private String stationName;
/**
* 和中台对应资源 ID 保持一致
*/
private String stationCode;
/**
* 变电站类型
*/
private String stationType;
/**
* 电压等级
*/
private String voltLevel;
/**
* 业务类型1远程智能巡视2一次设备在线监测3智能锁控4动环监测
*/
private String businessType;
/**
* 主设备类型逗号分隔
*/
private String deviceTypeList;
/**
* 变电站平面原图地址
*/
private String imageUrl;
/**
* 变电站布点图地址
*/
private String arrangeImageUrl;
/**
* 是否有图纸01
*/
private String isImageFlag;
/**
* 数据状态
*/
private String datastatus;
/**
* 修改人
*/
private String lastmodifier;
/**
* 最近修改时间
*/
private LocalDateTime lastmodifydate;
/**
* 备用1(排序编号)
*/
private Integer custom1;
/**
* 备用2
*/
private String custom2;
/**
* 备用3
*/
private String custom3;
}

View File

@ -1,64 +0,0 @@
package com.yfd.platform.modules.algorithm.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("iis_algorithm_arrange_device")
public class AlgorithmArrangeDevice implements Serializable {
private static final long serialVersionUID = 1L;
/**
* uuid
*/
private String id;
/**
* 布点id
*/
private String arrangeId;
/**
* 主设备id
*/
private String mainDeviceId;
/**
* 主设备类型
*/
private String deviceType;
/**
* 主设备名称
*/
private String mainDeviceName;
/**
* 设备类型1摄像机2声纹传感器3局放传感器4温湿度传感器
*/
private String patroldeviceType;
/**
* 设备坐标;{"x":1868,"y":1060}
*/
private String patroldevicePos;
/**
* 设备描述
*/
private String patroldeviceDes;
}

View File

@ -1,16 +0,0 @@
package com.yfd.platform.modules.algorithm.mapper;
import com.yfd.platform.modules.algorithm.domain.AlgorithmArrangeDevice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
public interface AlgorithmArrangeDeviceMapper extends BaseMapper<AlgorithmArrangeDevice> {
}

View File

@ -1,16 +0,0 @@
package com.yfd.platform.modules.algorithm.mapper;
import com.yfd.platform.modules.algorithm.domain.AlgorithmArrange;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
public interface AlgorithmArrangeMapper extends BaseMapper<AlgorithmArrange> {
}

View File

@ -1,16 +0,0 @@
package com.yfd.platform.modules.algorithm.service;
import com.yfd.platform.modules.algorithm.domain.AlgorithmArrangeDevice;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
public interface IAlgorithmArrangeDeviceService extends IService<AlgorithmArrangeDevice> {
}

View File

@ -1,16 +0,0 @@
package com.yfd.platform.modules.algorithm.service;
import com.yfd.platform.modules.algorithm.domain.AlgorithmArrange;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
public interface IAlgorithmArrangeService extends IService<AlgorithmArrange> {
}

View File

@ -1,20 +0,0 @@
package com.yfd.platform.modules.algorithm.service.impl;
import com.yfd.platform.modules.algorithm.domain.AlgorithmArrangeDevice;
import com.yfd.platform.modules.algorithm.mapper.AlgorithmArrangeDeviceMapper;
import com.yfd.platform.modules.algorithm.service.IAlgorithmArrangeDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
@Service
public class AlgorithmArrangeDeviceServiceImpl extends ServiceImpl<AlgorithmArrangeDeviceMapper, AlgorithmArrangeDevice> implements IAlgorithmArrangeDeviceService {
}

View File

@ -1,20 +0,0 @@
package com.yfd.platform.modules.algorithm.service.impl;
import com.yfd.platform.modules.algorithm.domain.AlgorithmArrange;
import com.yfd.platform.modules.algorithm.mapper.AlgorithmArrangeMapper;
import com.yfd.platform.modules.algorithm.service.IAlgorithmArrangeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author zhengsl
* @since 2025-06-06
*/
@Service
public class AlgorithmArrangeServiceImpl extends ServiceImpl<AlgorithmArrangeMapper, AlgorithmArrange> implements IAlgorithmArrangeService {
}

View File

@ -22,7 +22,7 @@ public class AlgorithmTaskManager {
private static final String JOB_GROUP_PREFIX = "STATION_";
// 存储每个 stationCode 对应的 Scheduler
private final Map<String, Scheduler> schedulers = new HashMap<>();
private Map<String, Scheduler> schedulers = new HashMap<>();
/**
* 添加定时任务

View File

@ -25,7 +25,10 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -110,9 +113,6 @@ public class SubstationMaindeviceController {
@GetMapping("/getMainDeviceByType")
@ApiOperation("根据主设备类型获取主设备")
public ResponseResult getMainDeviceByType(String stationCode, String deviceType) {
if (StrUtil.isBlank(stationCode) || StrUtil.isBlank(deviceType)) {
return ResponseResult.successData(new ArrayList<>());
}
LambdaQueryWrapper<SubstationMaindevice> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StrUtil.isNotBlank(stationCode), SubstationMaindevice::getStationCode, stationCode);
queryWrapper.eq(StrUtil.isNotBlank(deviceType), SubstationMaindevice::getDeviceType, StrUtil.split(deviceType

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yfd.platform.modules.algorithm.mapper.AlgorithmArrangeDeviceMapper">
</mapper>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yfd.platform.modules.algorithm.mapper.AlgorithmArrangeMapper">
</mapper>