bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpCollectorDto.java

@@ -85,4 +85,12 @@ public class JpCollectorDto  extends BaseDto {
 
  @ApiModelProperty(value = "类型")
  private String collectorType;
+
+ @ApiModelProperty(value = "信号强度")
+ private String signalStrength;
+
+
+ @ApiModelProperty(value = "所属项目公司")
+ private String companyName;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpCollector.java

@@ -123,4 +123,11 @@ public class JpCollector extends BaseEntity {
     @TableField("name")
     private String name;
 
+
+    /**
+     * 信号强度
+     */
+    @TableField("signal_strength")
+    private String signalStrength;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml

@@ -48,10 +48,13 @@
         hjc.update_time AS updateTime,
     hjc.type as collectorType,
         sta.name as name,
-        sta.type as type
+        sta.type as type,
+        hjc.signalStrength,
+        pc.COMPANY_NAME as companyName
     from
     hygf_jp_collector  hjc
     left join hygf_jp_station sta on sta.third_station_id = hjc.third_station_id
+        left join privilege_company pc on sta.regional_companies_code = pc.ORG_CODE
     <where>
         <if test="dto.snCode != null and dto.snCode != ''">
             hjc.sn_code = #{dto.snCode}
@@ -72,6 +75,7 @@
         from
         hygf_jp_collector  hjc
         left join hygf_jp_station sta on sta.third_station_id = hjc.third_station_id
+        left join privilege_company pc on sta.regional_companies_code = pc.ORG_CODE
         <where>
             <if test="dto.snCode != null and dto.snCode != ''">
                 hjc.sn_code = #{dto.snCode}