change - 发泡机模具温度

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

@@ -105,6 +105,21 @@ public class FoamBoxController {
         return s;
     }
 
+    /**
+     * 获取模具温度
+     * @author WenJY
+     * @date 2022-06-10 17:08
+     * @param ids
+     * @return java.lang.String
+     */
+    @GetMapping("/getMouldTemperature")
+    @ResponseBody
+    public String getMouldTemperature(String ids){
+        String s = ifamBoxDeviceInfoService.getMouldTemperature(ids);
+
+        return s;
+    }
+
     /**
      * 通过工位号获取MES小时产量
      * @author WenJY

productionboard/src/main/java/com/productionboard/entity/FoamBoxDevice/FoamBoxMouldTemperature.java

@@ -0,0 +1,33 @@
+package com.productionboard.entity.FoamBoxDevice;
+
+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月10日 16:31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SCADA_FPX_DEVICEINFO_2")
+public class FoamBoxMouldTemperature implements Serializable {
+
+    @TableField("DEVICEID")
+    private String deviceId;
+
+    @TableField("PRAMETERNAME")
+    private String pameterName;
+
+    @TableField("VALUE")
+    private String pameterValue;
+
+    @TableField("CREATETIME")
+    private Date collectTime;
+}

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

@@ -0,0 +1,15 @@
+package com.productionboard.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.productionboard.entity.FoamBoxDevice.FoamBoxMouldTemperature;
+import com.productionboard.entity.FoamBoxDevice.FoamBoxParamTemperature;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author WenJY
+ * @date 2022年06月10日 14:43
+ */
+@Mapper
+public interface FoamBoxMouldTemperatureMapper extends BaseMapper<FoamBoxMouldTemperature> {
+
+}

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

@@ -25,4 +25,13 @@ public interface IFoamBoxDeviceInfoService {
      * @return java.lang.String
      */
     String getParamTemperature(String ids);
+
+    /**
+     * 获取模具温度
+     * @author WenJY
+     * @date 2022-06-10 16:39
+     * @param ids
+     * @return java.lang.String
+     */
+    String getMouldTemperature(String ids);
 }

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

@@ -6,17 +6,21 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.productionboard.entity.FoamBoxDevice.FoamBoxLineRunStatus;
 import com.productionboard.entity.FoamBoxDevice.FoamBoxMachineRunStatus;
+import com.productionboard.entity.FoamBoxDevice.FoamBoxMouldTemperature;
 import com.productionboard.entity.FoamBoxDevice.FoamBoxParamTemperature;
 import com.productionboard.mapper.FoamBoxLineRunStatusMapper;
 import com.productionboard.mapper.FoamBoxMachineRunStatusMapper;
+import com.productionboard.mapper.FoamBoxMouldTemperatureMapper;
 import com.productionboard.mapper.FoamBoxParamTemperatureMapper;
 import com.productionboard.service.IFoamBoxDeviceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author WenJY
