裂解炉炉管测温测压 - 根据日期获取详细信息

master/src/main/java/com/ruoyi/project/production/controller/TFurnancePressureController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.production.controller;
 
 import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.StringUtils;
@@ -39,6 +42,47 @@ public class TFurnancePressureController extends BaseController
     @Autowired
     private ITFurnancePressureService tFurnancePressureService;
 
+    /**
+     * 获取裂解炉炉管测压详细信息
+     */
+    @PostMapping("/getInfoByDate")
+    public AjaxResult getInfoByDate(@RequestBody TFurnancePressure tFurnancePressure) throws ParseException {
+        String furnanceName = tFurnancePressure.getFurnanceName();
+        Date recordTime = tFurnancePressure.getRecordTime();
+        if ("".equals(furnanceName) || recordTime == null) {
+            return AjaxResult.success();
+        }
+        Date date = new Date();
+        date.setYear(recordTime.getYear());
+        date.setMonth(recordTime.getMonth());
+        date.setDate(recordTime.getDate());
+        date.setHours(0);
+        date.setMinutes(0);
+        date.setSeconds(0);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date parse = sdf.parse(sdf.format(date));
+        tFurnancePressure.setRecordTime(parse);
+        List<TFurnancePressure> tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        TFurnancePressure am = new TFurnancePressure();
+        TFurnancePressure pm = new TFurnancePressure();
+        parse.setHours(20);
+        long dateTime = parse.getTime();
+        tFurnancePressure.setRecordTime(recordTime);
+        for (TFurnancePressure furnancePressure : tFurnancePressures) {
+            long time = furnancePressure.getRecordTime().getTime();
+            if (time >= dateTime) {
+                pm = furnancePressure;
+            } else {
+                am = furnancePressure;
+            }
+        }
+        if (recordTime.getTime() >= parse.getTime()) {
+            return AjaxResult.success(pm);
+        } else {
+            return AjaxResult.success(am);
+        }
+    }
+
     /**
      * 查询裂解炉炉管测压FVP
      */

master/src/main/java/com/ruoyi/project/production/controller/TFurnanceTemperatureController.java

@@ -1,10 +1,14 @@
 package com.ruoyi.project.production.controller;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.production.controller.vo.FurnanceTemperatureVO;
+import com.ruoyi.project.production.domain.TFurnancePressure;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +41,31 @@ public class TFurnanceTemperatureController extends BaseController
     @Autowired
     private ITFurnanceTemperatureService tFurnanceTemperatureService;
 
+    /**
+     * 获取裂解炉炉管测温详细信息
+     */
+    @PostMapping("/getInfoByDate")
+    public AjaxResult getInfoByDate(@RequestBody TFurnanceTemperature tFurnanceTemperature) throws ParseException {
+        String furnanceName = tFurnanceTemperature.getFurnanceName();
+        Date recordTime = tFurnanceTemperature.getRecordTime();
+        if ("".equals(furnanceName) || recordTime == null) {
+            return AjaxResult.success();
+        }
+        Date date = new Date();
+        date.setYear(recordTime.getYear());
+        date.setMonth(recordTime.getMonth());
+        date.setDate(recordTime.getDate());
+        date.setHours(0);
+        date.setMinutes(0);
+        date.setSeconds(0);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date parse = sdf.parse(sdf.format(date));
+        tFurnanceTemperature.setRecordTime(parse);
+        TFurnanceTemperature temperature = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
+        return AjaxResult.success(temperature);
+    }
+
+
     /**
      * 查询裂解炉炉管测温MAX
      */

master/src/main/java/com/ruoyi/project/production/mapper/TFurnanceTemperatureMapper.java

@@ -11,6 +11,14 @@ import com.ruoyi.project.production.domain.TFurnanceTemperature;
  */
 public interface TFurnanceTemperatureMapper 
 {
+    /**
+     * 查询裂解炉炉管测温
+     *
+     * @param tFurnanceTemperature 裂解炉炉管温
+     * @return 裂解炉炉管测温
+     */
+    public TFurnanceTemperature selectTFurnanceTemperatureByDate(TFurnanceTemperature tFurnanceTemperature);
+
     /**
      * 查询裂解炉炉管测温
      * 

master/src/main/java/com/ruoyi/project/production/service/ITFurnanceTemperatureService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.production.service;
 
 import java.util.List;
+
+import com.ruoyi.project.production.domain.TFurnancePressure;
 import com.ruoyi.project.production.domain.TFurnanceTemperature;
 
 /**
@@ -11,6 +13,14 @@ import com.ruoyi.project.production.domain.TFurnanceTemperature;
  */
 public interface ITFurnanceTemperatureService 
 {
+    /**
+     * 查询裂解炉炉管测温
+     *
+     * @param tFurnanceTemperature 裂解炉炉管温
+     * @return 裂解炉炉管测温
+     */
+    public TFurnanceTemperature selectTFurnanceTemperatureByDate(TFurnanceTemperature tFurnanceTemperature);
+
     /**
      * 查询裂解炉炉管测温
      * 

master/src/main/java/com/ruoyi/project/production/service/impl/TFurnanceTemperatureServiceImpl.java

@@ -20,6 +20,11 @@ public class TFurnanceTemperatureServiceImpl implements ITFurnanceTemperatureSer
     @Autowired
     private TFurnanceTemperatureMapper tFurnanceTemperatureMapper;
 
+    @Override
+    public TFurnanceTemperature selectTFurnanceTemperatureByDate(TFurnanceTemperature tFurnanceTemperature) {
+        return tFurnanceTemperatureMapper.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
+    }
+
     /**
      * 查询裂解炉炉管测温
      *

master/src/main/resources/mybatis/production/TFurnanceTemperatureMapper.xml

@@ -71,6 +71,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
         order by record_time asc
     </select>
+
+    <select id="selectTFurnanceTemperatureByDate" parameterType="TFurnanceTemperature" resultMap="TFurnanceTemperatureResult">
+        <include refid="selectTFurnanceTemperatureVo"/>
+        <where>
+            <if test="furnanceName != null  and furnanceName != ''"> and furnance_name = #{furnanceName}</if>
+            <if test="recordTime != null "> and trunc(record_time, 'dd') = #{recordTime}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
     
     <select id="selectTFurnanceTemperatureById" parameterType="Long" resultMap="TFurnanceTemperatureResult">
         <include refid="selectTFurnanceTemperatureVo"/>

ui/src/api/production/pressure.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 获取裂解炉炉管测压详细信息
+export function getInfoByDate(data) {
+  return request({
+    url: '/production/pressure/getInfoByDate',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询裂解炉炉管测压MAX
 export function listFvp(query) {
   return request({

ui/src/api/production/temperature.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 获取裂解炉炉管测温详细信息
+export function getInfoByDate(data) {
+  return request({
+    url: '/production/temperature/getInfoByDate',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询裂解炉炉管测温MAX
 export function listMax(query) {
   return request({