裂解炉炉管测温测压 - APP修改功能和快捷修改功能冲突问题

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

@@ -3522,92 +3522,94 @@ public class TFurnancePressureController extends BaseController {
         List<TFurnancePressure> list = new ArrayList();
         list.add(pressure);
         String msg = "";
-        switch (furnanceName) {
-            case "H109":
-                FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
-                FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
-                String msgA = this.checkRatio(furnancePressureFvpVO109A, pressure);
-                String msgB = this.checkRatio(furnancePressureFvpVO109B, pressure);
-                if ("".equals(msgA)) {
-                    msg = "左侧" + msgA;
-                }
-                if ("".equals(msgB)) {
-                    msg = "右侧" + msgB;
+        if (StringUtils.isNotNull(furnanceName)) {//快捷修改不检查发邮件
+            switch (furnanceName) {
+                case "H109":
+                    FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
+                    FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
+                    String msgA = this.checkRatio(furnancePressureFvpVO109A, pressure);
+                    String msgB = this.checkRatio(furnancePressureFvpVO109B, pressure);
+                    if ("".equals(msgA)) {
+                        msg = "左侧" + msgA;
+                    }
+                    if ("".equals(msgB)) {
+                        msg = "右侧" + msgB;
+                    }
+                    break;
+                case "H110":
+                    FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO110, pressure);
+                    break;
+                case "H111":
+                    FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO111, pressure);
+                    break;
+                case "H112":
+                    FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO112, pressure);
+                    break;
+                case "H113":
+                    FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO113, pressure);
+                    break;
+                case "H114":
+                    FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO114, pressure);
+                    break;
+                case "H115":
+                    FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO115, pressure);
+                    break;
+                case "H116":
+                    FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO116, pressure);
+                    break;
+                case "H117":
+                    FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO117, pressure);
+                    break;
+                case "H118":
+                    FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
+                    msg = this.checkRatio(furnancePressureFvpVO118, pressure);
+                    break;
+                case "H130":
+                    FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
+                    msg = this.checkRatio130(furnancePressureFvpVO130, pressure);
+                    break;
+            }
+            boolean isFull = false;
+            if ("H109".equals(furnanceName)) {
+                isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
+                        && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
+                        && StringUtils.isNotNull(pass9) && StringUtils.isNotNull(pass10) && StringUtils.isNotNull(pass11) && StringUtils.isNotNull(pass12)
+                        && StringUtils.isNotNull(pass13) && StringUtils.isNotNull(pass14) && StringUtils.isNotNull(pass15) && StringUtils.isNotNull(pass16)
+                        && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
+                        && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8)
+                        && !"".equals(pass9) && !"".equals(pass10) && !"".equals(pass11) && !"".equals(pass12)
+                        && !"".equals(pass13) && !"".equals(pass14) && !"".equals(pass15) && !"".equals(pass16);
+            } else if ("H130".equals(furnanceName)) {
+                isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
+                        && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4);
+            } else {
+                isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
+                        && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
+                        && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
+                        && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8);
+            }
+            if (isFull && !"".equals(msg)) {
+                msg = msg.substring(0, msg.length() - 1);
+                msg += "压差<0.45或>0.9，请注意处理。";
+                // 发邮件
+                String mailMsg = furnanceName + msg;
+                List<SysDictData> furnanceRecipientDict = iSysDictTypeService.selectDictDataByType("FURNANCE_RECIPIENT");
+                for (SysDictData sysDictData : furnanceRecipientDict) {
+                    String dictValue = sysDictData.getDictValue();
+                    TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(dictValue);
+                    SysUser sysUser = userService.selectUserByStaffId(dictValue);
+                    FurnancePressureThread mailThread = new FurnancePressureThread(mailService, staffmgr, sysUser.getUserName(), mailMsg + "，");
+                    Thread thread = new Thread(mailThread);
+                    thread.start();
                 }
-                break;
-            case "H110":
-                FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO110, pressure);
-                break;
-            case "H111":
-                FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO111, pressure);
-                break;
-            case "H112":
-                FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO112, pressure);
-                break;
-            case "H113":
-                FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO113, pressure);
-                break;
-            case "H114":
-                FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO114, pressure);
-                break;
-            case "H115":
-                FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO115, pressure);
-                break;
-            case "H116":
-                FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO116, pressure);
-                break;
-            case "H117":
-                FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO117, pressure);
-                break;
-            case "H118":
-                FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
-                msg = this.checkRatio(furnancePressureFvpVO118, pressure);
-                break;
-            case "H130":
-                FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
-                msg = this.checkRatio130(furnancePressureFvpVO130, pressure);
-                break;
-        }
-        boolean isFull = false;
-        if ("H109".equals(furnanceName)) {
-            isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
-                    && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
-                    && StringUtils.isNotNull(pass9) && StringUtils.isNotNull(pass10) && StringUtils.isNotNull(pass11) && StringUtils.isNotNull(pass12)
-                    && StringUtils.isNotNull(pass13) && StringUtils.isNotNull(pass14) && StringUtils.isNotNull(pass15) && StringUtils.isNotNull(pass16)
-                    && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
-                    && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8)
-                    && !"".equals(pass9) && !"".equals(pass10) && !"".equals(pass11) && !"".equals(pass12)
-                    && !"".equals(pass13) && !"".equals(pass14) && !"".equals(pass15) && !"".equals(pass16);
-        } else if ("H130".equals(furnanceName)) {
-            isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
-                    && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4);
-        } else {
-            isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
-                    && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
-                    && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
-                    && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8);
-        }
-        if (isFull && !"".equals(msg)) {
-            msg = msg.substring(0, msg.length() - 1);
-            msg += "压差<0.45或>0.9，请注意处理。";
-            // 发邮件
-            String mailMsg = furnanceName + msg;
-            List<SysDictData> furnanceRecipientDict = iSysDictTypeService.selectDictDataByType("FURNANCE_RECIPIENT");
-            for (SysDictData sysDictData : furnanceRecipientDict) {
-                String dictValue = sysDictData.getDictValue();
-                TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(dictValue);
-                SysUser sysUser = userService.selectUserByStaffId(dictValue);
-                FurnancePressureThread mailThread = new FurnancePressureThread(mailService, staffmgr, sysUser.getUserName(), mailMsg + "，");
-                Thread thread = new Thread(mailThread);
-                thread.start();
             }
         }
         //更新

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

