diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceResumeController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceResumeController.java new file mode 100644 index 0000000..c0b41fc --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceResumeController.java @@ -0,0 +1,103 @@ +package com.yfd.platform.modules.basedata.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.modules.basedata.domain.SubstationMaindeviceResume; +import com.yfd.platform.modules.basedata.service.ISubstationMaindeviceResumeService; +import com.yfd.platform.utils.SecurityUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.Map; + +/** + *

+ * 主设备维修记录 + * 前端控制器 + *

+ * + * @author zhengsl + * @since 2025-06-05 + */ +@RestController +@RequestMapping("/basedata/substation-maindevice-resume") +@Api(value = "SubstationMaindeviceResumeController", tags = "主设备维修记录") +public class SubstationMaindeviceResumeController { + + @Resource + private ISubstationMaindeviceResumeService resumeService; + + /** + * 分页查看主设备维修记录 + * + * @param page 分页参宿和 + * @param stationCode 变电站编码 + * @param areaId 区域id + * @param bayId 间隔id + * @param deviceType 主设备类型 + * @param mainDeviceName 主设备名称 + * @param startDate 开始时间 + * @param endDate 结束时间 + * @return + */ + @GetMapping("/getMaindeviceResume") + @ApiOperation("分页查看主设备维修记录") + public ResponseResult getMaindeviceResume(Page> page, String stationCode, String areaId, + String bayId, String deviceType, String mainDeviceName, + String startDate, String endDate) { + + Page> mapPage = resumeService.getMaindeviceResume(page, stationCode, areaId, bayId, + deviceType, mainDeviceName, startDate, endDate); + return ResponseResult.successData(mapPage); + } + + @GetMapping("/getMaindeviceResumeById") + @ApiOperation("通过id查询主设备维修记录") + public ResponseResult getMaindeviceResumeById(String id) { + if (id == null) { + return ResponseResult.error("参数为空"); + } + SubstationMaindeviceResume substationMaindeviceResume = resumeService.getById(id); + return ResponseResult.successData(substationMaindeviceResume); + } + + @PostMapping("/addMaindeviceResume") + @ApiOperation("新增主设备维修记录") + public ResponseResult addMaindeviceResume(@RequestBody SubstationMaindeviceResume substationMaindeviceResume) { + substationMaindeviceResume.setLastmodifier(SecurityUtils.getCurrentUsername()); + substationMaindeviceResume.setLastmodifydate(LocalDateTime.now()); + boolean isOk = resumeService.saveOrUpdate(substationMaindeviceResume); + if (!isOk) { + return ResponseResult.error(); + } + return ResponseResult.success(); + } + + @PostMapping("/updateMaindeviceResume") + @ApiOperation("修改主设备维修记录") + public ResponseResult updateMaindeviceResume(@RequestBody SubstationMaindeviceResume substationMaindeviceResume) { + substationMaindeviceResume.setLastmodifier(SecurityUtils.getCurrentUsername()); + substationMaindeviceResume.setLastmodifydate(LocalDateTime.now()); + boolean isOk = resumeService.saveOrUpdate(substationMaindeviceResume); + if (!isOk) { + return ResponseResult.error(); + } + return ResponseResult.success(); + } + + @PostMapping("/deleteMaindeviceResume") + @ApiOperation("删除主设备维修记录") + public ResponseResult deleteMaindeviceResume(String id) { + if (id == null) { + return ResponseResult.error("参数为空"); + } + boolean isOk = resumeService.removeById(id); + if (!isOk) { + return ResponseResult.error(); + } + return ResponseResult.success(); + } +} diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindevice.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindevice.java index aba1a80..8f60983 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindevice.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindevice.java @@ -80,6 +80,7 @@ public class SubstationMaindevice implements Serializable { /** * 初始运行时间，设备第一次运行的时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime runTime; /** @@ -87,6 +88,16 @@ public class SubstationMaindevice implements Serializable { */ private String fileUrl; + /** + * 关联点位id,用于展示主设备全景画面 + */ + private String deviceId; + + /** + * 是否关联点位0:未关联；1:已关联 + */ + private String contactFlag; + /** * 数据状态 */ @@ -124,4 +135,5 @@ public class SubstationMaindevice implements Serializable { @TableField("material_id") private String materialId; + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindeviceResume.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindeviceResume.java new file mode 100644 index 0000000..9c3f6c0 --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/domain/SubstationMaindeviceResume.java @@ -0,0 +1,120 @@ +package com.yfd.platform.modules.basedata.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author zhengsl + * @since 2025-06-05 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("iis_substation_maindevice_resume") +public class SubstationMaindeviceResume implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 类型：1:缺陷记录；2:大修记录；3:退出再投运记录 + */ + private String type; + + /** + * 时间 + */ + private String time; + + /** + * 描述 + */ + private String comment; + + /** + * 数据状态 + */ + private String datastatus; + + /** + * 修改人 + */ + private String lastmodifier; + + /** + * 最近修改时间 + */ + private LocalDateTime lastmodifydate; + + /** + * 备用1 + */ + private String custom1; + + /** + * 备用2 + */ + private String custom2; + + /** + * 备用3 + */ + private String custom3; + + /** + * 主设备id + */ + private String mainDeviceId; + + /** + * 主设备类型 + */ + private String deviceType; + + /** + * 主设备名称 + */ + private String mainDeviceName; + + /** + * 间隔id + */ + private String bayId; + + /** + * 间隔名称 + */ + private String bayName; + + /** + * 变电站编号 + */ + private String stationCode; + + /** + * 变电站名称 + */ + private String stationName; + + /** + * 区域id + */ + private String areaId; + + /** + * 区域名称 + */ + private String areaName; + + +} diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/SubstationMaindeviceResumeMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/SubstationMaindeviceResumeMapper.java new file mode 100644 index 0000000..1425660 --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/SubstationMaindeviceResumeMapper.java @@ -0,0 +1,23 @@ +package com.yfd.platform.modules.basedata.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.modules.basedata.domain.SubstationMaindeviceResume; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.Map; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhengsl + * @since 2025-06-05 + */ +public interface SubstationMaindeviceResumeMapper extends BaseMapper { + + Page> getMaindeviceResume(Page> page, String stationCode, String areaId, + String bayId, String deviceType, String mainDeviceName, + String startDate, String endDate); + +} diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationMaindeviceResumeService.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationMaindeviceResumeService.java new file mode 100644 index 0000000..72904f9 --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationMaindeviceResumeService.java @@ -0,0 +1,22 @@ +package com.yfd.platform.modules.basedata.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.modules.basedata.domain.SubstationMaindeviceResume; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author zhengsl + * @since 2025-06-05 + */ +public interface ISubstationMaindeviceResumeService extends IService { + + Page> getMaindeviceResume(Page> page, String stationCode, String areaId, + String bayId, String deviceType, String mainDeviceName, + String startDate, String endDate); +} diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationMaindeviceResumeServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationMaindeviceResumeServiceImpl.java new file mode 100644 index 0000000..13af111 --- /dev/null +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationMaindeviceResumeServiceImpl.java @@ -0,0 +1,30 @@ +package com.yfd.platform.modules.basedata.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.modules.basedata.domain.SubstationMaindeviceResume; +import com.yfd.platform.modules.basedata.mapper.SubstationMaindeviceResumeMapper; +import com.yfd.platform.modules.basedata.service.ISubstationMaindeviceResumeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhengsl + * @since 2025-06-05 + */ +@Service +public class SubstationMaindeviceResumeServiceImpl extends ServiceImpl implements ISubstationMaindeviceResumeService { + + @Resource + private SubstationMaindeviceResumeMapper maindeviceResumeMapper; + @Override + public Page> getMaindeviceResume(Page> page, String stationCode, String areaId, String bayId, String deviceType, String mainDeviceName, String startDate, String endDate) { + return maindeviceResumeMapper.getMaindeviceResume(page, stationCode, areaId, bayId,deviceType, mainDeviceName,startDate,endDate); + } +} diff --git a/riis-system/src/main/resources/mapper/basedata/SubstationMaindeviceResumeMapper.xml b/riis-system/src/main/resources/mapper/basedata/SubstationMaindeviceResumeMapper.xml new file mode 100644 index 0000000..6ae5253 --- /dev/null +++ b/riis-system/src/main/resources/mapper/basedata/SubstationMaindeviceResumeMapper.xml @@ -0,0 +1,33 @@ + + + + + +