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 dae9f59..abef49b 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 @@ -10,7 +10,10 @@ /** * 用户名id */ + @ApiModelProperty(value = "用户名ID") private Long userId; + @ApiModelProperty(value = "项目名称") + private String projectName; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") 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 dae9f59..abef49b 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 @@ -10,7 +10,10 @@ /** * 用户名id */ + @ApiModelProperty(value = "用户名ID") private Long userId; + @ApiModelProperty(value = "项目名称") + private String projectName; @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 b24ef60..4acdf82 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 @@ -68,7 +68,7 @@ @ApiModelProperty(value = "项目编码") private String projectCode; - @ApiModelProperty(value = "项目编码") + @ApiModelProperty(value = "项目名称") private String projectName; /** 创建时间 */ 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 dae9f59..abef49b 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 @@ -10,7 +10,10 @@ /** * 用户名id */ + @ApiModelProperty(value = "用户名ID") private Long userId; + @ApiModelProperty(value = "项目名称") + private String projectName; @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 b24ef60..4acdf82 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 @@ -68,7 +68,7 @@ @ApiModelProperty(value = "项目编码") private String projectCode; - @ApiModelProperty(value = "项目编码") + @ApiModelProperty(value = "项目名称") private String projectName; /** 创建时间 */ 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 4810fb4..a2f2780 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 @@ -33,7 +33,7 @@ `ter_device_info` ta 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 and pu.user_id = #{request.userId} + where 1=1 and ta.del_flag = 0 and pu.user_id = #{request.userId} and pu.project_name like concat('%', #{request.projectName}, '%') and ta.sn like concat('%',#{request.sn},'%')