diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9f7b03c..03ca955 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -14,7 +14,7 @@ - + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..65e7983 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,13 @@ + + + + + oracle.19 + true + false + oracle.jdbc.OracleDriver + jdbc:oracle:thin:@10.100.71.119:1521:ORCL + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml b/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml new file mode 100644 index 0000000..c803520 --- /dev/null +++ b/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/deviceboard/deviceboard.iml b/deviceboard/deviceboard.iml index ca85670..bafa983 100644 --- a/deviceboard/deviceboard.iml +++ b/deviceboard/deviceboard.iml @@ -15,8 +15,8 @@ - - + + @@ -114,5 +114,6 @@ + \ No newline at end of file diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar deleted file mode 100644 index fb0d0aa..0000000 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar and /dev/null differ diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original deleted file mode 100644 index 15ad3de..0000000 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original and /dev/null differ diff --git a/deviceboard/target/maven-archiver/pom.properties b/deviceboard/target/maven-archiver/pom.properties deleted file mode 100644 index b6bd977..0000000 --- a/deviceboard/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=deviceboard -groupId=com.scada -version=0.0.1-SNAPSHOT diff --git a/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 94004ba..c252bf4 100644 --- a/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/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 -C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\controller\TestController.java +E:\\Ŀ꿴޸\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java +E:\\Ŀ꿴޸\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java diff --git a/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/productionboard/productionboard.iml b/productionboard/productionboard.iml index ca85670..bafa983 100644 --- a/productionboard/productionboard.iml +++ b/productionboard/productionboard.iml @@ -15,8 +15,8 @@ - - + + @@ -114,5 +114,6 @@ + \ No newline at end of file diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java index 636cd76..cd65211 100644 --- a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java +++ b/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 diff --git a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java new file mode 100644 index 0000000..9e79c75 --- /dev/null +++ b/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; + +} diff --git a/productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java b/productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java new file mode 100644 index 0000000..c69cda8 --- /dev/null +++ b/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 { +} diff --git a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java b/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java index ca5261e..ed2ae80 100644 --- a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java +++ b/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 diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java index 5f2ffd1..fae276b 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java +++ b/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 tankShellDeviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null); + return JSONArray.toJSONString(tankShellDeviceDataInformations); + } + @Override public String getEnergyConsumptionJson() { List tankShellEnergyConsumptions = tankShellEnergyConsumptionMapper.selectList(null); diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class index 71a8040..c56388a 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class and b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class differ diff --git a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class index 62ecda9..18e1646 100644 Binary files a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class and b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class index d1624b9..dbd2110 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/maven-archiver/pom.properties b/productionboard/target/maven-archiver/pom.properties deleted file mode 100644 index b6195d1..0000000 --- a/productionboard/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=productionboard -groupId=com.scada -version=0.0.1-SNAPSHOT diff --git a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 530e466..bae8ee6 100644 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/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 -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\StorageController.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java -C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.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\common\CodeGenerator.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.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\mapper\TankShellEnergyConsumptionMapper.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\controller\StorageController.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.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\ProductionBoardApplication.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.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\entity\BasicScadaDeviceinfo.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\AluminumOeeStatisticsMapper.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.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\TankShellDevice\TankShellEnergyConsumption.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\mapper\BasicScadaDeviceinfoMapper.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\AluminumDeviceInfoServiceImpl.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.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\mapper\AluminumYesterdayEnergyMapper.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\config\MybatisPlusConfig.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\mapper\TankShellOeeStatisticsMapper.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java +E:\\Ŀ꿴޸\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java diff --git a/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar deleted file mode 100644 index d336f60..0000000 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar and /dev/null differ diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original deleted file mode 100644 index be347ab..0000000 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and /dev/null differ diff --git a/visualboard.iml b/visualboard.iml index bc809ad..3aaa796 100644 --- a/visualboard.iml +++ b/visualboard.iml @@ -14,9 +14,9 @@ - - - + + + @@ -114,5 +114,6 @@ + \ No newline at end of file