参与计算碳源投加的值 参数系数从后台配置获取

slibra-system/src/main/java/com/slibra/business/domain/TXinyiTytjParams.java

@@ -1,6 +1,11 @@
 package com.slibra.business.domain;
 
 import java.math.BigDecimal;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -12,6 +17,11 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2025-04-23
  */
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class TXinyiTytjParams extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -110,255 +120,4 @@ public class TXinyiTytjParams extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setKzmbplbjz(BigDecimal kzmbplbjz) 
-    {
-        this.kzmbplbjz = kzmbplbjz;
-    }
-
-    public BigDecimal getKzmbplbjz() 
-    {
-        return kzmbplbjz;
-    }
-    public void setHycxsygkz(BigDecimal hycxsygkz) 
-    {
-        this.hycxsygkz = hycxsygkz;
-    }
-
-    public BigDecimal getHycxsygkz() 
-    {
-        return hycxsygkz;
-    }
-    public void setXhycbjz(BigDecimal xhycbjz) 
-    {
-        this.xhycbjz = xhycbjz;
-    }
-
-    public BigDecimal getXhycbjz() 
-    {
-        return xhycbjz;
-    }
-    public void setJylpybjz(BigDecimal jylpybjz) 
-    {
-        this.jylpybjz = jylpybjz;
-    }
-
-    public BigDecimal getJylpybjz() 
-    {
-        return jylpybjz;
-    }
-    public void setTimeVal(BigDecimal timeVal) 
-    {
-        this.timeVal = timeVal;
-    }
-
-    public BigDecimal getTimeVal() 
-    {
-        return timeVal;
-    }
-    public void setMinJsll(BigDecimal minJsll) 
-    {
-        this.minJsll = minJsll;
-    }
-
-    public BigDecimal getMinJsll() 
-    {
-        return minJsll;
-    }
-    public void setMaxJsll(BigDecimal maxJsll) 
-    {
-        this.maxJsll = maxJsll;
-    }
-
-    public BigDecimal getMaxJsll() 
-    {
-        return maxJsll;
-    }
-    public void setMinJsCod(BigDecimal minJsCod) 
-    {
-        this.minJsCod = minJsCod;
-    }
-
-    public BigDecimal getMinJsCod() 
-    {
-        return minJsCod;
-    }
-    public void setMaxJsCod(BigDecimal maxJsCod) 
-    {
-        this.maxJsCod = maxJsCod;
-    }
-
-    public BigDecimal getMaxJsCod() 
-    {
-        return maxJsCod;
-    }
-    public void setMinAddAmount(BigDecimal minAddAmount) 
-    {
-        this.minAddAmount = minAddAmount;
-    }
-
-    public BigDecimal getMinAddAmount() 
-    {
-        return minAddAmount;
-    }
-    public void setMaxAddAmount(BigDecimal maxAddAmount) 
-    {
-        this.maxAddAmount = maxAddAmount;
-    }
-
-    public BigDecimal getMaxAddAmount() 
-    {
-        return maxAddAmount;
-    }
-    public void setStopAddFlag(Long stopAddFlag) 
-    {
-        this.stopAddFlag = stopAddFlag;
-    }
-
-    public Long getStopAddFlag() 
-    {
-        return stopAddFlag;
-    }
-    public void setJzxs(BigDecimal jzxs) 
-    {
-        this.jzxs = jzxs;
-    }
-
-    public BigDecimal getJzxs() 
-    {
-        return jzxs;
-    }
-    public void setXzxs(BigDecimal xzxs) 
-    {
-        this.xzxs = xzxs;
-    }
-
-    public BigDecimal getXzxs() 
-    {
-        return xzxs;
-    }
-    public void setSlfpxs(BigDecimal slfpxs) 
-    {
-        this.slfpxs = slfpxs;
-    }
-
-    public BigDecimal getSlfpxs() 
-    {
-        return slfpxs;
-    }
-    public void setTydl(BigDecimal tydl) 
-    {
-        this.tydl = tydl;
-    }
-
-    public BigDecimal getTydl() 
-    {
-        return tydl;
-    }
-    public void setZhxs(BigDecimal zhxs) 
-    {
-        this.zhxs = zhxs;
-    }
-
-    public BigDecimal getZhxs() 
-    {
-        return zhxs;
-    }
-    public void setSxps(BigDecimal sxps) 
-    {
-        this.sxps = sxps;
-    }
-
-    public BigDecimal getSxps() 
-    {
-        return sxps;
-    }
-    public void setYymd(BigDecimal yymd) 
-    {
-        this.yymd = yymd;
-    }
-
-    public BigDecimal getYymd() 
-    {
-        return yymd;
-    }
-    public void setTdb(BigDecimal tdb) 
-    {
-        this.tdb = tdb;
-    }
-
-    public BigDecimal getTdb() 
-    {
-        return tdb;
-    }
-    public void setZxqdll(BigDecimal zxqdll) 
-    {
-        this.zxqdll = zxqdll;
-    }
-
-    public BigDecimal getZxqdll() 
-    {
-        return zxqdll;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("kzmbplbjz", getKzmbplbjz())
-            .append("hycxsygkz", getHycxsygkz())
-            .append("xhycbjz", getXhycbjz())
-            .append("jylpybjz", getJylpybjz())
-            .append("timeVal", getTimeVal())
-            .append("minJsll", getMinJsll())
-            .append("maxJsll", getMaxJsll())
-            .append("minJsCod", getMinJsCod())
-            .append("maxJsCod", getMaxJsCod())
-            .append("minAddAmount", getMinAddAmount())
-            .append("maxAddAmount", getMaxAddAmount())
-            .append("stopAddFlag", getStopAddFlag())
-            .append("jzxs", getJzxs())
-            .append("xzxs", getXzxs())
-            .append("slfpxs", getSlfpxs())
-            .append("tydl", getTydl())
-            .append("zhxs", getZhxs())
-            .append("sxps", getSxps())
-            .append("yymd", getYymd())
-            .append("tdb", getTdb())
-            .append("zxqdll", getZxqdll())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiMedicineParamServiceImpl.java

@@ -9,8 +9,10 @@ import java.util.Objects;
 
 import com.slibra.business.domain.AutoFeedback;
 import com.slibra.business.domain.TXinyiIndustry;
+import com.slibra.business.domain.TXinyiTytjParams;
 import com.slibra.business.mapper.AutoFeedbackMapper;
 import com.slibra.business.mapper.TXinyiIndustryMapper;
+import com.slibra.business.mapper.TXinyiTytjParamsMapper;
 import com.slibra.business.res.MedicineRemote;
 import com.slibra.business.res.SmartAdd;
 import com.slibra.business.service.IFrontService;
@@ -48,6 +50,9 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
     @Autowired
     private AutoFeedbackMapper autoFeedbackMapper;
 
+    @Autowired
+    private TXinyiTytjParamsMapper tinyiTytjParamsMapper;
+
     /**
      * 查询智能投药参数设置
      * 
@@ -258,35 +263,46 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
         BigDecimal qycYxyOne = param.getQycYxyOne();
         BigDecimal qycYxyTwo = param.getQycYxyTwo();
 
-        BigDecimal xzxs = param.getXzxs();
-
-        BigDecimal jzxs = param.getJzxs();
-
         Integer jsLlType = param.getJsLlType();
         BigDecimal jsLlOne = param.getJsLlOne();
         BigDecimal jsLlTwo = param.getJsLlTwo();
 
-        BigDecimal slfpxs = param.getSlfpxs();
+        Integer type = param.getType();//0自动 1一号池 2二号池 3人工投放
+        BigDecimal medicineAmount = param.getMedicineAmount();//手动需要
 
         //2025年04月24日17:21:58 控制系数获取创哥预测的值，不再由用户主动输入
 //        BigDecimal kzxs = param.getKzxs();
 
 
+
         Integer jsCodType = param.getJsCodType();
         BigDecimal jsCodOne = param.getJsCodOne();
         BigDecimal jsCodTwo = param.getJsCodTwo();
 
-        BigDecimal zhxs = param.getZhxs();
-
-        BigDecimal tydl = param.getTydl();
-
-        BigDecimal medicineAmount = param.getMedicineAmount();//手动需要
-
-        Integer type = param.getType();//0自动 1一号池 2二号池 3人工投放
-
-        BigDecimal yymd = param.getYymd();
+        //前端页面相关的系数
+//        BigDecimal jzxs = param.getJzxs();
+//        BigDecimal xzxs = param.getXzxs();
+//        BigDecimal slfpxs = param.getSlfpxs();
+//        BigDecimal tydl = param.getTydl();
+//        BigDecimal zhxs = param.getZhxs();
+//        BigDecimal sxps = param.getSxps();
+//        BigDecimal yymd = param.getYymd();
+        //最新启动流量和碳氮比没有用到
+
+        //2025年04月27日16:44:43 由于系数这块是从后台设置的，所以计算取值也要改一下逻辑
+        TXinyiTytjParams tXinyiTytjParams = this.tinyiTytjParamsMapper.selectTXinyiTytjParamsById(1L);
+        if(Objects.isNull(tXinyiTytjParams)){
+            log.error("获取碳源投加后台配置系数异常，无法计算");
+            return medicineRemote;
+        }
+        BigDecimal jzxs = tXinyiTytjParams.getJzxs();
+        BigDecimal xzxs = tXinyiTytjParams.getXzxs();
+        BigDecimal slfpxs = tXinyiTytjParams.getSlfpxs();
+        BigDecimal tydl = tXinyiTytjParams.getTydl();
+        BigDecimal zhxs = tXinyiTytjParams.getZhxs();
+        BigDecimal sxps = tXinyiTytjParams.getSxps();
+        BigDecimal yymd = tXinyiTytjParams.getYymd();
 
-        BigDecimal sxps = param.getSxps();
 
         //计算
         if(!Objects.isNull(type)) {