add - 发泡机ISO、POL温度

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

@@ -75,6 +75,13 @@ public class FoamBoxController {
         return JSONArray.toJSONString(new MesTeamStatistics());
     }
 
+    /**
+     * 获取发泡线、发泡机状态
+     * @author WenJY
+     * @date 2022-06-10 14:57
+     * @param ids
+     * @return java.lang.String
+     */
     @GetMapping("/getRunStatusJson")
     @ResponseBody
     public String getRunStatusJson(String ids){
@@ -83,6 +90,21 @@ public class FoamBoxController {
         return runStatus;
     }
 
+    /**
+     * 获取发泡机ISO、POL温度
+     * @author WenJY
+     * @date 2022-06-10 14:58
+     * @param ids
+     * @return java.lang.String
+     */
+    @GetMapping("/getParamTemperature")
+    @ResponseBody
+    public String getParamTemperature(String ids){
+        String s = ifamBoxDeviceInfoService.getParamTemperature(ids);
+
+        return s;
+    }
+
     /**
      * 通过工位号获取MES小时产量
      * @author WenJY

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

@@ -0,0 +1,40 @@
+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日 14:37
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SCADA_FPJ_DEVICEINFO_2")
+public class FoamBoxParamTemperature implements Serializable {
+
+    @TableField("DEVICEID")
+    private String deviceId;
+
+    @TableField("ISO1")
+    private String iso1;
+
+    @TableField("ISO2")
+    private String iso2;
+
+    @TableField("POL1")
+    private String pol1;
+
+    @TableField("POL2")
+    private String pol2;
+
+    @TableField("COLLECTTIME")
+    private Date collectTime;
+
+}

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

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

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

@@ -16,4 +16,13 @@ public interface IFoamBoxDeviceInfoService {
      * @return java.lang.String
      */
     String getRunStatus(String ids);
+
+    /**
+     * 获取发泡参数温度
+     * @author WenJY
+     * @date 2022-06-10 14:44
+     * @param ids
+     * @return java.lang.String
+     */
+    String getParamTemperature(String ids);
 }

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

@@ -1,16 +1,20 @@
 package com.productionboard.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 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.FoamBoxParamTemperature;
 import com.productionboard.mapper.FoamBoxLineRunStatusMapper;
 import com.productionboard.mapper.FoamBoxMachineRunStatusMapper;
+import com.productionboard.mapper.FoamBoxParamTemperatureMapper;
 import com.productionboard.service.IFoamBoxDeviceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,6 +28,9 @@ public class FoamBoxDeviceInfoServiceImpl implements IFoamBoxDeviceInfoService {
 
   @Autowired private FoamBoxMachineRunStatusMapper foamBoxMachineRunStatusMapper;
 
+  @Autowired
+  private FoamBoxParamTemperatureMapper foamBoxParamTemperatureMapper;
+
   /**
    * 获取发泡线、发泡机运行参数
    * @author WenJY
@@ -76,4 +83,50 @@ public class FoamBoxDeviceInfoServiceImpl implements IFoamBoxDeviceInfoService {
 
     return JSONArray.toJSONString(result);
   }
+
+  /**
+   * 获取发泡参数温度
+   * @author WenJY
+   * @date 2022-06-10 14:44
+   * @param ids
+   * @return java.lang.String
+   */
+  @Override
+  public String getParamTemperature(String ids) {
+    List<JSONObject> result = new ArrayList<JSONObject>();
+    QueryWrapper<FoamBoxParamTemperature> wrapper = new QueryWrapper<>();
+
+    switch (ids) {
+      case "0":
+        wrapper.eq("DEVICEID", "HF202009858");
+        break;
+      case "1":
+        wrapper.eq("DEVICEID", "HF202009857");
+        break;
+    }
+
+    List<FoamBoxParamTemperature> foamBoxParamTemperatures = foamBoxParamTemperatureMapper.selectList(wrapper);
+
+    if(foamBoxParamTemperatures.size() > 0 && foamBoxParamTemperatures.get(0)!= null) {
+      FoamBoxParamTemperature foamBoxParamTemperature = foamBoxParamTemperatures.get(0);
+      JSONObject isoObject1 = new JSONObject();
+      isoObject1.put("xValue","1#ISO");
+      isoObject1.put("yValue",foamBoxParamTemperature.getIso1());
+      result.add(isoObject1);
+      JSONObject isoObject2 = new JSONObject();
+      isoObject2.put("xValue","2#ISO");
+      isoObject2.put("yValue",foamBoxParamTemperature.getIso2());
+      result.add(isoObject2);
+      JSONObject polObject1 = new JSONObject();
+      polObject1.put("xValue","1#POL");
+      polObject1.put("yValue",foamBoxParamTemperature.getPol1());
+      result.add(polObject1);
+      JSONObject polObject2 = new JSONObject();
+      polObject2.put("xValue","2#POL");
+      polObject2.put("yValue",foamBoxParamTemperature.getPol2());
+      result.add(polObject2);
+    }
+
+    return JSONArray.toJSONString(result);
+  }
 }

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,53 +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\entity\AluminumDevice\AluminumYesterdayEnergy.class
-com\productionboard\controller\AluminumLinerkController.class
-com\productionboard\controller\PreassembleController.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\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\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,51 +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\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\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\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\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\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\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\TankShellDevice\TankShellLossStatistics.java
-C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java