新增查询 碳源投加记录相关图表接口

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

@@ -575,6 +575,21 @@ public class FrontController extends BaseController {
         return AjaxResult.success(frontService.smartAddCharListNew(timeBegin, timeEnd));
     }
 
+    /**
+     *
+     * 获取某个时间的内的记录的碳源投加情况
+     * @param timeBegin
+     * @param timeEnd
+     * @return
+     */
+    @GetMapping("/bigModel/smartAdd/addMedicineRecordList")
+    public AjaxResult addMedicineRecordList(@RequestParam(required = false, name = "timeBegin") String timeBegin, @RequestParam(required = false, name = "timeEnd") String timeEnd)
+    {
+        log.info("进入了 获取某个时间的内的记录的碳源投加情况 接口");
+        return AjaxResult.success(frontService.addMedicineRecordList(timeBegin, timeEnd));
+    }
+
+
 
     /**
      *获取碳源投加 是否在本系统中允许投放（用于部分场景：计算异常 或者 想手动中断等）

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiMedicineAddRecordMapper.java

@@ -2,6 +2,7 @@ package com.slibra.business.mapper;
 
 import java.util.List;
 import com.slibra.business.domain.TXinyiMedicineAddRecord;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 信义碳源投加记录Mapper接口
@@ -58,4 +59,6 @@ public interface TXinyiMedicineAddRecordMapper
      * @return 结果
      */
     public int deleteTXinyiMedicineAddRecordByIds(Long[] ids);
+
+    List<TXinyiMedicineAddRecord> selectByDateRange(@Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd);
 }

slibra-system/src/main/java/com/slibra/business/service/IFrontService.java

@@ -54,4 +54,6 @@ public interface IFrontService
     List<AutoFeedback> configPredict(List<TJlPredict> tJlPredicts);
 
     List<MedicineChart> smartAddCharListNew(String timeBegin, String timeEnd);
+
+    List<TXinyiMedicineAddRecord> addMedicineRecordList(String timeBegin, String timeEnd);
 }

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

@@ -78,6 +78,9 @@ public class FrontServiceImpl implements IFrontService {
     @Autowired
     private XsyFeedbackMapper xsyFeedbackMapper;
 
+    @Autowired
+    private TXinyiMedicineAddRecordMapper xinyiMedicineAddRecordMapper;
+
     @Override
     public XinyiIndustrySimple countInfo() {
         //查询基本的工业库数据
@@ -520,6 +523,19 @@ public class FrontServiceImpl implements IFrontService {
         return this.xinyiIndustryMapper.smartAddCharListNew(dayBefore3Str, nowDateStr);
     }
 
+
+    @Override
+    public List<TXinyiMedicineAddRecord> addMedicineRecordList(String timeBegin, String timeEnd) {
+        //日期兜底处理
+        Date nowDate = DateUtils.getNowDate();
+        Date dayBefore7 = DateUtils.plusDate(-7, nowDate);
+        //2024年09月13日17:02:59 支持前段自定义起止时间
+        //先用日期获取当天和前一天的数据，如果获取不到，则提示错误信息
+        String nowDateStr = StringUtils.isBlank(timeEnd) ? DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, nowDate) : timeEnd;
+        String dayBefore3Str = StringUtils.isBlank(timeBegin) ? DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, dayBefore7) : timeBegin;
+        return xinyiMedicineAddRecordMapper.selectByDateRange(dayBefore3Str, nowDateStr);
+    }
+
     @Override
 //    @Transactional(rollbackFor = Exception.class)
     public List<AutoFeedback> configPredict(List<TJlPredict> tJlPredicts) {

slibra-system/src/main/resources/mapper/business/TXinyiMedicineAddRecordMapper.xml

@@ -107,4 +107,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <!-- 2025年04月24日14:35:36 下面是新增的SQL，不允许删除或者覆盖 -->
+    <select id="selectByDateRange" resultType="com.slibra.business.domain.TXinyiMedicineAddRecord">
+        SELECT
+            *
+        FROM
+            t_xinyi_medicine_add_record
+        WHERE
+            del_flag = 0
+          AND remark BETWEEN #{dateBegin}
+            AND #{dateEnd}
+        ORDER BY
+            id ASC
+    </select>
 </mapper>