diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java index 3636992..308624f 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java @@ -123,7 +123,7 @@ public class TerminalController extends BaseController { @ApiOperation(value = "获取装置触发", notes = "获取装置信息接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getTerminalStatus") - @Log(title = "获取装置触发", type = "修改") + @Log(title = "获取装置触发", type = "查询") public ResponseReult getTerminalStatus(@RequestParam("termId") Integer termId) { ServiceBody serviceBody = terminalService.getTerminalStatus(termId); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { @@ -137,8 +137,8 @@ public class TerminalController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLastedTerminalStatus") @Log(title = "获取最新装置运行状态", type = "修改") - public ResponseReult getLastedTerminalStatus(@RequestBody @Validated TerminalStatusVo vo) { - ServiceBody serviceBody = terminalService.getLastedTerminalStatus(vo); + public ResponseReult getLastedTerminalStatus(@RequestBody @Validated TerminalStatusVo vo) { + ServiceBody serviceBody = terminalService.getLastedTerminalStatus(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -211,5 +211,17 @@ public class TerminalController extends BaseController { } } + @ApiOperation(value = "获取装置数据库信息", notes = "获取装置数据库信息", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getLastTermInfo") + @Log(title = "获取装置数据库信息", type = "查询") + public ResponseReult getLastTermInfo(@RequestParam("termId") @Validated Integer termId) { + ServiceBody serviceBody = terminalService.getLastTermInfo(termId); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java index cadd940..8950bcd 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -70,4 +71,17 @@ public class TerminalGPSController extends BaseController { } } + @ApiOperation(value = "获取数据库GPS位置数据", notes = "获取数据库GPS位置数据", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getTermLastGPSPosition") + @Log(title = "获取数据库GPS位置数据", type = "查询") + public ResponseReult getTermLastGPSPosition(@RequestParam("termId") @Validated Integer termId) { + ServiceBody serviceBody = terminalGpsService.getTermLastGPSPosition(termId); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java index fba674f..09e97c3 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java @@ -12,7 +12,11 @@ public class TerminalStatus implements Serializable { private BigInteger lastHeartbeat; - private Short lastFrameNo; + private String lastHeartbeatIp; + + private Integer lastHeartbeatPort; + + private Integer lastFrameNo; private Float batteryVoltage; @@ -30,6 +34,10 @@ public class TerminalStatus implements Serializable { private Integer connectionState; + private BigInteger sendFlow; + + private BigInteger recvFlow; + private Integer signalStrength4g; private Integer signalStrength2g; @@ -38,6 +46,8 @@ public class TerminalStatus implements Serializable { private Integer remainingRom; + private BigInteger wsUpdateTime; + private BigInteger bootTime; private BigInteger updateTime; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalStatusInfoModel.java similarity index 77% rename from xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java rename to xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalStatusInfoModel.java index 8fd1fd1..9fef198 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalStatusInfoModel.java @@ -1,36 +1,33 @@ package com.shxy.xymanager_common.model; -import cn.hutool.core.date.DateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigInteger; -import java.util.Date; -import java.util.List; /** - * 设备信息列表 + * 设备状态信息列表 */ @Data -@ApiModel(value = "获取设备状态信息", description = "获取设备状态信息") -public class TerminalModel implements Serializable { +@ApiModel(value = "设备状态的信息", description = "设备状态的信息") +public class TerminalStatusInfoModel implements Serializable { @ApiModelProperty(value = "装置编号", example = "123456") private Integer termId; @ApiModelProperty(value = "电池电量", example = "123456") - private Integer batteryCapacity; + private Float batteryCapacity; @ApiModelProperty(value = "电池电压", example = "123456") - private Integer batteryVoltage; + private Float batteryVoltage; @ApiModelProperty(value = "本次连续工作时间（小时）", example = "12345678") private Integer workingTime; @ApiModelProperty(value = "浮充状态：充电 放电", example = "12345678") - private Integer floatingCharge; + private Byte floatingCharge; @ApiModelProperty(value = "工作总时间（小时）", example = "名称名称") private Integer totalWorkingTime; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java index 37a6f6b..e7a36c5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java @@ -1,6 +1,5 @@ package com.shxy.xymanager_common.vo; -import cn.hutool.core.date.DateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import javax.validation.constraints.NotNull; public class ReturnedPhotoParamsGetVo { @NotNull(message = "不能传入空值") @ApiModelProperty(value = "监测装置id", required = true, example = "A0001") - private String cmdId; + private Integer termId; @ApiModelProperty(value = "通道ID", required = true, example = "A0001") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java index 5e758fb..a6b080e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java @@ -18,11 +18,11 @@ public class TerminalChannelVo { @Data public static class ChannelItem { @NotNull(message = "通道编号") - @ApiModelProperty(value = "装置编号", example = "123455") + @ApiModelProperty(value = "通道编号", example = "123455") private Integer id; - @NotNull(message = "通道编号不能缺少") - @ApiModelProperty(value = "通道编号", example = "123455") + @NotNull(message = "通道名称不能缺少") + @ApiModelProperty(value = "通道名称", example = "123455") private String channelname; @ApiModelProperty(value = "分辨率W", example = "123456") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java index d1e321c..e57e4b2 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java @@ -1,6 +1,5 @@ package com.shxy.xymanager_common.vo; -import cn.hutool.core.date.DateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPositionsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPositionsDao.java index bbafa04..eaa75a8 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPositionsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPositionsDao.java @@ -6,6 +6,4 @@ import java.math.BigInteger; public interface TerminalPositionsDao { TerminalPositions selectByPrimaryKey(Integer termId); - - BigInteger getUpdateTime(Integer termId); } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java index e01d4da..3aceb1b 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_dao.dao; +import com.shxy.xymanager_common.dto.TerminalInfoDto; import com.shxy.xymanager_common.dto.TerminalsWithHeart; import com.shxy.xymanager_common.entity.TerminalStatus; import org.apache.ibatis.annotations.Param; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index 3be382d..8078b38 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -42,8 +42,6 @@ public interface TerminalsDao { String getCmdIdByTermId(Integer termId); - TerminalInfoDto getTerminalInfo(@Param("termId") Integer termId); - BigInteger getUpdateTime(@Param("termId") Integer termId); int updateCmd(TerminalIdUpdateVo vo); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPositionsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPositionsDao.xml index a30a219..e6f8442 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPositionsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPositionsDao.xml @@ -19,10 +19,4 @@ where term_id = #{termId,jdbcType=INTEGER} - \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml index f8c39f4..7dc4477 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml @@ -4,6 +4,8 @@ + + @@ -11,14 +13,17 @@ - + + + + @@ -31,9 +36,9 @@ - term_id, last_heartbeat, last_frame_no, battery_voltage, op_temperature, battery_capacity, - floating_charge, total_working_time, working_time, gps_status,connection_state, signal_strength_4g, - signal_strength_2g, remaining_ram, remaining_rom, boot_time, rs_update_time + term_id, last_heartbeat,last_heartbeat_ip,last_heartbeat_port, last_frame_no, battery_voltage, op_temperature, battery_capacity, + floating_charge, total_working_time, working_time,connection_state, signal_strength_4g, + signal_strength_2g,send_flow, recv_flow,ws_update_time,remaining_ram, remaining_rom, boot_time, rs_update_time, gps_status + + delete from terminal_status where term_id = #{termId,jdbcType=INTEGER} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index af20d2b..8c63baa 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -165,7 +165,7 @@ - order by a.create_time desc + order by d.create_time desc - select - ts.term_id termId, ts.battery_voltage batteryVoltage, ts.battery_capacity batteryCapacity, ts.floating_charge floatingCharge, ts.total_working_time totalWorkingTime, - ts.working_time workingTime, ts.connection_state connectionState, ts.ws_update_time wsUpdateTime,t.cmdid cmId - from terminal_status ts left join terminals t on ts.term_id = t.id - where ts.term_id = #{termId,jdbcType=INTEGER} - -