修改

deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,2 +0,0 @@
-com\deviceboard\DeviceBoardApplication.class
-com\deviceboard\controller\TestController.class

deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,2 +1,2 @@
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
+E:\×ÀÃæ\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
+E:\×ÀÃæ\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java

productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java

@@ -48,6 +48,14 @@ public class AluminumLinerkController {
     @ResponseBody
     public String getDataInformation(){
         List<AluminumDeviceDataInformation> dataInformationList = aluminumDeviceInfoService.getDataInformationList();
+        if(dataInformationList.size() > 0 && dataInformationList.get(0) == null){
+            dataInformationList.remove(0);
+            AluminumDeviceDataInformation aluminumDeviceDataInformation = new AluminumDeviceDataInformation();
+            aluminumDeviceDataInformation.setDeviceStatus("0");
+            aluminumDeviceDataInformation.setDevicePower("0");
+            aluminumDeviceDataInformation.setDeviceEnergy("0");
+            dataInformationList.add(aluminumDeviceDataInformation);
+        }
         String s = JSONArray.toJSONString(dataInformationList);
         return s;
     }

productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java

@@ -20,6 +20,13 @@ import java.util.Date;
 @TableName("SCADA_LCB_DEVICEINFO_1")
 public class AluminumDeviceDataInformation implements Serializable {
 
+    public AluminumDeviceDataInformation() {
+    }
+
+    public AluminumDeviceDataInformation(String deviceStatus) {
+        this.deviceStatus = deviceStatus;
+    }
+
     /** 设备编号 */
     @TableField("DEVICEID")
     private String deviceId;

productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java

@@ -65,12 +65,21 @@ public class AluminumDeviceInfoServiceImpl implements IAluminumDeviceInfoService
             List<AluminumDeviceDataInformation> aluminumDeviceDataInformations = dataInformationMapper.selectList(null);
             if(aluminumDeviceDataInformations.size() > 0){
                 AluminumDeviceDataInformation aluminumDeviceDataInformation = aluminumDeviceDataInformations.get(0);
-                result[4] = aluminumDeviceDataInformation.getRunTime();
+                if(aluminumDeviceDataInformation != null){
-                result[5] = aluminumDeviceDataInformation.getStopTime();
+                    result[4] = aluminumDeviceDataInformation.getRunTime();
-                result[6] = aluminumDeviceDataInformation.getDeviceOee();
+                    result[5] = aluminumDeviceDataInformation.getStopTime();
-                result[7] = "0";
+                    result[6] = aluminumDeviceDataInformation.getDeviceOee();
-                result[8] = aluminumDeviceDataInformation.getRunTime();
+                    result[7] = "0";
-                result[9] = aluminumDeviceDataInformation.getDeviceTakt();
+                    result[8] = aluminumDeviceDataInformation.getRunTime();
+                    result[9] = aluminumDeviceDataInformation.getDeviceTakt();
+                }else{
+                    result[4] = "0";
+                    result[5] = "0";
+                    result[6] = "0";
+                    result[7] = "0";
+                    result[8] = "0";
+                    result[9] = "0";
+                }
             }
 
         }catch (Exception e){

productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.productionboard.mapper.*;
 import com.productionboard.service.ITankShellDeviceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.thymeleaf.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -49,6 +50,16 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
     @Override
     public String getDataInformationJson() {
         List<TankShellDeviceDataInformation> tankShellDeviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null);
+
+        if(tankShellDeviceDataInformations.size() > 0 && tankShellDeviceDataInformations.get(0) == null){
+            tankShellDeviceDataInformations.remove(0);
+            TankShellDeviceDataInformation tankShellDeviceDataInformation = new TankShellDeviceDataInformation();
+            tankShellDeviceDataInformation.setDeviceStatus("0");
+            tankShellDeviceDataInformation.setDevicePower("0");
+            tankShellDeviceDataInformation.setDeviceEnergy("0");
+            tankShellDeviceDataInformations.add(tankShellDeviceDataInformation);
+        }
+
         return JSONArray.toJSONString(tankShellDeviceDataInformations);
     }
 
@@ -75,12 +86,22 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
             List<TankShellDeviceDataInformation> deviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null);
             if(deviceDataInformations.size() > 0){
                 TankShellDeviceDataInformation tankShellDeviceDataInformation = deviceDataInformations.get(0);
-                result[4] = tankShellDeviceDataInformation.getRunTime();
+                if(tankShellDeviceDataInformation != null){
-                result[5] = tankShellDeviceDataInformation.getStopTime();
+                    result[4] = tankShellDeviceDataInformation.getRunTime();
-                result[6] = tankShellDeviceDataInformation.getDeviceOee();
+                    result[5] = tankShellDeviceDataInformation.getStopTime();
-                result[7] = "0";
+                    result[6] = tankShellDeviceDataInformation.getDeviceOee();
-                result[8] = tankShellDeviceDataInformation.getRunTime();
+                    result[7] = "0";
-                result[9] = tankShellDeviceDataInformation.getDeviceTakt();
+                    result[8] = tankShellDeviceDataInformation.getStopTime();
+                    result[9] = tankShellDeviceDataInformation.getDeviceTakt();
+                }else {
+                    result[4] = "0";
+                    result[5] = "0";
+                    result[6] = "0";
+                    result[7] = "0";
+                    result[8] = "0";
+                    result[9] = "0";
+                }
+
             }
 
         }catch (Exception e){

productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
@@ -47,3 +48,54 @@ C:\Users\ADMIN\Desktop\
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.java
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java
+=======
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDevicePrameterValueMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesTeamStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialStoreStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesTeamStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesHourProdutionStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\MesProductionDataServiceImpl.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IMesProductionDataService.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialProductionStatisticsMapper.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
+E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
+>>>>>>> 2bb997d92805e65fc0012bfff017d7bab3d3b3fa