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 4acdf82..1a82271 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 @@ -5,18 +5,11 @@ import com.newfiber.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; - -import io.swagger.annotations.ApiOperation; import lombok.Data; @Data public class TermiteInfoResponse { - /** - * 用户名id - */ - private Long userId; - @ApiModelProperty(value = "数据id") private Long id; @ApiModelProperty(value = "数据id") 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 4acdf82..1a82271 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 @@ -5,18 +5,11 @@ import com.newfiber.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; - -import io.swagger.annotations.ApiOperation; import lombok.Data; @Data public class TermiteInfoResponse { - /** - * 用户名id - */ - private Long userId; - @ApiModelProperty(value = "数据id") private Long id; @ApiModelProperty(value = "数据id") 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 d5e402d..b558f68 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,19 +23,19 @@ 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, - pu.project_name as projectName, + th.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 LEFT JOIN ter_device_monitoring_data_realtime tb ON ta.sn = tb.sn where 1=1 and ta.del_flag = 0 - and pu.project_name like concat('%',#{request.projectName},'%') + and th.project_name like concat('%',#{request.projectName},'%') and ta.sn like concat('%',#{request.sn},'%') @@ -56,13 +56,13 @@ and tb.druing =#{request.druing} - and pu.project_code =#{request.projectCode} + and ta.project_code =#{request.projectCode} and ta.category =#{request.category} - and pu.project_code in + and th.project_code in #{projectCode}