diff --git a/busi-back/busi-back-common/src/main/java/com/huatek/busi/common/BusiConstant.java b/busi-back/busi-back-common/src/main/java/com/huatek/busi/common/BusiConstant.java index 8be7aa1..6f30034 100644 --- a/busi-back/busi-back-common/src/main/java/com/huatek/busi/common/BusiConstant.java +++ b/busi-back/busi-back-common/src/main/java/com/huatek/busi/common/BusiConstant.java @@ -255,9 +255,21 @@ public final class BusiConstant { C_O("6", "C相出线"), - IN_SIDE("7", "柜内"), + A_S("7" , "位置1"), - OUT_SIDE("8", "柜外测温点"); + B_S("8" , "位置2"), + + C_S("9" , "位置3"), + + A_X("10" , "位置4"), + + B_X("11" , "位置5"), + + C_X("12" , "位置6"), + + IN_SIDE("13", "柜内"), + + OUT_SIDE("14", "柜外测温点"); private final String value; private final String name; diff --git a/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemper.java b/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemper.java index ce8eda9..e94a4fa 100644 --- a/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemper.java +++ b/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemper.java @@ -120,6 +120,45 @@ public class RptTemper extends Pojo implements Serializable { */ @FieldName("c_o_sensor_id") private String cOSensorId; + + + @FieldName("a_s_temper") + private BigDecimal aSTemper; + + @FieldName("a_s_sensor_id") + private String aSSensorId; + + @FieldName("b_s_temper") + private BigDecimal bSTemper; + + @FieldName("b_s_sensor_id") + private String bSSensorId; + + @FieldName("c_s_temper") + private BigDecimal cSTemper; + + @FieldName("c_s_sensor_id") + private String cSSensorId; + + @FieldName("a_x_temper") + private BigDecimal aXTemper; + + @FieldName("a_x_sensor_id") + private String aXSensorId; + + @FieldName("b_x_temper") + private BigDecimal bXTemper; + + @FieldName("b_x_sensor_id") + private String bXSensorId; + + @FieldName("c_x_temper") + private BigDecimal cXTemper; + + @FieldName("c_x_sensor_id") + private String cXSensorId; + + /** * 创建时间 */ diff --git a/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemperCharts.java b/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemperCharts.java index 1a3ad20..2a559b0 100644 --- a/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemperCharts.java +++ b/busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/RptTemperCharts.java @@ -147,6 +147,42 @@ public class RptTemperCharts extends Pojo implements Serializable { @FieldName("co_sensor_id") private String coSensorId; + @FieldName("as_temper") + private BigDecimal asTemper; + + @FieldName("as_sensor_id") + private String asSensorId; + + @FieldName("bs_temper") + private BigDecimal bsTemper; + + @FieldName("bs_sensor_id") + private String bsSensorId; + + @FieldName("cs_temper") + private BigDecimal csTemper; + + @FieldName("cs_sensor_id") + private String csSensorId; + + @FieldName("ax_temper") + private BigDecimal axTemper; + + @FieldName("ax_sensor_id") + private String axSensorId; + + @FieldName("bx_temper") + private BigDecimal bxTemper; + + @FieldName("bx_sensor_id") + private String bxSensorId; + + @FieldName("cx_temper") + private BigDecimal cxTemper; + + @FieldName("cx_sensor_id") + private String cxSensorId; + /** * 汇总时间时间 */ diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperServiceImpl.java index 930394d..42ca3bb 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperServiceImpl.java @@ -97,6 +97,30 @@ public class RptTemperServiceImpl implements RptTemperService { rptTemper.setCOTemper(transData(cacEntity.getTmp())); rptTemper.setCOSensorId(cacEntity.getSensorId()); break; + case A_S: + rptTemper.setASTemper(transData(cacEntity.getTmp())); + rptTemper.setASSensorId(cacEntity.getSensorId()); + break; + case B_S: + rptTemper.setBSTemper(transData(cacEntity.getTmp())); + rptTemper.setBSSensorId(cacEntity.getSensorId()); + break; + case C_S: + rptTemper.setCSTemper(transData(cacEntity.getTmp())); + rptTemper.setCSSensorId(cacEntity.getSensorId()); + break; + case A_X: + rptTemper.setAXTemper(transData(cacEntity.getTmp())); + rptTemper.setAXSensorId(cacEntity.getSensorId()); + break; + case B_X: + rptTemper.setBXTemper(transData(cacEntity.getTmp())); + rptTemper.setBXSensorId(cacEntity.getSensorId()); + break; + case C_X: + rptTemper.setCXTemper(transData(cacEntity.getTmp())); + rptTemper.setCXSensorId(cacEntity.getSensorId()); + break; case IN_SIDE: rptTemper.setBoxTemper(transData(cacEntity.getTmp())); rptTemper.setBoxSensorId(cacEntity.getSensorId());