src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevSignal.java
@@ -936,7 +936,7 @@ @ApiModelProperty("第1路交流C相过压-真实值-CPSS") private Integer ac1OverVolCReal; @TableField("ac1_over_volcFake") @TableField("ac1_over_volc_fake") @ApiModelProperty("第1路交流C相过压-模拟值-CPSS") private Integer ac1OverVolCFake; @@ -1012,7 +1012,7 @@ @ApiModelProperty("第2路交流C相过压-模拟值-CPSS") private Integer ac2OverVolCFake; @TableField("ac2_overVolc_st") @TableField("ac2_over_volc_st") @ApiModelProperty("第2路交流C相过压-使用状态[0-真实值 1-模拟值]-CPSS") private Integer ac2OverVolCSt; @@ -1052,7 +1052,7 @@ @ApiModelProperty("第1路交流B相缺相-使用状态[0-真实值 1-模拟值]-CPSS") private Integer ac1LessVolBSt; @TableField("ac1_lessVolc_real") @TableField("ac1_less_volc_real") @ApiModelProperty("第1路交流C相缺相-真实值-CPSS") private Integer ac1LessVolCReal; src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevSignalSet.java
@@ -631,7 +631,7 @@ @ApiModelProperty("第1路交流B相欠压-使用状态[0-真实值 1-模拟值]-CPSS") private Integer ac1UnderVolBSt; @TableField("ac1_over_volcFake") @TableField("ac1_over_volc_fake") @ApiModelProperty("第1路交流C相过压-模拟值-CPSS") private Integer ac1OverVolCFake; @@ -683,7 +683,7 @@ @ApiModelProperty("第2路交流C相过压-模拟值-CPSS") private Integer ac2OverVolCFake; @TableField("ac2_overVolc_st") @TableField("ac2_over_volc_st") @ApiModelProperty("第2路交流C相过压-使用状态[0-真实值 1-模拟值]-CPSS") private Integer ac2OverVolCSt; src/main/java/com/whyc/pojo/db_ckpwrdev_inf/CKPwrDevInf.java
@@ -12,19 +12,9 @@ import java.io.Serializable; /** * <p> * 测控电源信息表 * </p> * * @author lxw * @since 2023-11-21 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("tb_ckpwrdev_inf") @ApiModel(value="CkpwrdevInf对象", description="测控电源信息表") @TableName(schema = "db_ckpwrdev_inf",value = "tb_ckpwrdev_inf") @ApiModel("测控电源信息表") public class CKPwrDevInf implements Serializable { private static final long serialVersionUID = 1L; src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
@@ -6,6 +6,8 @@ import com.whyc.mapper.CKPowerDevBattRtStateMapper; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtData; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtState; import com.whyc.pojo.db_ckpwrdev_inf.CKPwrDevInf; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -17,9 +19,16 @@ @Resource private CKPowerDevBattRtDataMapper mapper; @Autowired private CKPwrDevInfService ckPwrDevInfService; public List<CKPowerDevBattRtData> getList() { //查询有单体数量 CKPwrDevInf ckPwrDevInf = ckPwrDevInfService.get(); QueryWrapper<CKPowerDevBattRtData> query = Wrappers.query(); query.eq("batt_index",0); query.le("mon_num",ckPwrDevInf.getBattMonCount()); return mapper.selectList(query); } } src/main/java/com/whyc/service/CKPowerDevBattRtStateService.java
@@ -17,16 +17,9 @@ @Resource private CKPowerDevBattRtStateMapper mapper; @Autowired private CKPwrDevInfService ckPwrDevInfService; public List<CKPowerDevBattRtState> getList() { //查询有单体数量 CKPwrDevInf ckPwrDevInf = ckPwrDevInfService.get(); QueryWrapper<CKPowerDevBattRtState> query = Wrappers.query(); query.eq("batt_index",0); query.le("mon_num",ckPwrDevInf.getBattMonCount()); return mapper.selectList(query); } }