diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java index ea4cd6c..786e25e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java @@ -36,7 +36,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java index ea4cd6c..786e25e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java @@ -36,7 +36,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java index 1f0a29c..758a0ff 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java @@ -38,7 +38,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java index ea4cd6c..786e25e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java @@ -36,7 +36,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java index 1f0a29c..758a0ff 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java @@ -38,7 +38,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java index 8d5a16c..eca20e6 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java @@ -5,6 +5,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -28,6 +30,8 @@ boolean termitePictureDataupSync(DeviceInfoPictureSyncRequest request); + JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request); + List querytermiteData(TermiteInfoQueryRequest request); boolean updateMonitorData(TermiteInfoUpdateyRequest request); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java index ea4cd6c..786e25e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java @@ -36,7 +36,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java index 1f0a29c..758a0ff 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java @@ -38,7 +38,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java index 8d5a16c..eca20e6 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java @@ -5,6 +5,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -28,6 +30,8 @@ boolean termitePictureDataupSync(DeviceInfoPictureSyncRequest request); + JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request); + List querytermiteData(TermiteInfoQueryRequest request); boolean updateMonitorData(TermiteInfoUpdateyRequest request); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index ea5b660..acdcb35 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -31,6 +31,7 @@ import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; import com.newfiber.termite.domain.jingchu.JingChuUpload; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.jingchu.JingchuDeviceConfig; import com.newfiber.termite.domain.jingchu.JingchuProjectConfig; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; @@ -40,6 +41,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.request.deviceMonitoringData.DeviceMonitoringDataQueryRequest; import com.newfiber.termite.domain.request.deviceMonitoringSyncRecord.DeviceMonitoringSyncRecordSaveRequest; import com.newfiber.termite.domain.response.DataUpResponse; @@ -264,7 +266,7 @@ return url; } - private void jingChuUpload(DeviceMonitoringData existedDeviceMonitoringData, String yesnoant) { + public void jingChuUpload(DeviceMonitoringData existedDeviceMonitoringData, String yesnoant) { JingchuDeviceConfig jingchuDeviceConfig = jingchuDeviceConfigService.selectDetail(existedDeviceMonitoringData.getSn()); JingchuProjectConfig jingchuProjectConfig = jingchuProjectConfigService.selectDetail(existedDeviceMonitoringData.getProjectCode()); if(null != jingchuDeviceConfig && null != jingchuProjectConfig){ @@ -293,7 +295,7 @@ header("Authorization", jingchuResourceConfig.getToken()).execute(); jingchuUploadRecordService.insert(jingchuProjectConfig.getProjectCode(), jingchuDeviceConfig.getSn(), jingchuDeviceConfig.getOrder(), JSONObject.toJSONString(jingChuUpload), httpResponse.body()); - log.info("同步荆楚监测数据.请求:{}，响应:{}", JSONObject.toJSONString(jingChuUpload), httpResponse.body()); +// log.info("同步荆楚监测数据.请求:{}，响应:{}", JSONObject.toJSONString(jingChuUpload), httpResponse.body()); } } @@ -362,6 +364,36 @@ } @Override + public JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + Date date = new Date(); + DeviceInfo deviceInfo = deviceInfoService.selectDetail(request.getSn()); + if(null == deviceInfo){ + return null; + } + + JingchuDeviceConfig jingchuDeviceConfig = jingchuDeviceConfigService.selectDetail(request.getSn()); + if(null == jingchuDeviceConfig){ + return null; + } + + JingchuProjectConfig jingchuProjectConfig = jingchuProjectConfigService.selectDetail(deviceInfo.getProjectCode()); + if(null == jingchuProjectConfig){ + return null; + } + + JingChuUploadInfo jingChuUploadInfo = new JingChuUploadInfo(); + jingChuUploadInfo.setDeviceId(jingchuProjectConfig.getDeviceId()); + jingChuUploadInfo.setDeviceName(jingchuProjectConfig.getDeviceName()); + jingChuUploadInfo.setMnNo(jingchuProjectConfig.getMnNo()); + jingChuUploadInfo.setOrder(jingchuDeviceConfig.getOrder()); + jingChuUploadInfo.setStationId(jingchuProjectConfig.getStationId()); + jingChuUploadInfo.setStationName(jingchuProjectConfig.getStationName()); + jingChuUploadInfo.setObDate(DateUtil.formatDateTime(date).replace(" ", "T")); + jingChuUploadInfo.setObTime(DateUtil.format(date, "yyMMddHHmm")); + return jingChuUploadInfo; + } + + @Override public List querytermiteData(TermiteInfoQueryRequest request){ return termiteMapper.querytermiteData(request); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java index ea4cd6c..786e25e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java @@ -36,7 +36,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java index 1f0a29c..758a0ff 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java @@ -38,7 +38,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java index 8d5a16c..eca20e6 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java @@ -5,6 +5,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -28,6 +30,8 @@ boolean termitePictureDataupSync(DeviceInfoPictureSyncRequest request); + JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request); + List querytermiteData(TermiteInfoQueryRequest request); boolean updateMonitorData(TermiteInfoUpdateyRequest request); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index ea5b660..acdcb35 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -31,6 +31,7 @@ import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; import com.newfiber.termite.domain.jingchu.JingChuUpload; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.jingchu.JingchuDeviceConfig; import com.newfiber.termite.domain.jingchu.JingchuProjectConfig; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; @@ -40,6 +41,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.request.deviceMonitoringData.DeviceMonitoringDataQueryRequest; import com.newfiber.termite.domain.request.deviceMonitoringSyncRecord.DeviceMonitoringSyncRecordSaveRequest; import com.newfiber.termite.domain.response.DataUpResponse; @@ -264,7 +266,7 @@ return url; } - private void jingChuUpload(DeviceMonitoringData existedDeviceMonitoringData, String yesnoant) { + public void jingChuUpload(DeviceMonitoringData existedDeviceMonitoringData, String yesnoant) { JingchuDeviceConfig jingchuDeviceConfig = jingchuDeviceConfigService.selectDetail(existedDeviceMonitoringData.getSn()); JingchuProjectConfig jingchuProjectConfig = jingchuProjectConfigService.selectDetail(existedDeviceMonitoringData.getProjectCode()); if(null != jingchuDeviceConfig && null != jingchuProjectConfig){ @@ -293,7 +295,7 @@ header("Authorization", jingchuResourceConfig.getToken()).execute(); jingchuUploadRecordService.insert(jingchuProjectConfig.getProjectCode(), jingchuDeviceConfig.getSn(), jingchuDeviceConfig.getOrder(), JSONObject.toJSONString(jingChuUpload), httpResponse.body()); - log.info("同步荆楚监测数据.请求:{}，响应:{}", JSONObject.toJSONString(jingChuUpload), httpResponse.body()); +// log.info("同步荆楚监测数据.请求:{}，响应:{}", JSONObject.toJSONString(jingChuUpload), httpResponse.body()); } } @@ -362,6 +364,36 @@ } @Override + public JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + Date date = new Date(); + DeviceInfo deviceInfo = deviceInfoService.selectDetail(request.getSn()); + if(null == deviceInfo){ + return null; + } + + JingchuDeviceConfig jingchuDeviceConfig = jingchuDeviceConfigService.selectDetail(request.getSn()); + if(null == jingchuDeviceConfig){ + return null; + } + + JingchuProjectConfig jingchuProjectConfig = jingchuProjectConfigService.selectDetail(deviceInfo.getProjectCode()); + if(null == jingchuProjectConfig){ + return null; + } + + JingChuUploadInfo jingChuUploadInfo = new JingChuUploadInfo(); + jingChuUploadInfo.setDeviceId(jingchuProjectConfig.getDeviceId()); + jingChuUploadInfo.setDeviceName(jingchuProjectConfig.getDeviceName()); + jingChuUploadInfo.setMnNo(jingchuProjectConfig.getMnNo()); + jingChuUploadInfo.setOrder(jingchuDeviceConfig.getOrder()); + jingChuUploadInfo.setStationId(jingchuProjectConfig.getStationId()); + jingChuUploadInfo.setStationName(jingchuProjectConfig.getStationName()); + jingChuUploadInfo.setObDate(DateUtil.formatDateTime(date).replace(" ", "T")); + jingChuUploadInfo.setObTime(DateUtil.format(date, "yyMMddHHmm")); + return jingChuUploadInfo; + } + + @Override public List querytermiteData(TermiteInfoQueryRequest request){ return termiteMapper.querytermiteData(request); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java index 3dcda16..2666797 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java @@ -40,7 +40,7 @@ JingchuUploadRecord jingchuUploadRecord = new JingchuUploadRecord(); jingchuUploadRecord.setProjectCode(projectCode); jingchuUploadRecord.setSn(sn); - jingchuUploadRecord.setOrder(order); + jingchuUploadRecord.setSnOrder(order); jingchuUploadRecord.setRequest(request); jingchuUploadRecord.setResponse(response); save(jingchuUploadRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java index 77ad03c..2e61d28 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/TermiteController.java @@ -12,6 +12,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -20,6 +21,7 @@ import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoQueryRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -93,6 +95,14 @@ } /** + */ + @PostMapping("/shuikeyuanUploadInfo") + @ApiOperation(value = "获取水科院设备编号信息", position = 60) + public Result shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + return success(termiteService.shuikeyuanUploadInfo(request)); + } + + /** * 分页查询数据 */ @PostMapping("/querytermiteData") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java new file mode 100644 index 0000000..23b7258 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingChuUploadInfo.java @@ -0,0 +1,66 @@ +package com.newfiber.termite.domain.jingchu; + +import lombok.Data; + +@Data +public class JingChuUploadInfo { + + /** + * 设备id + */ + private int deviceId; + + /** + *设备名称 + */ + private String deviceName; + + /** + *设备编码（RTU编号） + */ + private String mnNo; + + /** + * 白蚁设备安装的点位顺序（自定义6位数） + */ + private String order; + + /** + * 中心站地址 + */ + private int stationId; + + /** + *站点名称 + */ + private String stationName; + + /** + * 观测时间2 + * DateUtil.formatDateTime(new Date()) + */ + private String obDate; + + /** + * 观测时间 + * DateUtil.format(new Date(), "yyMMddHHmm") + */ + private String obTime; + +} + +// [ +// { +// "deviceId": 60701, +// "deviceName": "测试设备060701", +// "electricity": 90, +// "mnNo": "60701", +// "obDate": "2024-06-07", +// "obTime": "06:00:00", +// "order": "1", +// "receiveType": 0, +// "stationId": 607, +// "stationName": "测试设备060701", +// "status": 0 +// } +// ] \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java index cf2a1d3..197b242 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/jingchu/JingchuUploadRecord.java @@ -37,7 +37,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java new file mode 100644 index 0000000..9b97098 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/deviceInfo/ShuikeyuanUploadInfoRequest.java @@ -0,0 +1,24 @@ +package com.newfiber.termite.domain.request.deviceInfo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Data; + +/** + *@Description: 白蚁防治图片上传结果同步入参 + *@author chenqian + *@date 2024/11/13 16:17 + */ +@Data +@JsonSerialize +public class ShuikeyuanUploadInfoRequest { + + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", required = true) + @NotBlank(message = "设备编号不能为空") + private String sn; +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java index f95fec4..e011373 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordQueryRequest.java @@ -31,7 +31,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java index ea4cd6c..786e25e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordSaveRequest.java @@ -36,7 +36,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java index 1f0a29c..758a0ff 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/jingchuUploadRecord/JingchuUploadRecordUpdateRequest.java @@ -38,7 +38,7 @@ * 白蚁设备安装的点位顺序（自定义6位数） */ @ApiModelProperty(value = "白蚁设备安装的点位顺序（自定义6位数）") - private String order; + private String snOrder; /** * 发送请求 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java index 8d5a16c..eca20e6 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/ITermiteService.java @@ -5,6 +5,7 @@ import com.newfiber.termite.domain.dto.SnAlarmStatisticDto; import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; import com.newfiber.termite.domain.request.TermiteHistoryQueryRequest; import com.newfiber.termite.domain.request.TermiteInfoQueryRequest; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.DeviceInfoStateSyncResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; @@ -28,6 +30,8 @@ boolean termitePictureDataupSync(DeviceInfoPictureSyncRequest request); + JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request); + List querytermiteData(TermiteInfoQueryRequest request); boolean updateMonitorData(TermiteInfoUpdateyRequest request); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index ea5b660..acdcb35 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -31,6 +31,7 @@ import com.newfiber.termite.domain.dto.TermiteDataUpRequest; import com.newfiber.termite.domain.dto.UnitInfoDto; import com.newfiber.termite.domain.jingchu.JingChuUpload; +import com.newfiber.termite.domain.jingchu.JingChuUploadInfo; import com.newfiber.termite.domain.jingchu.JingchuDeviceConfig; import com.newfiber.termite.domain.jingchu.JingchuProjectConfig; import com.newfiber.termite.domain.request.DeviceInfoUpdateRequest; @@ -40,6 +41,7 @@ import com.newfiber.termite.domain.request.TermiteInfoUpdateyRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoPictureSyncRequest; import com.newfiber.termite.domain.request.deviceInfo.DeviceInfoStateSyncRequest; +import com.newfiber.termite.domain.request.deviceInfo.ShuikeyuanUploadInfoRequest; import com.newfiber.termite.domain.request.deviceMonitoringData.DeviceMonitoringDataQueryRequest; import com.newfiber.termite.domain.request.deviceMonitoringSyncRecord.DeviceMonitoringSyncRecordSaveRequest; import com.newfiber.termite.domain.response.DataUpResponse; @@ -264,7 +266,7 @@ return url; } - private void jingChuUpload(DeviceMonitoringData existedDeviceMonitoringData, String yesnoant) { + public void jingChuUpload(DeviceMonitoringData existedDeviceMonitoringData, String yesnoant) { JingchuDeviceConfig jingchuDeviceConfig = jingchuDeviceConfigService.selectDetail(existedDeviceMonitoringData.getSn()); JingchuProjectConfig jingchuProjectConfig = jingchuProjectConfigService.selectDetail(existedDeviceMonitoringData.getProjectCode()); if(null != jingchuDeviceConfig && null != jingchuProjectConfig){ @@ -293,7 +295,7 @@ header("Authorization", jingchuResourceConfig.getToken()).execute(); jingchuUploadRecordService.insert(jingchuProjectConfig.getProjectCode(), jingchuDeviceConfig.getSn(), jingchuDeviceConfig.getOrder(), JSONObject.toJSONString(jingChuUpload), httpResponse.body()); - log.info("同步荆楚监测数据.请求:{}，响应:{}", JSONObject.toJSONString(jingChuUpload), httpResponse.body()); +// log.info("同步荆楚监测数据.请求:{}，响应:{}", JSONObject.toJSONString(jingChuUpload), httpResponse.body()); } } @@ -362,6 +364,36 @@ } @Override + public JingChuUploadInfo shuikeyuanUploadInfo(ShuikeyuanUploadInfoRequest request) { + Date date = new Date(); + DeviceInfo deviceInfo = deviceInfoService.selectDetail(request.getSn()); + if(null == deviceInfo){ + return null; + } + + JingchuDeviceConfig jingchuDeviceConfig = jingchuDeviceConfigService.selectDetail(request.getSn()); + if(null == jingchuDeviceConfig){ + return null; + } + + JingchuProjectConfig jingchuProjectConfig = jingchuProjectConfigService.selectDetail(deviceInfo.getProjectCode()); + if(null == jingchuProjectConfig){ + return null; + } + + JingChuUploadInfo jingChuUploadInfo = new JingChuUploadInfo(); + jingChuUploadInfo.setDeviceId(jingchuProjectConfig.getDeviceId()); + jingChuUploadInfo.setDeviceName(jingchuProjectConfig.getDeviceName()); + jingChuUploadInfo.setMnNo(jingchuProjectConfig.getMnNo()); + jingChuUploadInfo.setOrder(jingchuDeviceConfig.getOrder()); + jingChuUploadInfo.setStationId(jingchuProjectConfig.getStationId()); + jingChuUploadInfo.setStationName(jingchuProjectConfig.getStationName()); + jingChuUploadInfo.setObDate(DateUtil.formatDateTime(date).replace(" ", "T")); + jingChuUploadInfo.setObTime(DateUtil.format(date, "yyMMddHHmm")); + return jingChuUploadInfo; + } + + @Override public List querytermiteData(TermiteInfoQueryRequest request){ return termiteMapper.querytermiteData(request); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java index 3dcda16..2666797 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/jingchu/JingchuUploadRecordServiceImpl.java @@ -40,7 +40,7 @@ JingchuUploadRecord jingchuUploadRecord = new JingchuUploadRecord(); jingchuUploadRecord.setProjectCode(projectCode); jingchuUploadRecord.setSn(sn); - jingchuUploadRecord.setOrder(order); + jingchuUploadRecord.setSnOrder(order); jingchuUploadRecord.setRequest(request); jingchuUploadRecord.setResponse(response); save(jingchuUploadRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/JingchuUploadRecordMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/JingchuUploadRecordMapper.xml index 6f0b8e7..3269530 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/JingchuUploadRecordMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/JingchuUploadRecordMapper.xml @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@ t.id , t.project_code , t.sn - , t.order + , t.sn_order , t.request , t.response , t.remark @@ -45,8 +45,8 @@ and t.sn = #{request.sn} - - and t.order = #{request.order} + + and t.sn_order = #{request.snOrder}