裂解炉炉管测温测压 - WEB/APP修改接口调整

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

@@ -3340,14 +3340,81 @@ public class TFurnancePressureController extends BaseController
             return true;
         }
     }
-
     /**
-     * 修改裂解炉炉管测压
+     * 修改裂解炉炉管测压（APP）
      */
     @PreAuthorize("@ss.hasPermi('production:pressure:edit')")
     @Log(title = "裂解炉炉管测压", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnancePressure tFurnancePressure)
+    {
+        //更新
+        tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
+        //计算ratio
+        TFurnancePressure pressure = tFurnancePressureService.selectTFurnancePressureById(tFurnancePressure.getId());
+        String furnanceName = pressure.getFurnanceName();
+        List<TFurnancePressure> list = new ArrayList();
+        list.add(pressure);
+        switch (furnanceName) {
+            case "H109":
+                FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
+                FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
+                this.checkRatio(furnancePressureFvpVO109A, pressure);
+                this.checkRatio(furnancePressureFvpVO109B, pressure);
+                break;
+            case "H110":
+                FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO110, pressure);
+                break;
+            case "H111":
+                FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO111, pressure);
+                break;
+            case "H112":
+                FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO112, pressure);
+                break;
+            case "H113":
+                FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO113, pressure);
+                break;
+            case "H114":
+                FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO114, pressure);
+                break;
+            case "H115":
+                FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO115, pressure);
+                break;
+            case "H116":
+                FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO116, pressure);
+                break;
+            case "H117":
+                FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO117, pressure);
+                break;
+            case "H118":
+                FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO118, pressure);
+                break;
+            case "H130":
+                FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
+                this.checkRatio(furnancePressureFvpVO130, pressure);
+                break;
+        }
+        //更新
+        int result = tFurnancePressureService.updateTFurnancePressure(pressure);
+        return AjaxResult.success(result+"", pressure);
+    }
+
+    /**
+     * 修改裂解炉炉管测压（WEB）
+     */
+    @PreAuthorize("@ss.hasPermi('production:pressure:edit')")
+    @Log(title = "裂解炉炉管测压", businessType = BusinessType.UPDATE)
+    @PutMapping("/editWeb")
+    public AjaxResult editWeb(@RequestBody TFurnancePressure tFurnancePressure)
     {
         // 检查数据是否包含负值或为Null
         if (!this.isNegativeOrNull(tFurnancePressure)) {
@@ -3413,6 +3480,7 @@ public class TFurnancePressureController extends BaseController
             return AjaxResult.error("提交失败，数据必须>=0！");
         }
     }
+
     public void checkRatio(FurnancePressureFvpVO vo, TFurnancePressure pressure) {
         double pass1Ratio = vo.getPass1Ratio();
         double pass2Ratio = vo.getPass2Ratio();

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

@@ -1445,12 +1445,23 @@ public class TFurnanceTemperatureController extends BaseController
     }
 
     /**
-     * 修改裂解炉炉管测温
+     * 修改裂解炉炉管测温（APP）
      */
     @PreAuthorize("@ss.hasPermi('production:temperature:edit')")
     @Log(title = "裂解炉炉管测温", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnanceTemperature tFurnanceTemperature)
+    {
+        return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
+    }
+
+    /**
+     * 修改裂解炉炉管测温（WEB）
+     */
+    @PreAuthorize("@ss.hasPermi('production:temperature:edit')")
+    @Log(title = "裂解炉炉管测温", businessType = BusinessType.UPDATE)
+    @PutMapping("/editWeb")
+    public AjaxResult editWeb(@RequestBody TFurnanceTemperature tFurnanceTemperature)
     {
         // 检查数据是否包含负值或为Null
         if (!this.isNegativeOrNull(tFurnanceTemperature)) {

ui/src/api/production/pressure.js

@@ -74,7 +74,7 @@ export function addPressure(data) {
 // 修改裂解炉炉管测压
 export function updatePressure(data) {
   return request({
-    url: '/production/pressure',
+    url: '/production/pressure/editWeb',
     method: 'put',
     data: data
   })

ui/src/api/production/temperature.js

@@ -56,7 +56,7 @@ export function addTemperature(data) {
 // 修改裂解炉炉管测温
 export function updateTemperature(data) {
   return request({
-    url: '/production/temperature',
+    url: '/production/temperature/editWeb',
     method: 'put',
     data: data
   })