src/main/java/com/whyc/pojo/DeviceState.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/MotorSystemInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DeviceService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DeviceStateService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MotorSystemInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/pojo/DeviceState.java
@@ -26,6 +26,7 @@ @ApiModelProperty("通讯状态:0-通讯故障,1-通讯正常") private Integer commStatus; private String note; private Integer position; //设备的固定标识 public Long getNum() { return num; @@ -66,4 +67,12 @@ public void setNote(String note) { this.note = note; } public Integer getPosition() { return position; } public void setPosition(Integer position) { this.position = position; } } src/main/java/com/whyc/pojo/MotorSystemInf.java
@@ -32,7 +32,6 @@ private String devName; //设备名称 private String devIp; //设备ip private String note; //备用 private Integer position; //设备的固定标识 public Long getNum() { return num; @@ -90,11 +89,4 @@ this.note = note; } public Integer getPosition() { return position; } public void setPosition(Integer position) { this.position = position; } } src/main/java/com/whyc/service/DeviceService.java
New file @@ -0,0 +1,46 @@ package com.whyc.service; import com.whyc.dto.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class DeviceService { @Autowired private AFECtrlService afeCtrlService; @Autowired private AFEInverterService afeInverterService; @Autowired private AFERectifierService afeRectifierService; @Autowired private CentralMonitorSysCtrlService centralMonitorSysCtrlService; @Autowired private CentralMonitorSysRTService centralMonitorSysRTService; @Autowired private CentralMonitorSysSTService centralMonitorSysSTService; @Autowired private DeviceStateService deviceStateService; @Autowired private MotorSystemInfService motorSystemInfService; @Autowired private OilCommService oilCommService; @Autowired private RectifierPowerCtrlService rectifierPowerCtrlService; @Autowired private RectifierPowerService rectifierPowerService; @Autowired private UPSCommService upsCommService; @Autowired private WaterCommService waterCommService; //TODO public Response getAllRT(){ return null; } } src/main/java/com/whyc/service/DeviceStateService.java
@@ -1,5 +1,7 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.dto.Response; import com.whyc.mapper.DeviceStateMapper; import com.whyc.pojo.DeviceState; @@ -20,7 +22,9 @@ } public Response<List<DeviceState>> getAllStatus() { List<DeviceState> deviceStates = mapper.selectList(null); QueryWrapper<DeviceState> wrapper = Wrappers.query(); wrapper.orderByAsc("position"); List<DeviceState> deviceStates = mapper.selectList(wrapper); return new Response<List<DeviceState>>().set(1,deviceStates); } } src/main/java/com/whyc/service/MotorSystemInfService.java
@@ -21,9 +21,7 @@ public Response getAll() { try { QueryWrapper<MotorSystemInf> wrapper = Wrappers.query(); wrapper.orderByAsc("position"); List<MotorSystemInf> motorSystemInfs = mapper.selectList(wrapper); List<MotorSystemInf> motorSystemInfs = mapper.selectList(null); return new Response<>().set(1,motorSystemInfs); }catch (Exception e){ e.printStackTrace();