change - 吸附内胆、铝内胆看板

ruoyi-admin/src/main/java/com/ruoyi/web/controller/ems/ElectriclossChartsController.java

@@ -47,6 +47,7 @@ public class ElectriclossChartsController extends BaseController {
      * @return
      */
     public String getFirstMonitorId(){
+        String monitorId = "";
         ScadaEmsElectricloss scadaEmsDayElectricloss = new ScadaEmsElectricloss();
         calendar.setTime(new Date());
         calendar.add(Calendar.MINUTE, -20);
@@ -54,8 +55,11 @@ public class ElectriclossChartsController extends BaseController {
         timeMap.put("beginCollectTime",calendar.getTime());
         timeMap.put("endCollectTime",new Date());
         scadaEmsDayElectricloss.setParams(timeMap);
-        List<ScadaEmsElectricloss> ScadaEmsElectriclossList = scadaEmsElectriclossService.selectScadaEmsElectriclossList(scadaEmsDayElectricloss);
-        String monitorId = ScadaEmsElectriclossList.get(0).getMonitorId();
+        List<ScadaEmsElectricloss> scadaEmsElectriclossList = scadaEmsElectriclossService.selectScadaEmsElectriclossList(scadaEmsDayElectricloss);
+        if(scadaEmsElectriclossList.size()>0){
+            monitorId = scadaEmsElectriclossList.get(0).getMonitorId();
+        }
+
         return monitorId;
     }
 
@@ -71,6 +75,9 @@ public class ElectriclossChartsController extends BaseController {
         calendar.add(Calendar.MINUTE, -20);
 
         if(scadaEmsElectricloss.getMonitorId() == ""){
+            if(getFirstMonitorId() == ""){
+                return getDataTable( new ArrayList<ScadaEmsElectricloss>());
+            }
             scadaEmsElectricloss.setMonitorId(getFirstMonitorId());
         }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/AbsorbController.java

@@ -0,0 +1,36 @@
+package com.ruoyi.web.controller.scada;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 吸附内胆
+ * @author WenJY
+ * @date 2021年11月25日 15:13
+ */
+@Controller
+@RequestMapping("/Scada/Absorb")
+public class AbsorbController {
+
+    @GetMapping("/ProductionPlan")
+    public String ProductionPlan(HttpServletRequest req, HttpServletResponse resp) {
+        String url = "http://10.100.71.101:8012/system/Absorb?id=1";
+        return "redirect:"+url;
+    }
+
+    @GetMapping("/DeviceInfo")
+    public String DeviceInfo(HttpServletRequest req, HttpServletResponse resp) {
+        String url = "http://10.100.71.101:8012/system/Absorb/device";
+        return "redirect:"+url;
+    }
+
+    @GetMapping("/Preinstalled")
+    public String Preinstalled(HttpServletRequest req, HttpServletResponse resp) {
+        String url = "http://10.100.71.101:8012/system/Absorb/preinstalled";
+        return "redirect:"+url;
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/AluminumController.java

@@ -0,0 +1,30 @@
+package com.ruoyi.web.controller.scada;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 铝内胆
+ * @author WenJY
+ * @date 2021年11月25日 15:13
+ */
+@Controller
+@RequestMapping("/Scada/Aluminum")
+public class AluminumController {
+
+    @GetMapping("/ProductionPlan")
+    public String ProductionPlan(HttpServletRequest req, HttpServletResponse resp) {
+        String url = "http://10.100.71.101:8012/system/Aluminum";
+        return "redirect:"+url;
+    }
+
+    /*@GetMapping("/DeviceInfo")
+    public String DeviceInfo(HttpServletRequest req, HttpServletResponse resp) {
+        String url = "http://10.100.71.101:8012/system/Foamer?id=2";
+        return "redirect:"+url;
+    }*/
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL
-                username: system
-                password: 123456
-                #url: jdbc:oracle:thin:@10.100.71.101:1521:ORCL
-                #username: aucma
-                #password: aucma
+#                url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL
+#                username: system
+#                password: 123456
+                url: jdbc:oracle:thin:@10.100.71.101:1521:ORCL
+                username: aucma
+                password: aucma
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