@@ -1350,61 +1350,63 @@ public class TFurnanceTemperatureController extends BaseController
         int i = tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature);
         String message = "";
         String furnanceName = tFurnanceTemperature.getFurnanceName();
-        switch (furnanceName) {
-            case "H109":
-                message = this.checkTemperature109(tFurnanceTemperature);
-                break;
-            case "H110":
-            case "H111":
-            case "H112":
-            case "H113":
-            case "H114":
-            case "H115":
-            case "H116":
-            case "H117":
-            case "H118":
-                message = this.checkTemperature10x(tFurnanceTemperature);
-                break;
-            case "H130":
-                message = this.checkTemperature130(tFurnanceTemperature);
-                break;
-        }
-        boolean isFull = false;
-        if ("H109".equals(furnanceName)) {
-            isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
-                    && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
-                    && StringUtils.isNotNull(pass9) && StringUtils.isNotNull(pass10) && StringUtils.isNotNull(pass11) && StringUtils.isNotNull(pass12)
-                    && StringUtils.isNotNull(pass13) && StringUtils.isNotNull(pass14) && StringUtils.isNotNull(pass15) && StringUtils.isNotNull(pass16)
-                    && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
-                    && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8)
-                    && !"".equals(pass9) && !"".equals(pass10) && !"".equals(pass11) && !"".equals(pass12)
-                    && !"".equals(pass13) && !"".equals(pass14) && !"".equals(pass15) && !"".equals(pass16);
-        } else if ("H130".equals(furnanceName)) {
-            isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
-                    && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
-                    && StringUtils.isNotNull(pass9) && StringUtils.isNotNull(pass10) && StringUtils.isNotNull(pass11) && StringUtils.isNotNull(pass12)
-                    && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
-                    && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8)
-                    && !"".equals(pass9) && !"".equals(pass10) && !"".equals(pass11) && !"".equals(pass12);
-        } else {
-            isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
-                    && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
-                    && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
-                    && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8);
-        }
-        if (isFull && !"".equals(message)) {
-            message = message.substring(0, message.length() - 1);
-            message += "温度>1080，请注意处理。";
-            // 发邮件
-            String mailMsg = furnanceName + message;
-            List<SysDictData> furnanceRecipientDict = iSysDictTypeService.selectDictDataByType("FURNANCE_RECIPIENT");
-            for (SysDictData sysDictData : furnanceRecipientDict) {
-                String dictValue = sysDictData.getDictValue();
-                TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(dictValue);
-                SysUser sysUser = userService.selectUserByStaffId(dictValue);
-                FurnanceTemperatureThread mailThread = new FurnanceTemperatureThread(mailService, staffmgr, sysUser.getUserName(), mailMsg + "，");
-                Thread thread = new Thread(mailThread);
-                thread.start();
+        if (StringUtils.isNotNull(furnanceName)) {//快捷修改不检查发邮件
+            switch (furnanceName) {
+                case "H109":
+                    message = this.checkTemperature109(tFurnanceTemperature);
+                    break;
+                case "H110":
+                case "H111":
+                case "H112":
+                case "H113":
+                case "H114":
+                case "H115":
+                case "H116":
+                case "H117":
+                case "H118":
+                    message = this.checkTemperature10x(tFurnanceTemperature);
+                    break;
+                case "H130":
+                    message = this.checkTemperature130(tFurnanceTemperature);
+                    break;
+            }
+            boolean isFull = false;
+            if ("H109".equals(furnanceName)) {
+                isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
+                        && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
+                        && StringUtils.isNotNull(pass9) && StringUtils.isNotNull(pass10) && StringUtils.isNotNull(pass11) && StringUtils.isNotNull(pass12)
+                        && StringUtils.isNotNull(pass13) && StringUtils.isNotNull(pass14) && StringUtils.isNotNull(pass15) && StringUtils.isNotNull(pass16)
+                        && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
+                        && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8)
+                        && !"".equals(pass9) && !"".equals(pass10) && !"".equals(pass11) && !"".equals(pass12)
+                        && !"".equals(pass13) && !"".equals(pass14) && !"".equals(pass15) && !"".equals(pass16);
+            } else if ("H130".equals(furnanceName)) {
+                isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
+                        && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
+                        && StringUtils.isNotNull(pass9) && StringUtils.isNotNull(pass10) && StringUtils.isNotNull(pass11) && StringUtils.isNotNull(pass12)
+                        && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
+                        && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8)
+                        && !"".equals(pass9) && !"".equals(pass10) && !"".equals(pass11) && !"".equals(pass12);
+            } else {
+                isFull = StringUtils.isNotNull(pass1) && StringUtils.isNotNull(pass2) && StringUtils.isNotNull(pass3) && StringUtils.isNotNull(pass4)
+                        && StringUtils.isNotNull(pass5) && StringUtils.isNotNull(pass6) && StringUtils.isNotNull(pass7) && StringUtils.isNotNull(pass8)
+                        && !"".equals(pass1) && !"".equals(pass2) && !"".equals(pass3) && !"".equals(pass4)
+                        && !"".equals(pass5) && !"".equals(pass6) && !"".equals(pass7) && !"".equals(pass8);
+            }
+            if (isFull && !"".equals(message)) {
+                message = message.substring(0, message.length() - 1);
+                message += "温度>1080，请注意处理。";
+                // 发邮件
+                String mailMsg = furnanceName + message;
+                List<SysDictData> furnanceRecipientDict = iSysDictTypeService.selectDictDataByType("FURNANCE_RECIPIENT");
+                for (SysDictData sysDictData : furnanceRecipientDict) {
+                    String dictValue = sysDictData.getDictValue();
+                    TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(dictValue);
+                    SysUser sysUser = userService.selectUserByStaffId(dictValue);
+                    FurnanceTemperatureThread mailThread = new FurnanceTemperatureThread(mailService, staffmgr, sysUser.getUserName(), mailMsg + "，");
+                    Thread thread = new Thread(mailThread);
+                    thread.start();
+                }
             }
         }
         return toAjax(i);