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/deviceboard/deviceboard.iml b/deviceboard/deviceboard.iml index 8ac5f6a..bafa983 100644 --- a/deviceboard/deviceboard.iml +++ b/deviceboard/deviceboard.iml @@ -15,8 +15,8 @@ - - + + diff --git a/productionboard/productionboard.iml b/productionboard/productionboard.iml index 8ac5f6a..bafa983 100644 --- a/productionboard/productionboard.iml +++ b/productionboard/productionboard.iml @@ -15,8 +15,8 @@ - - + + diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java index ff3d2d9..fe15b3e 100644 --- a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java +++ b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java @@ -1,8 +1,11 @@ package com.productionboard.controller; +import com.productionboard.service.ITankShellDeviceInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; /** * 箱壳自动成型线设备看板 @@ -12,10 +15,28 @@ import org.springframework.web.bind.annotation.RequestMapping; @Controller @RequestMapping("/tankShellDevice") public class TankShellDeviceController { + + @Autowired + private ITankShellDeviceInfoService iTankShellDeviceInfoService; + private String prefix = "tankShell/device"; @GetMapping() public String index() { return prefix; } + + /** + * 设备产量能耗对比 + * @author WenJY + * @date 2022-06-08 18:01 + * @return java.lang.String + */ + @GetMapping("/getEnergyConsumption") + @ResponseBody + public String getEnergyConsumption(){ + String energyConsumptionJson = iTankShellDeviceInfoService.getEnergyConsumptionJson(); + System.out.println("打印JSON："+energyConsumptionJson); + return energyConsumptionJson; + } } diff --git a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.java b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.java new file mode 100644 index 0000000..1422d50 --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.java @@ -0,0 +1,33 @@ +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月08日 18:02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("SCADA_UK_DEVICEINFO_1") +public class TankShellEnergyConsumption implements Serializable { + + @TableField("production") + private String production; + + @TableField("hourenergy") + private String energy; + + @TableField(exist = false) + private String xValue; + + @TableField("createtime") + private Date createTime; +} diff --git a/productionboard/src/main/java/com/productionboard/mapper/TankShellEnergyConsumptionMapper.java b/productionboard/src/main/java/com/productionboard/mapper/TankShellEnergyConsumptionMapper.java new file mode 100644 index 0000000..12f9d4e --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/mapper/TankShellEnergyConsumptionMapper.java @@ -0,0 +1,13 @@ +package com.productionboard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.productionboard.entity.TankShellDevice.TankShellEnergyConsumption; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author WenJY + * @date 2022年06月08日 18:05 + */ +@Mapper +public interface TankShellEnergyConsumptionMapper extends BaseMapper { +} diff --git a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java b/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java new file mode 100644 index 0000000..14a827a --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java @@ -0,0 +1,17 @@ +package com.productionboard.service; + +/** + * 箱壳设备数据 + * @author WenJY + * @date 2022年06月08日 18:05 + */ +public interface ITankShellDeviceInfoService { + + /** + * 获取能耗产量对比JSON + * @author WenJY + * @date 2022-06-08 18:06 + * @return java.lang.String + */ + public String getEnergyConsumptionJson(); +} diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java new file mode 100644 index 0000000..3c412f2 --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java @@ -0,0 +1,46 @@ +package com.productionboard.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.productionboard.entity.TankShellDevice.TankShellEnergyConsumption; +import com.productionboard.mapper.TankShellEnergyConsumptionMapper; +import com.productionboard.service.ITankShellDeviceInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.List; + +/** + * @author WenJY + * @date 2022年06月08日 18:06 + */ +@Service +public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoService { + + @Autowired + private TankShellEnergyConsumptionMapper tankShellEnergyConsumptionMapper; + + private SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd"); + + @Override + public String getEnergyConsumptionJson() { + List tankShellEnergyConsumptions = tankShellEnergyConsumptionMapper.selectList(null); + JSONObject jsonObject = new JSONObject(); + if(tankShellEnergyConsumptions.size() > 0){ + String[] productionArray = new String[tankShellEnergyConsumptions.size()]; + String[] energyArray = new String[tankShellEnergyConsumptions.size()]; + String[] xValueArray = new String[tankShellEnergyConsumptions.size()]; + + for (int i = 0;i< tankShellEnergyConsumptions.size();i++){ + productionArray[i] = tankShellEnergyConsumptions.get(i).getEnergy(); + energyArray[i] = tankShellEnergyConsumptions.get(i).getEnergy(); + xValueArray[i] = dateFormat.format(tankShellEnergyConsumptions.get(i).getCreateTime()); + } + jsonObject.put("productionArray",productionArray); + jsonObject.put("energyArray",energyArray); + jsonObject.put("xValueArray",xValueArray); + } + return JSONArray.toJSONString(jsonObject); + } +} diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class index 0128a92..50d2793 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/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 8794b8d..f404acb 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,27 +1,27 @@ -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\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\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\service\impl\BasicScadaDeviceinfoServiceImpl.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 +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\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\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\AluminumOeeStatisticsMapper.java +E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.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\AluminumDevice\AluminumThisMonthEnergy.java +E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java +E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.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\impl\BasicScadaDeviceinfoServiceImpl.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\service\impl\AluminumDeviceInfoServiceImpl.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\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\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\entity\AluminumDevice\AluminumDeviceDataInformation.java +E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.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 index 1f47734..d3cfbe2 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar differ diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original index 2a28c89..05b1e57 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ diff --git a/visualboard.iml b/visualboard.iml index 8b16802..3aaa796 100644 --- a/visualboard.iml +++ b/visualboard.iml @@ -14,9 +14,9 @@ - - - + + +