@@ -32,6 +36,9 @@ public class FoamBoxDeviceInfoServiceImpl implements IFoamBoxDeviceInfoService {
   @Autowired
   private FoamBoxParamTemperatureMapper foamBoxParamTemperatureMapper;
 
+  @Autowired
+  private FoamBoxMouldTemperatureMapper foamBoxMouldTemperatureMapper;
+
   private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
 
   /**
@@ -152,4 +159,125 @@ public class FoamBoxDeviceInfoServiceImpl implements IFoamBoxDeviceInfoService {
 
     return JSONArray.toJSONString(result);
   }
+
+  /**
+   * 获取模具温度
+   * @author WenJY
+   * @date 2022-06-10 16:40
+   * @param ids
+   * @return java.lang.String
+   */
+  @Override
+  public String getMouldTemperature(String ids) {
+
+    List<String> xValueList = new ArrayList<>();
+    List<String> interiorList = new ArrayList<>();
+    List<String> lateralList = new ArrayList<>();
+
+    QueryWrapper<FoamBoxMouldTemperature> wrapper = new QueryWrapper<>();
+
+    switch (ids) {
+      case "0":
+        List<String> deviceId = new ArrayList<String>(){
+          {
+            this.add("FPX003");
+            this.add("FPX004");
+          }
+        };
+        wrapper.in("DEVICEID", deviceId);
+        break;
+      case "1":
+        List<String> deviceId2 = new ArrayList<String>(){
+          {
+            this.add("FPX001");
+            this.add("FPX002");
+          }
+        };
+        wrapper.in("DEVICEID", deviceId2);
+        break;
+    }
+    List<FoamBoxMouldTemperature> foamBoxMouldTemperatures = foamBoxMouldTemperatureMapper.selectList(wrapper);
+    if(foamBoxMouldTemperatures.size() > 0){
+
+      List<FoamBoxMouldTemperature> interior = foamBoxMouldTemperatures.stream().filter(x -> x.getPameterName().contains("内膜")).collect(Collectors.toList());
+      List<FoamBoxMouldTemperature> lateral = foamBoxMouldTemperatures.stream().filter(x -> x.getPameterName().contains("侧板")).collect(Collectors.toList());
+
+      for (int i = 0; i <interior.size(); i++) {
+        String nameStr = "";
+        switch (interior.get(i).getDeviceId()){
+          case "FPX001":
+            nameStr = "A区"+interior.get(i).getPameterName().substring(0,4);
+            break;
+          case "FPX002":
+            nameStr = "B区"+interior.get(i).getPameterName().substring(0,4);
+            break;
+          case "FPX003":
+            nameStr = "C区"+interior.get(i).getPameterName().substring(0,4);
+            break;
+          case "FPX004":
+            nameStr = "D区"+interior.get(i).getPameterName().substring(0,4);
+            break;
+          default:
+            nameStr = interior.get(i).getPameterName().substring(0,4);
+        }
+        if(!xValueList.contains(nameStr)){
+          xValueList.add(nameStr);
+        }
+        interiorList.add(interior.get(i).getPameterValue());
+        lateralList.add(interior.get(i).getPameterValue());
+      }
+    }else{
+      xValueList.add("A区1#模具");
+      xValueList.add("A区2#模具");
+      xValueList.add("A区3#模具");
+      xValueList.add("A区4#模具");
+      xValueList.add("A区5#模具");
+      xValueList.add("A区6#模具");
+
+      xValueList.add("B区1#模具");
+      xValueList.add("B区2#模具");
+      xValueList.add("B区3#模具");
+      xValueList.add("B区4#模具");
+      xValueList.add("B区5#模具");
+      xValueList.add("B区6#模具");
+
+      interiorList.add("12");
+      interiorList.add("12");
+      interiorList.add("12");
+      interiorList.add("12");
+      interiorList.add("12");
+      interiorList.add("12");
+
+      interiorList.add("11");
+      interiorList.add("11");
+      interiorList.add("11");
+      interiorList.add("11");
+      interiorList.add("11");
+      interiorList.add("11");
+
+      lateralList.add("17");
+      lateralList.add("17");
+      lateralList.add("17");
+      lateralList.add("17");
+      lateralList.add("17");
+      lateralList.add("17");
+
+      lateralList.add("9");
+      lateralList.add("9");
+      lateralList.add("9");
+      lateralList.add("9");
+      lateralList.add("9");
+      lateralList.add("9");
+
+    }
+
+    JSONObject jsonObject = new JSONObject();
+    jsonObject.put("xValueList",xValueList);
+    jsonObject.put("interiorList",interiorList);
+    jsonObject.put("lateralList",lateralList);
+
+    String s = JSONArray.toJSONString(jsonObject);
+
+    return s;
+  }
 }

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/createdFiles.lst

