Răsfoiți Sursa

新增获取首页碳源投加几个值获取

王苗苗 1 săptămână în urmă
părinte
comite
29b7c77e3e

+ 38 - 4
slibra-admin/src/main/java/com/slibra/web/controller/business/FrontController.java

@@ -2,18 +2,17 @@ package com.slibra.web.controller.business;
 
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.github.pagehelper.PageInfo;
 import com.slibra.business.domain.*;
 import com.slibra.business.mapper.*;
 import com.slibra.business.req.ChatReq;
 import com.slibra.business.req.WorkOrderReq;
-import com.slibra.business.res.CarbonMajorSimple;
-import com.slibra.business.res.CarbonSmartQueryDB;
-import com.slibra.business.res.IndustrySimpleBean;
-import com.slibra.business.res.RobotSimpleBean;
+import com.slibra.business.res.*;
 import com.slibra.business.service.IFrontService;
 import com.slibra.business.service.ITXinyiCarbonMajorService;
+import com.slibra.business.service.impl.TXinyiMedicineParamServiceImpl;
 import com.slibra.common.DecimalUtils;
 import com.slibra.common.annotation.Log;
 import com.slibra.common.constant.HttpStatus;
@@ -85,6 +84,12 @@ public class FrontController extends BaseController {
     @Autowired
     private TXinyiRobotMapper xinyiRobotMapper;
 
+    @Autowired
+    private TXinyiMedicineParamMapper xinyiMedicineParamMapper;
+
+    @Autowired
+    private TXinyiMedicineParamServiceImpl xinyiMedicineParamServiceImpl;
+
 
 
     /**
@@ -575,6 +580,35 @@ public class FrontController extends BaseController {
         return AjaxResult.success(frontService.smartAddCharListNew(timeBegin, timeEnd));
     }
 
+
+
+    /**
+     *
+     * 获取当前投药采用的是创哥对应的哪个参数;计算值是多少;反馈值是多少
+     * @return
+     */
+    @GetMapping("/bigModel/smartAdd/homeValues")
+    public AjaxResult homeValues()
+    {
+        log.info("进入了 获取当前投药采用的是创哥对应的哪个参数;计算值是多少;反馈值是多少 接口");
+        HashMap<Object, Object> map = new HashMap<>();
+        TXinyiMedicineParam latestRecord = this.xinyiMedicineParamMapper.getLatestRecord();
+        if(!Objects.isNull(latestRecord)){
+            //2025年04月27日11:26:43 返回结构做了调整
+            map = this.xinyiMedicineParamServiceImpl.calculateMedicineByLastRecord(latestRecord);
+        }
+        MedicineHome medicineHome = new MedicineHome();
+        //该时刻对应的真实碳源投加值
+        List<TXinyiIndustry> tXinyiIndustries = this.xinyiIndustryMapper.selectTXinyiIndustryList(TXinyiIndustry.builder().testHour(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH_TS, DateUtils.getNowDate())).build());
+        if(!CollectionUtils.isEmpty(tXinyiIndustries))
+            medicineHome.setRealVal(tXinyiIndustries.get(0).getSJTYJLY());
+        medicineHome.setCalculateVal((BigDecimal) map.get("CALCULATE_VAL"));
+        medicineHome.setKzxs((BigDecimal) map.get("KZXS"));
+        medicineHome.setHtfksd((BigDecimal) map.get("HTFKSD"));
+        return AjaxResult.success(medicineHome);
+    }
+
+
     /**
      *
      * 获取某个时间的内的记录的碳源投加情况

+ 1 - 1
slibra-system/src/main/java/com/slibra/business/domain/TXinyiMedicineParam.java

@@ -186,6 +186,6 @@ public class TXinyiMedicineParam extends BaseEntity
         System.out.println(str1 == str2);
 
         Object obj = null;
-        System.out.println((Integer) obj);
+        System.out.println((BigDecimal) obj);
     }
 }

+ 27 - 0
slibra-system/src/main/java/com/slibra/business/res/MedicineHome.java

@@ -0,0 +1,27 @@
+package com.slibra.business.res;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MedicineHome {
+
+
+    private BigDecimal kzxs;//控制系数
+
+    private BigDecimal htfksd;//后反馈设定
+
+    private BigDecimal calculateVal;//计算投药量
+
+    private BigDecimal realVal;//真实投药量
+
+
+}