diff --git a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java index e0f06c3..a34c97c 100644 --- a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java +++ b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java @@ -28,7 +28,7 @@ public class TankShellDevicePrameterValue implements Serializable { @TableField("prametername") private String prameterName; - @TableField("value") + @TableField("prameterValue") private String prameterValue; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java b/productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java index 1211453..53ae3ea 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java @@ -14,7 +14,7 @@ import java.util.List; @Mapper public interface TankShellDevicePrameterValueMapper extends BaseMapper { - @Select("select t2.DEVICEID,t2.PRAMETERNAME, t2.VALUE, t2.CREATETIME\n" + @Select("select t2.DEVICEID,t2.PRAMETERNAME, t2.VALUE as PRAMETERVALUE, t2.CREATETIME\n" + "from (select * from BASIC_SCADA_DEVICEPARAMETER@SCADA_DBLINK where Device_id = 'XKCX001' and PARAMETER_ID = '2') t1\n" + " left join SCADA_PRAMERTER_VALUE t2 on t1.PARAMETER_NAME = t2.PRAMETERNAME\n" + "where CREATETIME = (select max(CREATETIME) from SCADA_PRAMERTER_VALUE where DEVICEID = T2.DEVICEID)") diff --git a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class index 1628716..55869ba 100644 Binary files a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class and b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.class index 3d3fcb8..a3d0767 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.class and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class index df2bcde..42ed3cc 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.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 65ba3b2..7498b34 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/classes/static/js/common/scrollTable.js b/productionboard/target/classes/static/js/common/scrollTable.js index e92b6ee..5a67c1e 100644 --- a/productionboard/target/classes/static/js/common/scrollTable.js +++ b/productionboard/target/classes/static/js/common/scrollTable.js @@ -217,24 +217,6 @@ let dynamicTable = resource => { } } - //奇偶校验 --> 处理最后一行是奇数的问题 - let oddORevenCheck = $(`${ele}>.table>.tbody>.tr`).length % 2 == 0 ? 'even' : 'odd'; - //滚动动画 - var animation = () => setInterval(function() { - $(ele + '>.table>.tbody>.tr:eq(0)').slideToggle(100, function() { - switch (oddORevenCheck) { - case 'even': - $(this).clone().css(trEvenCSS).appendTo(ele + '>.table>.tbody'); - oddORevenCheck = 'odd'; - break; - case 'odd': - $(this).clone().css(trOddCSS).appendTo(ele + '>.table>.tbody'); - oddORevenCheck = 'even'; - break; - } - $(this).remove(); - }); - }, timeout); // 组件销毁钩子 $(`${ele}`).bind('DOMNodeRemoved', (e) => { 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/createdFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 95c425b..0000000 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,41 +0,0 @@ -com\productionboard\mapper\AluminumLossStatisticsMapper.class -com\productionboard\common\CodeGenerator.class -com\productionboard\common\CodeGenerator$1.class -com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.class -com\productionboard\entity\BasicScadaDeviceinfo.class -com\productionboard\controller\FoamBoxController.class -com\productionboard\mapper\TankShellDeviceDataInformationMapper.class -com\productionboard\service\IAluminumDeviceInfoService.class -com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.class -com\productionboard\controller\StorageController.class -com\productionboard\mapper\AluminumYesterdayEnergyMapper.class -com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.class -com\productionboard\common\CodeGenerator$2.class -com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.class -com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.class -com\productionboard\mapper\BasicScadaDeviceinfoMapper.class -com\productionboard\controller\TankShellDeviceController.class -com\productionboard\service\ITankShellDeviceInfoService.class -com\productionboard\config\MybatisPlusConfig.class -com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.class -com\productionboard\mapper\TankShellOeeStatisticsMapper.class -com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class -com\productionboard\mapper\TankShellEnergyConsumptionMapper.class -com\productionboard\controller\AluminumLinerkController.class -com\productionboard\controller\PreassembleController.class -com\productionboard\service\BasicScadaDeviceinfoService.class -com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.class -com\productionboard\mapper\AluminumDeviceDataInformationMapper.class -com\productionboard\ProductionBoardApplication.class -com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class -com\productionboard\mapper\AluminumThisMonthEnergyMapper.class -com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class -com\productionboard\mapper\AluminumOeeStatisticsMapper.class -com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class -com\productionboard\mapper\TankShellDevicePrameterValueMapper.class -com\productionboard\mapper\TankShellThisMonthEnergyMapper.class -com\productionboard\controller\TankShellController.class -com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.class -com\productionboard\entity\AluminumDevice\AluminumLossStatistics.class -com\productionboard\controller\AluminumTtankController.class -com\productionboard\controller\AdsorptionTankController.class 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 deleted file mode 100644 index 8359d6e..0000000 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,39 +0,0 @@ -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\TankShellEnergyConsumptionMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.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\mapper\TankShellThisMonthEnergyMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDevicePrameterValueMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.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\controller\StorageController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java -C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java 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 04c2ba5..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 26880fe..0000000 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and /dev/null differ