add - 箱壳设备可视化看板设备参数信息

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

@@ -57,6 +57,18 @@ public class TankShellDeviceController {
         return iTankShellDeviceInfoService.getRunParameters();
     }
 
+    /**
+     * 获取设备参数值
+     * @author WenJY
+     * @date 2022-06-09 10:52
+     * @return java.lang.String
+     */
+    @GetMapping("/getDeviceParameterValue")
+    @ResponseBody
+    public String getDeviceParameterValue(){
+        return iTankShellDeviceInfoService.getDeviceParameterValue();
+    }
+
     /**
      * 获取OEE统计数据
      * @author WenJY

productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java

@@ -0,0 +1,34 @@
+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日 10:37
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SCADA_PRAMERTER_VALUE")
+public class TankShellDevicePrameterValue implements Serializable {
+
+    @TableField("deviceid")
+    private String deviceId;
+
+    @TableField("prametername")
+    private String prameterName;
+
+    @TableField("value")
+    private String prameterValue;
+
+    @TableField("createtime")
+    private Date createTime;
+}

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

@@ -0,0 +1,13 @@
+package com.productionboard.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.productionboard.entity.TankShellDevice.TankShellDevicePrameterValue;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author WenJY
+ * @date 2022年06月09日 10:40
+ */
+@Mapper
+public interface TankShellDevicePrameterValueMapper extends BaseMapper<TankShellDevicePrameterValue> {
+}

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

@@ -23,6 +23,14 @@ public interface ITankShellDeviceInfoService {
      */
     public String getRunParameters();
 
+    /**
+     * 获取设备参数值
+     * @author WenJY
+     * @date 2022-06-09 10:41
+     * @return java.lang.String
+     */
+    public String getDeviceParameterValue();
+
     /**
      * 获取能耗产量对比JSON
      * @author WenJY

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

@@ -16,6 +16,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author WenJY
@@ -27,6 +28,9 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
     @Autowired
     private TankShellDeviceDataInformationMapper tankShellDeviceDataInformationMapper;
 
+    @Autowired
+    private TankShellDevicePrameterValueMapper tankShellDevicePrameterValueMapper;
+
     @Autowired
     private TankShellThisMonthEnergyMapper tankShellThisMonthEnergyMapper;
 
@@ -87,6 +91,21 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
         return JSONArray.toJSONString(result);
     }
 
+    @Override
+    public String getDeviceParameterValue() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.MINUTE,-1);
+        QueryWrapper<TankShellDevicePrameterValue> wrapper = new QueryWrapper<TankShellDevicePrameterValue>();
+        wrapper.eq("deviceId","XKCX001")
+                .between("createTime",calendar.getTime(),new Date())
+                .and(x->
+                    x.like("prameterName","伺服").or().like("prameterName","伺服")
+                );
+        List<TankShellDevicePrameterValue> tankShellDevicePrameterValues = tankShellDevicePrameterValueMapper.selectList(wrapper);
+        return JSONArray.toJSONString(tankShellDevicePrameterValues);
+    }
+
     @Override
     public String getEnergyConsumptionJson() {
         List<TankShellEnergyConsumption> tankShellEnergyConsumptions = tankShellEnergyConsumptionMapper.selectList(null);