From 9d2373cb9c0bac32aad9f9dd52e6362101ddaa22 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 9 Jun 2022 13:33:52 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E7=AE=B1=E5=A3=B3=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=9C=8B=E6=9D=BF=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TankShellDeviceController.java |  12 +++++++
 .../TankShellDevicePrameterValue.java         |  34 ++++++++++++++++++
 .../TankShellDevicePrameterValueMapper.java   |  13 +++++++
 .../service/ITankShellDeviceInfoService.java  |   8 +++++
 .../impl/TankShellDeviceInfoServiceImpl.java  |  19 ++++++++++
 .../TankShellDeviceController.class           | Bin 1782 -> 1935 bytes
 .../service/ITankShellDeviceInfoService.class | Bin 312 -> 346 bytes
 .../impl/TankShellDeviceInfoServiceImpl.class | Bin 7444 -> 8717 bytes
 8 files changed, 86 insertions(+)
 create mode 100644 productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java
 create mode 100644 productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java

diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java
index 7bf4250..4d9bb41 100644
--- a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java
+++ b/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
diff --git a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDevicePrameterValue.java
new file mode 100644
index 0000000..99cac2b
--- /dev/null
+++ b/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;
+}
diff --git a/productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java b/productionboard/src/main/java/com/productionboard/mapper/TankShellDevicePrameterValueMapper.java
new file mode 100644
index 0000000..dd84cca
--- /dev/null
+++ b/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> {
+}
diff --git a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java b/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java
index 64cd68e..d2e1a04 100644
--- a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java
+++ b/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
diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
index abe5dce..8a2ccec 100644
--- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
+++ b/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);
diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class
index e2c424cb7b39812bd3117618d27c5972955c838b..18b6ef0fa26507597f66ec95fe92ef54da6748fb 100644
GIT binary patch
literal 1935
zcma)6>rWFw5T7lNLR+Pjr=SQvd9M!y3TT3W22({T;ftTP*QG49w{>p|@?UA9G5Wzj
zz(2}3b5~1Su1Ryr-0eJmGryVH`}6nLZva?=7cqzf?}10X5QE1gp2XoPERlFdVwuDW
ziPb2iqp-$cTpbAaG<z(I#cg?}9J%Wr>8v#L$snC^bcvUZ&Q~0(w42ky<hd7^`EKjb
zbp|)~E3Q=~d8j;<E6PpR)m9LQ$6z(1O@Vu5quj!g5hZ!9%_+}G;d=Z?I98hrE@}aM
zvtsqRGBS^_-DM+>)Mo~%%!xP?yeQlP&sstv>xOcbeZin(dghQp=a$YRjlPU><-1BL
zC(VJtS}0gMqIf8bqH|T*X^#~aw-!p;(XKVRSd@l0(cY?Auz)V*<|S4)I6V_q-%=>?
zbD85g46Nt;TH3dwTn=cZ3es*1D`+^T<aZHMorz)vxeV|y>vG$f_N7<GsmPZ)e}N1J
z5pBnnrf`A8yh^D|Gh;9$n{{tIUr*UX{FA804R|kTyjB`)Y(Kd+=|)f$EMCp?FrYQ+
z)ADz+*+eDoNtva6@~m>app<?cq9c?BUk0(Pt{6wYQnU#ZEvLCi`^8``w2>ZClG<LB
zC2yF2_-2O<cwc_1NUv_lNp2gjVggbyz#v&u^Ss}V1SFw90SUMkh4ln%z*qvFlekOb
zK8c4ghPN#2^0u?bnDg>(?d49SV;QW3p|$ZVU@%NGZrt8rV54ZbvN~jfDg1fG@uwES
z2YCX6>v-zMcb~7t2H-o2XKWG5K|H0=m*G1;`vcf)D)JpVzWUBXC}U^@4C;hod;mdx
zR~Ug&JmKF8#?XUcIG)JXHTw-ZzTig$2!L_}I$Z{LRfGRmHjZ`%H)}vkRiGFGb^e4d
z2F+-bb!f3Vv=rtX$LL!hfq5_iw|(Tv8uB*Uh)yCv?q-mgyTlHt&LiaoAAdOTt>Tk)
z3L6o0v@z42Y9`zx^rB`oafn{!kZy~^y(%&;XE<`tRpgzvkRMc$apSAVP2K4Y>&^%4
h&VGyTOt<LHjGrk2v)Gpi%=sHh{hP=0LTy@${{Y_;z-a&g

delta 692
zcmZ{iJx>Bb5Qg79I6jU;;7||{#cw@8{6G-xj9O`BWvq;nXe2foTN3|(#r+XUG)4>U
z{U=r?7M8|$?@o>w$tANlv$N04JG-~BuW0S<`}qYx73&%_ltL(n5ypZvl?WEGB+ark
zE7DYhSPi1q*|<@xPvyOyfFTgSI=VRDKW(;Jm6PW6*>O`x3~?P1=t0zVtRbVLA<cv|
zQ^;6p|7$zUf`G!0i4cg=3veB<qa?UKYcQIm*I=&T8ZjRsOhb8quVW_<(rVlU67VC1
zA^u4uQ|YC-3JfE|42h}G6KDgfc@N(mBMKxz76-CDr&ag#Z);iZ3*@?_s!d{Tg8WZV
z1^&_sJv6O{W+11ql)%U##3k|=wb5e^+WJuQd!DEg#g%PP$`+}+ASt=PIXSa4=y}9(
zm&lPbp0o}Exwa>=(YLK$#-z*OjY$SO++r;`X5A4S64)(zlASBqX16>4b-T%<(|y{V
Wu}dkKC0xOr{TQU6dHQB|OvNAI&NOiV

diff --git a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class
index 7851bc0619e4bfa57f9a6225748d2914701b00c5..eb287a7e56617ed8d6cdb19f8e746b27cc86127b 100644
GIT binary patch
delta 77
zcmdnNbc;#g)W2Q(7#J8#7<kzkxY-$aCJMMph^MEPxTKb4CZ`4@7A5AUmZTPiCFYc-
fP7L0~$U2#iQ9+1>k%5DO1*ngaffGnFF>nC@WbhI%

delta 44
zcmcb`w1Y|D)W2Q(7#J8#7<kwjxY!xECknVu%-_MtGFgLBfs28WfdeSX#J~vv4wwk%

diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class
index 98401d18757584a9ef6d1ebf9a042399e950175f..ccf97dd9c6549c6c152010ac2bac08619d2a6516 100644
GIT binary patch
delta 3201
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
R&oP8Q;CcKpxq1bEe-q1me53#X

delta 2287
zcma)-3viUx6~}*Plg<6|?M<@TkjDy!1P!qSNEl^0Bq<<}7!^b%np%)_4S}L*kPr}S
z?N-HBP(k^?_anY*RSJfNhm>lI&sIw7tF2let#75Z53y)X&)tpS43imVcFw)ux##}R
z>woTEJ#AfW@|iET?*xvM3ZD~LZ@A9mdY=$CWYfrv9yhu5W{+FkdaDz+MYx?FpF6nI
zaF^5E9pN6Q8N$7W`+V|Q?>>HFxZkZmH9X)`lvY0Iz#sC-VT0<D{LEvcJKSV=*r$~B
z9=*<Fv-|kDL+^{Qg`Nmo+2+J{!y`VG?C|)7TX!0M=~KlHC-mb{pRqjV#IKzAwG+Dx
zk7x4)PkKD%b1YB$Ji~81emlkRtj`1&S|z(ZE_ENj^SI1oh4Z~9!td#cX@y>LzW?a+
zCw4pWXT!^eR}8NPi)2@*v^%KIEe?9}z1~McH--!JY>DA7S^zDPW~TmwRoQpSv%whu
zfpCq`cueqyH$Ipf$qmXPiQt{c+>92!88q3-SPQRNX3;E!nwl(U&>UQ1OG?h9*>WN$
z8D6)%!JCG^TK>jc!6sW+H-l3QZ(H8sT_N|}#Ii*7((Z*F)zcE)?Uwg=Ux*#lPEB;Q
zcg{<6Sw7&yKyrp2%}4CD{GESTKIWg6fAMc2yR4?BHubaoht^<n&h&CVVV~tw{%e`Z
zsfPWUrR6g|xBQPUgoa>K;gFy@To#P=@^dZyv<gyV1zOkUuG7q0t%RJ&a3a$k7o;NV
zNOUf!Zdl&det!4DMV&^%R<gtdyK;|<d9)hIw&L@ef{hV|2fjZ%W+kFgi<KP9X`F5(
zHz?05D$9#XG|xzWl+{*ZQeb6>6dEbAQY<CHq;!N)FUT!Asy7_1&kR}%S9ubbBZR_Z
zg2h7$^3L>Wl%YaaqRqwA`%z)7<QN%d<wz;FT+QlWPVsm-Dp*_mUgpt4MR0scaj>(*
z1h<w{B^z~;geHvASR1DMla)YOx=z<Mgf{CCofh*Do#u3iPI-~SP*$W?WyJut(nqb&
zf?#&M?$~dsHb$n(xXMZ$$*<`=RWVyNR_$Okb2wX9VJ@xiX7F^p`~-K;jUQAKp(bTt
zl=_Yi*hdKSZ4!Fp9JO*-X-%8%gn4PK-f>4<E=dR0$xxN!HT|z^5ECe*mNM!XNxhb3
zqJ}?-b|%xs6xK48hndD68rZ8v+)tA-<V4BmB#CpflrvpMF+*xNMJ6y)rf`NdaJn=y
zOU}`OSwKrF;Q9D^XIxT&=i`wt<5-{(hbWXWe20Z(sOx>4%XwOxW_8uUcQvanb=;|T
zS<W$wbY~R0oby@iDj*#L708nLYP&?Ubrl$;7-<jPYL!M?nnFuDxMc_6+LRC%C`=iV
ze%4?N%MBMAzGt||@O{I@x+kPM=~wJQ&NJM(n)h?$U?yKeBnLA%h%t09lP@s_J3kzV
zsfV3PvrF4m1Ev^$P_F4G2T1u!X*@jPtS!_A`%Al$b$!HVt;mx5`g=#m>c{l)jh4}|
ziSf+zW>P$y+HA#c)Xrq$2sn{Em2;G(XH%eDAEv+~mBHh*zxA}~e9qI;cJ23kR_gZ}
zWytl)ksjs8{mKkCF>aP8>4YYK$R*m(kzB^5N`MRnS+4sf>Z)ETv_f}bHQ#VxRPN$(
zb)!!lH}fNYtOPkYH12Gfo+&37K}NrNNcUU`afQ|*{nJt1&&*GCjD?j0MbQiE6)Hp5
z%2At{EZaCf#Pq6dR0y|`S2b$8P7~Xh8lp;zF=O<>aulT^T&(5j(!b^<I*S)jp;@>z
z%hHesq94YpRP+_<>`EP$Q1UC`yThvn!uOERDO37JL+)`@bA5;O?aR;|<X35srmBx=
z+Pyv+S~jUNlxj};sp%%l(yu%<`2!K?Rc*&L>f~Cz5f<v!L|t3grtSv^p4D}!sd5jO
YNU4mF;aaUfsEvD^p3@+n=LKH;KU$rZ>i_@%