Browse Source

设备详情

lin 3 years ago
parent
commit
3e6a8e013c

+ 3 - 0
zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/DeviceDetailVo.java

@@ -57,6 +57,9 @@ public class DeviceDetailVo extends DeviceVo{
     @ApiModelProperty(value = "区名称")
     private String regionName;
 
+    @ApiModelProperty(value="分类名称")
+    private Integer categoryName;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="创建时间")
     private LocalDateTime createDate;

+ 2 - 0
zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -459,6 +459,7 @@
       sa1.name as province_name,
       sa2.name as city_name,
       sa3.name as region_name,
+      rpc.name as category_name,
       (to_days(now()) - to_days(rd.offline_date)) as offline_days
     from rmcp_device rd
     left join rmcp_product rp on (rp.id = rd.product_id)
@@ -469,6 +470,7 @@
     left join rmcp_area sa1 on sa1.id = rc.province
     left join rmcp_area sa2 on sa2.id = rc.city
     left join rmcp_area sa3 on sa3.id = rc.region
+    left join rmcp_product_category rpc on rpc.id = rd.category_id
     where rd.status = 1 and rd.id = #{id}
   </select>