add - 箱壳设备可视化看板数据信息

.idea/compiler.xml

@@ -14,7 +14,7 @@
     <bytecodeTargetLevel>
       <module name="deviceboard" target="8" />
       <module name="productionboard" target="8" />
-      <module name="visualboard" target="1.5" />
+      <module name="visualboard" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">

.idea/dataSources.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="澳柯玛SCADA" uuid="b014bd3f-d6c3-48a3-99d3-208124b95381">
+      <driver-ref>oracle.19</driver-ref>
+      <synchronize>true</synchronize>
+      <auto-commit>false</auto-commit>
+      <jdbc-driver>oracle.jdbc.OracleDriver</jdbc-driver>
+      <jdbc-url>jdbc:oracle:thin:@10.100.71.119:1521:ORCL</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.easyproject:orai18n:12.1.0.2.0">
+    <CLASSES>
+      <root url="jar://D:/开发环境/Maven/apache-maven-3.6.3/repository/cn/easyproject/orai18n/12.1.0.2.0/orai18n-12.1.0.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/开发环境/Maven/apache-maven-3.6.3/repository/cn/easyproject/orai18n/12.1.0.2.0/orai18n-12.1.0.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/开发环境/Maven/apache-maven-3.6.3/repository/cn/easyproject/orai18n/12.1.0.2.0/orai18n-12.1.0.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

deviceboard/deviceboard.iml

@@ -15,8 +15,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
@@ -114,5 +114,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: cn.easyproject:orai18n:12.1.0.2.0" level="project" />
   </component>
 </module>

deviceboard/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=deviceboard
-groupId=com.scada
-version=0.0.1-SNAPSHOT

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

@@ -1,2 +1,2 @@
-C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
-C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java

productionboard/productionboard.iml

@@ -15,8 +15,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
@@ -114,5 +114,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: cn.easyproject:orai18n:12.1.0.2.0" level="project" />
   </component>
 </module>

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

@@ -26,6 +26,12 @@ public class TankShellDeviceController {
         return prefix;
     }
 
+    @GetMapping("/getDataInformation")
+    @ResponseBody
+    public String getDataInformation(){
+        return iTankShellDeviceInfoService.getDataInformationJson();
+    }
+
     /**
      * 设备产量能耗对比
      * @author WenJY

productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java

@@ -0,0 +1,62 @@
+package com.productionboard.entity.TankShellDevice;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author WenJY
+ * @date 2022年06月09日 9:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SCADA_UK_DEVICEINFO_3")
+public class TankShellDeviceDataInformation implements Serializable {
+
+    /** 设备编号 */
+    @TableField("DEVICEID")
+    private String deviceId;
+
+    /** 设备状态 */
+    @TableField("DEVICESTATUS")
+    private String deviceStatus;
+
+    /** 设备节拍 */
+    @TableField("DEVICETAKT")
+    private String deviceTakt;
+
+    /** 开机时间 */
+    @TableField("OPENTIME")
+    private String openTime;
+
+    /** 运行时间 */
+    @TableField("RUNTIME")
+    private String runTime;
+
+    /** 停机时长 */
+    @TableField("STOPTIME")
+    private String stopTime;
+
+    /** 设备oee */
+    @TableField("OEE")
+    private String deviceOee;
+
+    /** 设备功率 */
+    @TableField("DEVICEPOWER")
+    private String devicePower;
+
+    /** 设备能耗 */
+    @TableField("DEVICEENERGY")
+    private String deviceEnergy;
+
+    /** 采集时间 */
+    @TableField("COLLECTTIME")
+    private Date collectTime;
+
+}

productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java

@@ -0,0 +1,13 @@
+package com.productionboard.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.productionboard.entity.TankShellDevice.TankShellDeviceDataInformation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author WenJY
+ * @date 2022年06月09日 9:55
+ */
+@Mapper
+public interface TankShellDeviceDataInformationMapper extends BaseMapper<TankShellDeviceDataInformation> {
+}

productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java

@@ -7,6 +7,14 @@ package com.productionboard.service;
  */
 public interface ITankShellDeviceInfoService {
 
+    /**
+     * 获取数据信息
+     * @author WenJY
+     * @date 2022-06-09 9:55
+     * @return java.lang.String
+     */
+    public String getDataInformationJson();
+
     /**
      * 获取能耗产量对比JSON
      * @author WenJY

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

@@ -2,8 +2,10 @@ package com.productionboard.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.productionboard.entity.TankShellDevice.TankShellDeviceDataInformation;
 import com.productionboard.entity.TankShellDevice.TankShellEnergyConsumption;
 import com.productionboard.entity.TankShellDevice.TankShellOeeStatistics;
+import com.productionboard.mapper.TankShellDeviceDataInformationMapper;
 import com.productionboard.mapper.TankShellEnergyConsumptionMapper;
 import com.productionboard.mapper.TankShellOeeStatisticsMapper;
 import com.productionboard.service.ITankShellDeviceInfoService;
@@ -20,6 +22,9 @@ import java.util.List;
 @Service
 public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoService {
 
+    @Autowired
+    private TankShellDeviceDataInformationMapper tankShellDeviceDataInformationMapper;
+
     @Autowired
     private TankShellEnergyConsumptionMapper tankShellEnergyConsumptionMapper;
 
@@ -30,6 +35,12 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
 
     private SimpleDateFormat hourFormat = new SimpleDateFormat("HH");
 
+    @Override
+    public String getDataInformationJson() {
+        List<TankShellDeviceDataInformation> tankShellDeviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null);
+        return JSONArray.toJSONString(tankShellDeviceDataInformations);
+    }
+
     @Override
     public String getEnergyConsumptionJson() {
         List<TankShellEnergyConsumption> tankShellEnergyConsumptions = tankShellEnergyConsumptionMapper.selectList(null);

productionboard/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=productionboard
-groupId=com.scada
-version=0.0.1-SNAPSHOT

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

@@ -1,33 +1,33 @@
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\StorageController.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
-C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
+E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java

visualboard.iml

@@ -14,9 +14,9 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
@@ -114,5 +114,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: cn.easyproject:orai18n:12.1.0.2.0" level="project" />
   </component>
 </module>