|
@@ -2,18 +2,17 @@ package com.slibra.web.controller.business;
|
|
|
|
|
|
import cn.hutool.http.HttpUtil;
|
|
import cn.hutool.http.HttpUtil;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
|
+import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONWriter;
|
|
import com.alibaba.fastjson2.JSONWriter;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.slibra.business.domain.*;
|
|
import com.slibra.business.domain.*;
|
|
import com.slibra.business.mapper.*;
|
|
import com.slibra.business.mapper.*;
|
|
import com.slibra.business.req.ChatReq;
|
|
import com.slibra.business.req.ChatReq;
|
|
import com.slibra.business.req.WorkOrderReq;
|
|
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.IFrontService;
|
|
import com.slibra.business.service.ITXinyiCarbonMajorService;
|
|
import com.slibra.business.service.ITXinyiCarbonMajorService;
|
|
|
|
+import com.slibra.business.service.impl.TXinyiMedicineParamServiceImpl;
|
|
import com.slibra.common.DecimalUtils;
|
|
import com.slibra.common.DecimalUtils;
|
|
import com.slibra.common.annotation.Log;
|
|
import com.slibra.common.annotation.Log;
|
|
import com.slibra.common.constant.HttpStatus;
|
|
import com.slibra.common.constant.HttpStatus;
|
|
@@ -85,6 +84,12 @@ public class FrontController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private TXinyiRobotMapper xinyiRobotMapper;
|
|
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 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);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
*
|
|
*
|
|
* 获取某个时间的内的记录的碳源投加情况
|
|
* 获取某个时间的内的记录的碳源投加情况
|