@@ -1,61 +0,0 @@
-com\productionboard\common\CodeGenerator.class
-com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.class
-com\productionboard\mapper\MesHourProdutionStatisticsMapper.class
-com\productionboard\common\CodeGenerator$1.class
-com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.class
-com\productionboard\controller\FoamBoxController.class
-com\productionboard\mapper\TankShellDeviceDataInformationMapper.class
-com\productionboard\service\IAluminumDeviceInfoService.class
-com\productionboard\service\IMesProductionDataService.class
-com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.class
-com\productionboard\mapper\BasicScadaDeviceinfoMapper.class
-com\productionboard\controller\TankShellDeviceController.class
-com\productionboard\service\ITankShellDeviceInfoService.class
-com\productionboard\config\MybatisPlusConfig.class
-com\productionboard\mapper\FoamBoxLineRunStatusMapper.class
-com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class
-com\productionboard\service\IFoamBoxDeviceInfoService.class
-com\productionboard\entity\FoamBoxDevice\FoamBoxParamTemperature.class
-com\productionboard\mapper\FoamBoxMachineRunStatusMapper.class
-com\productionboard\mapper\FoamBoxParamTemperatureMapper.class
-com\productionboard\controller\AluminumLinerkController.class
-com\productionboard\controller\PreassembleController.class
-com\productionboard\entity\FoamBoxDevice\FoamBoxMachineRunStatus.class
-com\productionboard\entity\TankShellDevice\TankShellLossStatistics.class
-com\productionboard\ProductionBoardApplication.class
-com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class
-com\productionboard\mapper\AluminumThisMonthEnergyMapper.class
-com\productionboard\mapper\MesMaterialProductionStatisticsMapper.class
-com\productionboard\mapper\AluminumOeeStatisticsMapper.class
-com\productionboard\mapper\TankShellDevicePrameterValueMapper.class
-com\productionboard\mapper\TankShellThisMonthEnergyMapper.class
-com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.class
-com\productionboard\service\impl\MesProductionDataServiceImpl.class
-com\productionboard\mapper\TankShellLossStatisticsMapper.class
-com\productionboard\controller\AluminumTtankController.class
-com\productionboard\mapper\AluminumLossStatisticsMapper.class
-com\productionboard\mapper\MesMaterialStoreStatisticsMapper.class
-com\productionboard\entity\BasicScadaDeviceinfo.class
-com\productionboard\entity\MesProduction\MesHourProdutionStatistics.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\AluminumDevice\AluminumDeviceDataInformation.class
-com\productionboard\entity\FoamBoxDevice\FoamBoxLineRunStatus.class
-com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.class
-com\productionboard\mapper\MesTeamStatisticsMapper.class
-com\productionboard\mapper\TankShellOeeStatisticsMapper.class
-com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.class
-com\productionboard\entity\MesProduction\MesTeamStatistics.class
-com\productionboard\mapper\TankShellEnergyConsumptionMapper.class
-com\productionboard\service\BasicScadaDeviceinfoService.class
-com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.class
-com\productionboard\mapper\AluminumDeviceDataInformationMapper.class
-com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class
-com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class
-com\productionboard\service\impl\FoamBoxDeviceInfoServiceImpl.class
-com\productionboard\controller\TankShellController.class
-com\productionboard\entity\AluminumDevice\AluminumLossStatistics.class
-com\productionboard\controller\AdsorptionTankController.class

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

@@ -1,59 +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\AluminumLossStatisticsMapper.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\mapper\MesTeamStatisticsMapper.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxMachineRunStatusMapper.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\mapper\MesMaterialProductionStatisticsMapper.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\entity\FoamBoxDevice\FoamBoxLineRunStatus.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\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\IFoamBoxDeviceInfoService.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\StorageController.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\FoamBoxDeviceInfoServiceImpl.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\mapper\AluminumOeeStatisticsMapper.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialStoreStatisticsMapper.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.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\entity\FoamBoxDevice\FoamBoxParamTemperature.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\service\IMesProductionDataService.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesHourProdutionStatistics.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\service\impl\MesProductionDataServiceImpl.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\mapper\FoamBoxLineRunStatusMapper.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\entity\MesProduction\MesMaterialProductionStatistics.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\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\entity\MesProduction\MesTeamStatistics.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\mapper\TankShellLossStatisticsMapper.java
-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\FoamBoxDevice\FoamBoxMachineRunStatus.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellLossStatistics.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxParamTemperatureMapper.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java