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 27ab9cd..20f1337 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 @@ -141,6 +141,7 @@ util.exportExcel(response, result.getData(), request.getSn()+"历史站点"); } + /** * 新增站点 */ 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 27ab9cd..20f1337 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 @@ -141,6 +141,7 @@ util.exportExcel(response, result.getData(), request.getSn()+"历史站点"); } + /** * 新增站点 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index 22323a3..dae9f59 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -6,6 +6,11 @@ @Data public class TermiteInfoQueryRequest { + + /** + * 用户名id + */ + private Long userId; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") 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 27ab9cd..20f1337 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 @@ -141,6 +141,7 @@ util.exportExcel(response, result.getData(), request.getSn()+"历史站点"); } + /** * 新增站点 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index 22323a3..dae9f59 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -6,6 +6,11 @@ @Data public class TermiteInfoQueryRequest { + + /** + * 用户名id + */ + private Long userId; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java index 640df90..b24ef60 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java @@ -12,6 +12,11 @@ @Data public class TermiteInfoResponse { + /** + * 用户名id + */ + private Long userId; + @ApiModelProperty(value = "数据id") private Long id; @ApiModelProperty(value = "数据id") @@ -76,4 +81,4 @@ @ApiModelProperty(value = "首次报警时间（连续3次手动确认则报警）") private Date firstWarnDatetime; -} +} \ 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 27ab9cd..20f1337 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 @@ -141,6 +141,7 @@ util.exportExcel(response, result.getData(), request.getSn()+"历史站点"); } + /** * 新增站点 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index 22323a3..dae9f59 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -6,6 +6,11 @@ @Data public class TermiteInfoQueryRequest { + + /** + * 用户名id + */ + private Long userId; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java index 640df90..b24ef60 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/TermiteInfoResponse.java @@ -12,6 +12,11 @@ @Data public class TermiteInfoResponse { + /** + * 用户名id + */ + private Long userId; + @ApiModelProperty(value = "数据id") private Long id; @ApiModelProperty(value = "数据id") @@ -76,4 +81,4 @@ @ApiModelProperty(value = "首次报警时间（连续3次手动确认则报警）") private Date firstWarnDatetime; -} +} \ No newline at end of file diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml index a250f9a..4810fb4 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml @@ -23,16 +23,17 @@ tb.heating_datetime, tb.uptime, ta.status, + pu.user_id AS userId, case when TIMESTAMPDIFF(minute, uptime, now()) > 1440 then 0 else 1 end as onlineStatus, ta.project_code as projectCode, - th.project_name as projectName, + pu.project_name as projectName, ta.first_warn_datetime as firstWarnDatetime, ta.create_time as createTime FROM `ter_device_info` ta - left join ter_project_info th on ta.project_code =th.project_code + JOIN ter_project_user pu ON ta.project_code = pu.project_code LEFT JOIN ter_device_monitoring_data_realtime tb ON ta.sn = tb.sn - where 1=1 and ta.del_flag = 0 + where 1=1 and ta.del_flag = 0 and pu.user_id = #{request.userId} and ta.sn like concat('%',#{request.sn},'%') @@ -52,13 +53,13 @@ and tb.druing =#{request.druing} - and th.project_code =#{request.projectCode} + and pu.project_code =#{request.projectCode} and ta.category =#{request.category} - and th.project_code in + and pu.project_code in #{projectCode}