From 20360b1647d70bfed06ff976bb461eabac7fb9e3 Mon Sep 17 00:00:00 2001
From: yj <913944315@qq.com>
Date: Tue, 28 May 2024 13:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=B1=B1=E7=AB=99=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MeterReadController.java       |  40 ++++++
 .../analysis/entity/MeterReadingRecord.java   |   5 +
 .../mapper/MeterReadingRecordMapper.java      |   7 +
 .../service/MeterReadingRecordService.java    |   5 +
 .../impl/MeterReadingRecordServiceImpl.java   |   8 ++
 .../analysis/MeterReadingRecordMapper.xml     |   7 +
 .../controller/MeterReadingController.java    |   2 +
 .../src/main/resources/IEC61850.xlsx          | Bin 14258 -> 14153 bytes
 .../device_udpclent/common/utils/Files.java   |  67 +++++++++
 .../models/scheduled/UdpClentScheduled.java   | 131 ++++++++++--------
 .../src/main/resources/application-dev.yml    |   2 +-
 .../src/main/resources/application.yml        |   3 +
 12 files changed, 215 insertions(+), 62 deletions(-)
 create mode 100644 device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java

diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
new file mode 100644
index 0000000..fc4698e
--- /dev/null
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
@@ -0,0 +1,40 @@
+package com.xr.device_car.modules.analysis.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xr.device_car.config.utils.StringFormatterUtil;
+import com.xr.device_car.config.utils.StringUtils;
+import com.xr.device_car.modules.analysis.entity.DataTransferCamera;
+import com.xr.device_car.modules.analysis.entity.MeterReadingRecord;
+import com.xr.device_car.modules.analysis.service.MeterReadingRecordService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("read")
+@RequiredArgsConstructor
+public class MeterReadController {
+
+    private final MeterReadingRecordService meterReadingRecordService;
+
+    @RequestMapping("/pageList")
+    public IPage<MeterReadingRecord> pageList(MeterReadingRecord readingRecord, HttpServletRequest req){
+        Page<MeterReadingRecord> page = StringFormatterUtil.returnPage(req);
+        QueryWrapper<MeterReadingRecord> query=new QueryWrapper<>();
+        if(StringUtils.isNotEmpty(readingRecord.getMeterName())){
+            query.like("b.meter_name",readingRecord.getMeterName());
+        }
+        if(StringUtils.isNotEmpty(readingRecord.getOwningInterval())){
+            query.like("b.owning_interval",readingRecord.getOwningInterval());
+        }
+        IPage<MeterReadingRecord> ipage = meterReadingRecordService.pageList(page,query);
+        return ipage;
+    }
+
+
+
+}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
index 727fd88..90aecea 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
@@ -32,6 +32,11 @@ public class MeterReadingRecord implements Serializable {
      */
     private String meterCode;
 
+    @TableField(exist = false)
+    private String meterName;
+
+    private String readingUrl;
+
 
     private String readingType;
 
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java
index fe27af7..d5b61cc 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java
@@ -1,7 +1,12 @@
 package com.xr.device_car.modules.analysis.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xr.device_car.modules.analysis.entity.MeterReadingRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @author asus
@@ -15,6 +20,8 @@ public interface MeterReadingRecordMapper extends BaseMapper<MeterReadingRecord>
 
     void deleteToLog();
 
+    IPage<MeterReadingRecord> pageList(@Param("page") Page page, @Param(Constants.WRAPPER)Wrapper<MeterReadingRecord> wrapper);
+
 
 }
 
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java
index 19a5cba..7ab19f2 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java
@@ -1,5 +1,8 @@
 package com.xr.device_car.modules.analysis.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xr.device_car.modules.analysis.entity.MeterReadingRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +16,6 @@ public interface MeterReadingRecordService extends IService<MeterReadingRecord>
     void deleteToZt();
     void deleteToLog();
 
+    IPage<MeterReadingRecord> pageList(Page<MeterReadingRecord> page, QueryWrapper<MeterReadingRecord> query);
+
 }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java
index bbd3a09..9d2a1d3 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java
@@ -1,6 +1,9 @@
 package com.xr.device_car.modules.analysis.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xr.device_car.modules.analysis.entity.MeterReadingRecord;
 import com.xr.device_car.modules.analysis.service.MeterReadingRecordService;
@@ -26,6 +29,11 @@ public class MeterReadingRecordServiceImpl extends ServiceImpl<MeterReadingRecor
     public void deleteToLog() {
         ((MeterReadingRecordMapper)this.baseMapper).deleteToLog();
     }
+
+    @Override
+    public IPage<MeterReadingRecord> pageList(Page<MeterReadingRecord> page, QueryWrapper<MeterReadingRecord> query) {
+        return ((MeterReadingRecordMapper)this.baseMapper).pageList(page,query);
+    }
 }
 
 
diff --git a/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
index 98d50db..8f4b424 100644
--- a/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
+++ b/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
@@ -33,4 +33,11 @@
     <delete id="deleteToLog">
         delete from send_udp_log WHERE DATE(request_time) = DATE(NOW() - INTERVAL 1 DAY);
     </delete>
+
+    <select id="pageList" resultType="com.xr.device_car.modules.analysis.entity.MeterReadingRecord">
+        select a.id,a.meter_id,a.meter_code,a.meter_type_name,
+               a.reading_time,a.reading_value,a.reading_url,b.meter_name,b.owning_interval
+        from meter_reading_record a left join meter_config b on a.meter_id=b.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
diff --git a/device_display/src/main/java/com/xr/device_display/modules/analysis/controller/MeterReadingController.java b/device_display/src/main/java/com/xr/device_display/modules/analysis/controller/MeterReadingController.java
index 00cd0b3..803cff1 100644
--- a/device_display/src/main/java/com/xr/device_display/modules/analysis/controller/MeterReadingController.java
+++ b/device_display/src/main/java/com/xr/device_display/modules/analysis/controller/MeterReadingController.java
@@ -17,5 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/meter-reading")
 public class MeterReadingController {
 
+
+
 }
 
diff --git a/device_iec61850clent/src/main/resources/IEC61850.xlsx b/device_iec61850clent/src/main/resources/IEC61850.xlsx
index df2be4b816931c8722ad2be7dda7fe603b6cdf0f..fa770a2b18fb20854ea88085fb97a70783026885 100644
GIT binary patch
delta 8850
zcma)iby!qg-!3hUbSj9Xi1Z*JH6TcrGy>8B14v74Q9_Uq1_|lzE|G4KZkUl)x&&zk
z&Vcdwyx;qsbLNkI&9(R1Yp?aYYwakr@3t#RLIuv_pPfEJMM2R)LqQ=%K|wLIH&u1C
zcW~k|wRbeX=MJ&;kDQfn<tFRc#+*(4+Mon06b8fR>0Q4`IHb8#MwS;&X50#L^`x3@
z&fXPLgcrK9Vb=&9H=Omm5q2+$=wfag+v?`iwG&ICvKhWrhdBQDsOQH=rqdZ^tXaq)
z>j{)t873r~8)z8PeiW?4T9hyGWo1{W=^q*wQsSxd!i${h5{aUmsEp`69=0v9IC~F4
zVf8aG#tFk&qO$W%z4>P4C7GARnxKXYN;A)621%i}i)<a@hSy|Z;`Gj+yVw<~Cw#J`
zzVPVp7}9+a(I@Q4dX{D}+`e;cdRABGxgrA)D2#0dqu=3eW*2NSfZ+D=J-7oO)9n3}
zIlKD_<9R(-5rq+bGW9v9yJE~IOJ8g+LRhxg9TjLid<=~oM=tA@+?j3!wUUN>mje9o
zt9N{U<GaAE3z8A;8iR-^mY66-*|ys$D~`$M{tL9K3g{SQ$P#0t1S&5`kYG43v7kap
z(Ag-SPMuna!}yit)OT?fB%5KLleRF4GN>v#8BkR$MWhUlSMH`#50_wI(pF+6;_;f%
zv?A~=t+ZV;lp}5}=XQwyG9w+X7Yc?eQ_Wo;Zrici{MbCXlTKy5SX1f@)mlxhDjL03
z0IOO|Q}v?ptB55oYw_aMBCtAZX~wg6Dgz#Zf(KkJ8b!jD1%t%qEe8p!Y)p={j$Wu8
z0d2Ac_)gL|eX1X^(WS@zN<zMA#zt>n4{?f>WLR%5^oiNNv2G@aI5H_vj`mT*)a{>4
z`y8DgmGv!B>)RJxG;wBKzs7Rn2H~?2i|3U!fQN$uh_rfYbidDVh2Amb2w!cjCfp-x
z=>0`JL6VBg3$tC+%PQd_tAuh{r3eB7s6B=xPV^&dCx+`NC~43d3`W2S-a#I)Ei!VE
zGVjf_7r(31AH^cMl*SjAML$s?4NrKKCO@P#Y-F@?i;&PQSvzMWzN<s*{{2%2U++}K
z7B}(p0|($c#M6CdliuC~(IZ&@c5`v_-0tw`IO{OHQCqy%gL0s=Z*h9b=i+1iDx$%A
z3vqNl0C*ghiJzUEnFF<=hNI*+lkGi>!aB37wY3MTjjD*^mwON+2c<WUE5skzhV2^>
zB^M_p6T<rv6Mr}W0`7Yjj{7B3q6f<4GdCNuJI+V4r#D?o8xbcZ-Vc(3>8cLnO{XvR
zVx~vRwNE#<YS*T3fVlPz>XXYUD6=D~3<1CMo37P?h`sZX@4&9>g@cQAXn9@3r~aj5
zhqqwxc<a*6`b0MUT8qm5SFx=vx6WC}r<uV6Di=dT!+S<aNnG~y@%Q>M_OrF&i-E-h
zorqQwr!PNd8p~DYmRrY8-P~$nCMPRggm4wX`o<r#=lrw>Yp7D^HSmT9$%x~HkH<$n
z2R@#jUuMQ^G6A=U@up71`2@!KV|ov0Fzq{eJG<~&dpHsN^fZ1(1tD1<b`H^&1B$qw
zj~OnW4fxc59`73nd|SJj-8XT%7>GbLy1I383D&PC(VxQ4&FiPV&m9ZmsSU$4hTsVA
zC#mPl?XC9;muK2rm#Q_2v&(H9gq0Oe4o^J<CKjtLfUMkUd+UV$BK@lJ^<=K>a?6<V
zZ86WugeMoa{aZx$SYL0~ALR(upHC%-A^NM<IdtIrDvdkw;)917$i2tcxC{iXD2sq|
zamu1(epe5~h|0wb`-Dx4av^Y%yVx`D20TWb<XSEtvbO4C7w1>5GjUFiER>nYZ)F^A
z6P^MwZ%^1Yiqk5vMr1wpls5AU@E$;hTT3qvJ~as1ks@Mfio-|W=7}xWh@EUA;@z}o
z)e!-)(3R!3Yb37|bly=dwMDkEvECtBOwfsl{o3}Sji1$rk;f(|U+?+4kSN$-xnL|V
zZ05&WZNb=!=_I?BWu_DV??h<qQCt}6_l<-BMzN94ooRhO-+c=()V&yOeA{FryYu|9
zbyuyb?~=S@ey1KSA+H<8q}#swKHQ~?<Pp09L#Z&I?!G9OS!Vil*&~T)iQuVw80w!L
znY!<E+@W9pdCr1NpIPROkm{$xFwVCaW;hv9%<sTm!x2pRA3OgvGJFA8jMe76dmrZ7
z!-%Sj#%_*m_w7+6c{quugO=F%Ed_?myS{Ct!uq<;YL`FD%hsAlyu9lhRrd38!Lr?Q
z(LV?Ewu|8)Pf^Q*C%wSALZ1TX=Rh;>%0?ErM<tjY>jYk&_69#~Kv65$G3xgPg8&xW
zDm>&7I=Qk1HOI(rrZ+D8X5@Xt!mG<ph^O!RQ9njvPJt(ryIs26!hDKXPWOST@@H5x
zp=B_8CXU5*eR(_1Z#qS#=j=1%x?jh<?p)V1jT0-t!5UAH8~>dDI1d_Il>3Ao3wCyg
zXH}BBri$#DKZs>|fiDSOOt!lZ=qRteHc1JMS(A$A%PP!K&CQpH*T!Z>sG3+$r1di#
zd^OO=tp?Nbaa9nff||*ohCeXTA^ovcCKc-BDSaHy&u;U*nHHLeHYpnH_<;wJ&QanX
zWQhg$mTiYT<A{2^xe^!oN|zlgzpt3Y1*=qL8Kyo*4vT%A8j4+sg9XC?es=arb5_>$
zlRLV$qM9XVtmMWda-81Cahh1&218!?f|@0eqvK2x>{DJ#e*(imhnQjUtRqL(45lrA
zPF7;E?9DjJLS;pYUm;`)TX->IwKsI{@;u&FZA0u6WFaAn-GefImuDjPS}N*4u&05D
z!7`Nq?m-y~s_CVCPE6C(&==IOH>&Z*X~gkA(zvLsoH{Dn_p*kTeqAzPNG=PKVnnjx
zaPzY~1kD%J9t9&K?fVdG-V<Au2F<&%IhYlz9&a2_dK)=S-X&{VZf?rHeoQdr?(1p{
z&1<ka<zd$Yyf-7(8ssLQIts|pAwIzSL2-PRiRj_-!46e|tMcjm8lqY%&5@NNC8{(}
zYTIZLCSS-Ck%{QY(!q`<{Hu2D8I<T(bt$AOe2iHDDt5@CfOX-UPV`r1n%%A7;g+H$
zwnkP2C+m7S-F;ISF0-bHM^=WhR<JLqQGS%VqbSiv0l?9>GTjLP{Z+o;Rjq^V<vqk(
z!CWK}+}~5W1eDrbPKW|V75f{vE7;s;`1N0fC$TqMlPabHq6~Z?y1(0{zZ4Lmzm8;#
zM7(iIAN2^uK)g(Rxa%|Icp|9lccZx<b?aD}8V3M>U-@s~(pNx65O!)j2!8JsaHOG=
zzvqkOK`4lRa~KKuZN6Y-UWgPT+Bk48+csB;;R*qhG+okiTj~)lXZ6bT8!$2rYtmk}
zq==fTsE`_10DkYoawlI^+MYR1$uYneR1B?1L})Ekz#jX@7V&VjOT-&7{|JB8U76{}
zS;6D}vx-_jr=b<1B}E^)%J`CvB`OwHX)N<UE2Hs7moSkB(k`C|Lvqk?J_O0a^vO!6
zzbEsXg*?-M^-8*>JZ>dNJDJP)E9&-3OjdQROmqGP$wJ4oq$|2!vX!jXwTP1$$yVQ=
zY)wHbZYkv1TiWbDOqID5hkOT^7TxJm98!Owi|nf6*eV7I3~k(Z4toHnH7dj(gk|wB
zq1h$;1D0&{v9-caur9HRwQ6Ijr^3a8CGbEVvcAuI$=S@2kn0cPU0h)r0S(*ZxPCn4
zl>CE(My+jJ#^%QUNd*ix#K)X@sTmBuFyWtA$lwFL?UoNHu`5gQXGk93u-X&OD!gu#
zi_7ywqgEZi;#d=WaX%J0l}Rw|Yr)?R6oORoKMv$aa`r)elv;KY3E2OjJ<<*Sp?%PM
zGY&`2*ynzU|MUp_Ls2coYMQIcAdyJxzu%(#zf^gO#H&I9Nr%wh|Gmv0Bs%_$#O?n?
z0{8_*H-|k=`u`n?IO+d}1kyx*Bat}z6A9=g6661WNB}{<py<H=e<HzjiNpYyR!ZOx
z6938qKax7;H^NYC5hS>c{-E%0&&hwYip(V16zRID8P>Atx@R0z?QQa9<TVt%Ou%KC
zGc8j?Q)#ZO_ZOKtvh+i}FRL6ZY@=pL@|5*o&Nqlu{-rmEj@aT{n)szE{`WS2vH%+E
z@(WTST%Gbgo=bNGDt;F5`655;H>^M2SNlD`QV-wNM1NbDpmKVjZ0+R<U5e>&ufOT0
z$ZrBQ4Eb4&G^o5Ln=AaiNeVLaPO>jUBW)HL8i)F?BvO=kkP?tC&vKpORo54x837)m
z5cgK7)@mu{^dUR!9Roczz9+U=Bastoz7w6YCJ{d&2kZCYc>YOF(;wU|kIaI#0@|#w
zJDWh6Xy|1k{MY38fJ}~<d}Lu<O?V+!9(7Iudk`(ldgY}WiXJ?~S5X-Z49ROYS?}TU
z+^RDWaQW5Ng90`@fAQV+SN0;oBmD*5KonW8JdX|}JAd>dB%a@O^Ow!=Y5mHYD>k+}
z=Ldy%IKP16X62MqxMcmUfom&X;6FKB0RoUdE)yWa9yi7D+%592bo-6**7!!o6~;Oc
zGm9Ze!{0f?LQ^Wo#qu-IH|+k&gty9$|KYYl7D~O23rLfkF8m`+i_%In7?5?s*-YrR
zo$)KqHLPurVO0y4(-(oIUV_!!i%f#mYQNmh-IWXj2wEyAx>^5K9y-LZvw}SFaUQsU
z1Zh=@Y&;g6vAPdrFKvF0C6V{>ui%%u3iHUSa-${w{65)5J{c6XX)x`2?}E^WOQ#3^
zSpAobpA%6_{c!Tj6n^!G2f5jkPI@IJc9#0spWfSUm3e25W&aAeAmMWNuqBu}5;v;6
z-wBP(A=t%;@TO{3p(-*4ks)J|NmT%H<$e2CNQ(k$OB#Q95;FVqNUip8Ev?@og|~cy
zRKm0WqJ&!ga^|CzIFic+S42&i-QL*W3zMNYN*+AqSNt+@v-y)Y>nlwEq2gGpaiHyP
zHqy%{r++TTkV;+>)`Da~vi_}@D3~5n?^~|J<6*8=8j86}+!M`TVL$X+dQD$As~3ST
z<D6kDPk3<2MNxl9F7r;?9Uf$+`jME9zp4pawz|~)Oa>p;Qrgs&v@TbvONz+V7$8z&
zQF(0T)#0w7dWnlcrxX9bM)^_hm#V><z^d{wt=Hv}3OVQH6*>5-r<<~o@ovR&9b$cH
z=f&ZX*Yifi;|mr<pLsnsy|PiBDIm6$ykV7yExr}LAA@~7+b}x&t)j4T;A@|`_mIjd
zVo3Bt9nh4|JMB3*+FxCGwpSr~R(7g_Fc;Z(aswvEW?^PV<IW?VF#52-zOC2>r{%{5
zWp`HdwP5x!9v4RCb7Uj9fbej0p9AtS1DP5M3IXz2gS#!4lk*E(bEnHkUSkFjd-yo{
zxtQ^VuWE@mmBrh%9LlWdavhK_+NLT4HMcP>nqHbM8riDaV`Dd}cOa!{m#&w$rpw4N
z$1A(ah~8Gav{E=LometHJRfZ=aWd-iEOut+4U$tMz78cD5E>8ymTQ(9cGUH?!vc#O
zM+jxYwq5R2DpjUU8V+oW%t&VMrmru_)TV`id)D=fwx<$52Z`nxOr0N8SINu=*%*mb
zY^tJ?&*W$b;kTyujIHIkSrHWuWdUZMJAF+=0b1DE&5|z8WRqHepI?BTrpB0si<OX}
zxn~b8QQy=1>K^C7B%TPlXhX(3d&BM4cD;wUV4r;GQ@*G+WE-5EXDX}_d=qd!8zDH~
zs1>I_owuR=O4P7;O)yGcfVX{pY-yh))xN<;g3z50&*-}rWdjo>uW!!4>l7`)F`<h|
zOv%&t96gDn%llj}+lSs(aCs>p6wiEcV(;{A9gH^}>O=~V17#saw)UYjT6TK(c8UXd
zNB5qHtAbOA&8UsO7o;j}#U>z5rl6ijMN%A8sHbm?pU6&dAFd=yb?%`%m&)53ykp+~
zwuy1=G%@(u`22`9qd=}*{U@IEd@x@RoT`sJz*9{*R85SzE=3Ka`teBJqfT}Fs%GO;
zu;>?+op&<jNkDfEET22MW0+r!pD(Vb>rrzhX!tJw8lG#P95$0nv3Z(`-Il<vs|q#?
z;gh6hvV!OPvH6DkXRm6k2J2w3zK8^p*DNP)5ze~m9l?8B{wE_LeO^JPgX^RBKoErx
z>S>F`w2=Av7Hk=ou=Ngfb+)pvpAW_($OByG;&v**;XrXRUGt;%*QmTEO5}1`Gv3#A
zSOo|s!ferQ&$^sow@b#*(>K2qbsmg;AvMjkcCbniHc=f8p}H^leKO}W>HscpvjtyS
zu3Z&=tJTDZO;`Bfx_~X4?CEo0Y?B5n*d?sW%5&Ze^0HW_9>Oo+pxd6?GbFZGIX2Dl
zWkUEP%o^Z_g?>m~t*kS>acccx+K#6IL>2gU|NSoRl4-_tUOY$XtloPB+r$T)<OC-r
z$P-A4N`IA=ApymNiOucG<m!0-jOnGMI8WW+9Fwh0D$MtoI$OaXzR3^AxDkEQ@z(lk
zLAPY$Iri~=+ky6i_{3>J+l2*Bdx>UL+?WM)T|pa&RH|!=TvUw$(G-D-y87<-aZvMq
z6UEJXx+HU*1BcJ@g1j|^wTk=w%;9UX2PWz(BR6!ug%?5WYYrIvf(+*9=+YWf0lzF4
zAF30n`zs>jzT3L@=(K_;)JT$)noV<*nIE);M|6FP6(ICJnM(;C)!58EG{L6=uN9*3
zf#W;?uIDV%lsm+?A8CFxNl^E4&gqEO)41Kp7O^mqCZR_`!Cbav5*IE)bCQz8nIE1Y
z4WbwF4H0uB(e(~F!UB%9C~L$jPW#=lIp6c=xzD{h>z|S~SaPZOlu_+mnJHMo67)g~
z9zhR&mJ%WnKG((QI!@+DGNs;yW2ShE^?RBaaDe#UVAEOi`Kx(eZ(4FLBZ-QJdD+Pa
zuy)Oj5x-7X_n-@AArAA1L5g8-3Ol2vdz%X>of}g{o&+us@tbYaS#}by!moYl$J9A}
zs8Tt!gzb#o)Boe0^ZT!6o;{9<==N5gI|W||!P$XH6^C=9Ea9Eu*PN_f>TWSA6`S0+
zQ3J5DOm>cUQ%e|IihP7yE^FVW+ZfjOrH9pDw-=LyqZ*Rkp+v0^@smM0P~RbDcm&+P
zxdrzPs!r!dX*ZGf&7^vY2!D#vbl=A@M5s-v6D~Q<*lq?N(35yyPP}w-cf_G5QjxMp
zrsCV1GU6o1DD3nwL8(Ih&uY-Lc|S~F5`O@i&g{U`f~{R{!rxp7R$x(-91*E1bCDPf
z7{66TM>}}S{BFS}HwXn9L&jd(Gmz@EaNQAtd%yX53#Y>MEi&PqmmN1B5*wSh>$t}+
zq~UfO^0nnKsAd((h1jso*kHxcg7MS>3{B;1NaGUhMRT6tUWo*Mm8V#c823;O`+x~}
z>&Wr;1rodK_H&Payv3i!B88LK5-G9t<<Ze3P7ZFeWg6onZ8qyKlcepT?YN)P$J&E6
zpH0?x_@aGPkRXTa9eYK)f^-#VF2J+(Op*QvH|3-R9_RGDil9wMeOG2tMrT?Y;&;RM
z`%0D;Z0eq1QZ5c@0<V9h{g=$dMTZDKV4~`?ynKgTVVx8fVaA|fOc2!TlYh}CMTVMy
z^g^i#g4(@_l=-OYo_QMOXP$IP(9F%}N8?XmHv`|A)mMlT5;@-RNbo=&5sT#5ex7%>
z=(fw9<ViT|p4++e`TLxCawj?>U5;N^QRi{U4`>j6b<0avxb9H8+qXfYgzBgAKtBYn
z>m#QGp_DOM1u8LC+;p?~gWBLFwxJhK8T`@8P|D~^7~Yv|?E3oG5ZEpq#J&+xG}+=<
zQ94&P-#z-iG4DzD5mCC>B0}QVSHfXwXne382<_ZHlSb$=p`$LF?Ii8IpjJYJm8B{+
zoH!nY!$)S5m2XaqUu;09iW^i@0E%}x3`sn#F1yMvDii|1iK6v_HG2$^66St#O%=?<
zHcY4w-$0v+O?uH2ztkf(x~IFZZ6^a~#LJ8{Fdlt(H$+`V(i$U;2M@DL-L$)5&(}sv
zVm*FrlWLpckGl@Hh4}A1b^PkRTO$F|C{25gu94RB`ZQT&`7lWtAhpCO1_JrmpAjZs
zd}o(-J2?zz{8*wNE9gIKuNU%}vb?-_U^`j#;;4S=m1czSaEbE8{>0u0ktvkX1*OVQ
zIEW{hme)|#Y->ETBG$*l<9v#qEam3BkRHo7Mg_zAghRK36)xzk4>p1MN%yRYWQ5p{
z?8i$a3I*+qjQ&j(Z39!S1Hdi*5q+ZN-XMPKM=zuk-*Vj311%)#Q$*Ykac}nZCytJ1
zVk0dlhIc5SDH7oOGg-44Yq>~oHQkAnW*c%%c&x-kw$TuoBRRJIqlZn<UA|`y%_FXB
zDmgiMI{cyZnw2Awc%uMf<aPJ-tkTw(B%c$_yBuZLP!xKZwVqwi($oXY9!tR-naq=z
z^)ob|1iya#{vo}zt0V@qnBv6?;rjhXY_23d2es&`m));fzava|hBGk48uz!#JHt(g
zBfuY`z(EoIQITC>rlYKM1x^J<+C6%omY3Qoa_h#7gjq67)EKHHU)vhOa*2<%VunSC
zm5{H`x&(Li@9&NA5))_ue4WBV1koYNDdkJA@k*G~BFtEet`EN6#WfyDmzFen5K9x0
zTmscjW8t}}7}}*f8P2M9`#Gxx2duf1+~Wz&pfug(?k6<kZM!|AZxY5bl~fm$4aQR{
zakd`8mD5C!N5=#ByMwm41sL^d?|0kw<4T<lzM4SYIsfi%O9Y&)!O?9t0wxx@M95vw
zSbV0@ca^t2dTLe!bslE7gw0A6KWjE+PkHT4*TD12Eq|_<moP#38>OcRr>Wb(C<wNu
z>?u_Y4<$%1Ew3FKtQD!P%}TYlK8#Tv7#zSf6f0WA6Q{oK?BOfEdu`r=Xy$zP8hW-R
z*SS@Snm}4I0frEBjO@KH<f@kJM>ZRJ*)56JkFdSTjiDE%q+@DlP66<XYyW;*$o<;y
zt`_nYtp-%-&JDoGW<-@PU>mbhstfTU$;m@mnW>MeD6FOJ$>=&UY?9(b1}Jys39B`p
zu(0#OnIIKDUDu~z$~1BWzok;6KQ-<R9MAfV7XvukduO}Z2WwJ|>7qLxY9jcbh1tnm
z`ta7Crr+T2IhlqPlIPl}ZD0{plVTa_0$(4V<T)We+;|9-Mkf)ZmCXb%ZV|M;S>qgV
zO9xNxzv8c<Jn#}!1`a;RjBdWLyKVi#aKjB>?=Ehu8{D^OtkvgwjLW^aqW#wghz7U4
z?O<k?&M;Wm4Uz8oA{cF-W%}`Q`C2rjEevA7bTQn`<?<i_h|6tVo+{AO)%L92QyH->
zp{mp0s8a_P?Q4wh8`J?H;OvQaY+m?lg9jpySURnD_-J#=S=W9@)QhT#cdV2xFFxND
z(UuiOeAw7vm1XVz%I0ZqGK5B4CV@-QW8pG!=wattsZ~>7S)-M2TSQqNp|%X4stgTX
zOZ?JNnIcz48>1voW>ym&)BnCnh>(}mjKpkwjCugz;qr8B>PHp1wn10ogzAANMtFoV
zNBU9)MGW=wk8u@R30~7Zlv<ogr6xNxSJIOBm(v&<EFX(;R^%j9&^$;6p)Zp#dfzZ$
zaf_oZ$u^&{?SOqLaqCp){L#3`+*6zIFb&yuT3%9O)p5`HqjKT9KW)N8H;k=uJU991
zE(CmT*d10O%!|9}DXN)mU)C9I55X$nHLk=ch<>T5VJKNv;9UAmyijRS@s$M$KU5+E
zV=vlxhNM^j)eD6kx<}kRICVNrZ!wV@1sraNrhcyP)T_xR%S8X?97v)SUjq4QfDn>*
zL_hD5-0U4~OzZ)Bo6Fmz&<F(;G#)blLzeTvEYDT$my#{`L29>YrPAg;DQ|NVcq_sd
z<{A&HNUxEAiah99jrv8O6e;UP*gF{NX$*d6OUF<&_vb%-WhZX9wG?&K6gu~rhHZt&
z{nH(L`{+cMKrS014Ac(F3Y^p@+)Mdb{D-&UubP!0iAw;gezj$TOOwAn$}6qA17)6B
zHT)H<cfSBsRYm5QDpkVP+^K>0RUf2y&vuQEIO-~3)}AxAzz;%get4@#v2C@MzeAOl
zWSxW&_P?fP-kKD<nc1@0%GATo5qMjWFy4Jr8N58OHyNo+^R!ll9jr0vB{sm_>T`hW
zIExV?ki7Ir_iHJh3@)1PDl<!sSNMDg&-bIEA?$IxTcr**JYjwuE<ULp9;&Pt+SU&|
zjZH;!Si7I-rDg`_TQ5HHiVRwHjvk0y*q-PydPh?}bx#ii?Tj1h%R>&8=evWUbq@sv
zN+>`94dbIh^?>H`L2>?kq5*x#55l<oZU74KQ=nZ#hsN-WUo*tGx_gC&f#{&e{Df#}
zTu>YV0km!|sD!{>+CRR5hrHLle5sE7p`tJ#w@;yg0<5(Ec^~}G@eXLWfH3Mj6axf8
z!={El05Q}4Cn5f6ybARKJwOGZHK1E`f8Nzwqo7b-HbMS=UNRp8+JHd=y)JkM4V4`F
TKu{X>JJeT@11p91vd#YiJekOG

delta 8980
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
OKTuR8BuoLs)&BvZDh+7>

diff --git a/device_udpclent/src/main/java/com/xr/device_udpclent/common/utils/Files.java b/device_udpclent/src/main/java/com/xr/device_udpclent/common/utils/Files.java
index 0f62a17..7a969ff 100644
--- a/device_udpclent/src/main/java/com/xr/device_udpclent/common/utils/Files.java
+++ b/device_udpclent/src/main/java/com/xr/device_udpclent/common/utils/Files.java
@@ -6,6 +6,7 @@ import sun.misc.BASE64Encoder;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.Authenticator;
@@ -355,13 +356,79 @@ public class Files {
         return rqImg;
     }
 
+    public static BufferedImage drawRectangleAndText(BufferedImage image, double x1, double y1,double x2, double wid, double hei, String text1, String text2) {
+        // 创建一个Graphics2D对象
+        Graphics2D g2d = image.createGraphics();
 
 
+        // 设置抗锯齿
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 
 
+        // 创建一个Rectangle2D.Double对象
+        Rectangle2D.Double rect = new Rectangle2D.Double(x1, y1, wid, hei);
 
+        // 绘制红色框
+        g2d.setColor(Color.RED);
+        g2d.draw(rect);
+        // 设置粗线条
+        g2d.setStroke(new BasicStroke(3.0f * 30)); // 设置线条宽度为3.0f
 
+        // 设置字体和颜色
+        g2d.setFont(new Font("微软雅黑", Font.BOLD, 38)); // 使用支持中文的字体，增加字体大小
 
+        // 获取当前时间
+        String currentTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        // 获取文本的宽度和高度
+        FontMetrics fm = g2d.getFontMetrics();
 
+        // 绘制当前时间的背景矩形
+        int padding = 20;
+        int currentTimeWidth = fm.stringWidth(currentTime);
+        int currentTimeHeight = fm.getHeight();
+        int rectPadding = 5; // 背景矩形内边距
+        g2d.setColor(new Color(0, 0, 0, 50)); // 黑色半透明背景
+        g2d.fillRect(padding, padding, currentTimeWidth + 2 * rectPadding, currentTimeHeight + 2 * rectPadding);
+
+        // 绘制当前时间在左上角，内边距为20px
+        g2d.setColor(Color.WHITE);
+        int currentTimeX = padding + rectPadding + (currentTimeWidth + rectPadding - currentTimeWidth) / 2;
+        int currentTimeY = padding + rectPadding + fm.getAscent();
+        g2d.drawString(currentTime, currentTimeX, currentTimeY);
+
+        // 绘制文本2的背景矩形
+        int text2Width = fm.stringWidth(text2);
+        int text2Height = fm.getHeight();
+        g2d.setColor(new Color(0, 0, 0, 50)); // 黑色半透明背景
+        g2d.fillRect(padding, padding + currentTimeHeight + rectPadding * 2, text2Width + 2 * rectPadding, text2Height + 2 * rectPadding);
+
+        // 绘制文本2在时间的下面，内边距为20px
+        g2d.setColor(Color.WHITE);
+        int text2X = padding + rectPadding + (text2Width + rectPadding - text2Width) / 2;
+        int text2Y = padding + currentTimeHeight + rectPadding * 3 + fm.getAscent();
+        g2d.drawString(text2, text2X, text2Y);
+
+        // 计算文本1的右上角位置
+        int text1Width = fm.stringWidth(text1);
+        int text1X = (int) (x1 + wid); // 框的右上角位置
+        int text1Y = (int) (y1 + fm.getAscent()); // 框的右上角紧挨着框
+        g2d.setColor(Color.RED);
+
+        g2d.drawString(text1, text1X, text1Y);
+
+
+        // 释放资源
+        g2d.dispose();
+
+        return image;
+    }
+
+    public static void delFile(String url){
+        String filePath = url.replace(StaticPropUtil.imageUrl,StaticPropUtil.imagePath).replace("/","\\");
+        File file = new File(filePath);
+        if(file.exists()){
+            file.delete();
+        }
+    }
 
 }
diff --git a/device_udpclent/src/main/java/com/xr/device_udpclent/models/scheduled/UdpClentScheduled.java b/device_udpclent/src/main/java/com/xr/device_udpclent/models/scheduled/UdpClentScheduled.java
index 856a8b8..10b1f2b 100644
--- a/device_udpclent/src/main/java/com/xr/device_udpclent/models/scheduled/UdpClentScheduled.java
+++ b/device_udpclent/src/main/java/com/xr/device_udpclent/models/scheduled/UdpClentScheduled.java
@@ -39,6 +39,9 @@ public class UdpClentScheduled {
     @Autowired
     private FocalLengthConfigService focalLengthConfigService;
 
+    @Autowired
+    private MeterConfigService meterConfigService;
+
 
     @Scheduled(cron = "0 0/3 * * * ?")
     //定时发送监测数据
@@ -48,68 +51,74 @@ public class UdpClentScheduled {
         }
         List<MeterReadingRecord> list = meterReadingRecordService.selectMaxReading();
         for (MeterReadingRecord record:list){
-//            QueryWrapper<FocalLengthConfig> wrapper=new QueryWrapper<>();
-//            wrapper.eq("config_id",record.getMeterId());
-//            List<FocalLengthConfig> configs=focalLengthConfigService.list(wrapper);
-//            if(configs.size()>0){
-//                BufferedImage image = Files.bytesTobufferedImage(configs.get(0).getFocalPicture());
-//                try {
-//                    String url = Files.uploadImage(image,record.getMeterId());
-//                    record.setReadingUrl(url);
-//                    meterReadingRecordService.updateById(record);
-//                }catch (Exception e){
-//                    e.printStackTrace();
-//                }
-//            }
-            ByteBuf buf = Unpooled.buffer();
-            ByteBuf checksumBuffer = Unpooled.buffer(Long.BYTES);
-            buf.writeBytes(new byte[]{(byte) 0xEB, (byte) 0x90,(byte) 0xEB, (byte) 0x90,(byte)0x78});
-            buf.writeShortLE(3);
-            buf.writeShort(record.getMeterId());
-            buf.writeByte(2);
-            String s="在线监测#"+record.getReadingUrl();
-            byte [] sx;
-            try {
-                sx = s.getBytes("GB2312");
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
-            buf.writeByte(sx.length);
-            buf.writeBytes(sx);
-            byte [] sz;
-            try {
-                sz = record.getReadingValue().getBytes("GB2312");
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
-            buf.writeByte(sz.length);
-            buf.writeBytes(sz);
-            buf.writeBytes(generateCP56Time2a());
-
-            // 计算要校验的部分的开始索引和结束索引
-            byte c = 0;
-            int startIndex = 5; // 从第6位开始，索引是5（因为索引从0开始）
-            int endIndex = buf.readableBytes() - 1; // 到倒数第二位结束
-            // 截取并处理指定范围内的字节
-            if (startIndex <= endIndex) {
-                // 临时存放截取的字节
-                byte[] slice = new byte[endIndex - startIndex + 1];
-                // 从ByteBuf中获取数据
-                buf.getBytes(startIndex, slice);
-                c=checksum8(slice);
-                // 更新Checksum对象
-                //checksum.update(slice, 0, slice.length);
-            }
-            buf.writeByte(c);
-            // 将checksumBuffer追加到buffer末尾
-            buf.writeBytes(checksumBuffer);
-            System.out.println(EnumUtil.byteBufTo16Str(buf));
-            udpClientService.sendData(buf);
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+            QueryWrapper<FocalLengthConfig> wrapper=new QueryWrapper<>();
+            wrapper.eq("config_id",record.getMeterId());
+            List<FocalLengthConfig> configs=focalLengthConfigService.list(wrapper);
+            if(configs.size()>0){
+                FocalLengthConfig config = configs.get(0);
+                MeterConfig meterConfig=meterConfigService.getById(config.getConfigId());
+                BufferedImage image = Files.bytesTobufferedImage(config.getFocalPicture());
+                if(image!=null && config.getCopperX()!=null){
+                    image = Files.drawRectangleAndText(image,config.getCopperX(),config.getCopperY(),config.getCopperX2(),config.getCopperWid(),config.getCopperHei(),record.getReadingValue(),meterConfig.getMeterName());
+                    try {
+                        Files.delFile(record.getReadingUrl());
+                        String url = Files.uploadImage(image,record.getMeterId());
+                        record.setReadingUrl(url);
+                        meterReadingRecordService.updateById(record);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
             }
+//            ByteBuf buf = Unpooled.buffer();
+//            ByteBuf checksumBuffer = Unpooled.buffer(Long.BYTES);
+//            buf.writeBytes(new byte[]{(byte) 0xEB, (byte) 0x90,(byte) 0xEB, (byte) 0x90,(byte)0x78});
+//            buf.writeShortLE(3);
+//            buf.writeShort(record.getMeterId());
+//            buf.writeByte(2);
+//            String s="在线监测#"+record.getReadingUrl();
+//            byte [] sx;
+//            try {
+//                sx = s.getBytes("GB2312");
+//            } catch (UnsupportedEncodingException e) {
+//                throw new RuntimeException(e);
+//            }
+//            buf.writeByte(sx.length);
+//            buf.writeBytes(sx);
+//            byte [] sz;
+//            try {
+//                sz = record.getReadingValue().getBytes("GB2312");
+//            } catch (UnsupportedEncodingException e) {
+//                throw new RuntimeException(e);
+//            }
+//            buf.writeByte(sz.length);
+//            buf.writeBytes(sz);
+//            buf.writeBytes(generateCP56Time2a());
+//
+//            // 计算要校验的部分的开始索引和结束索引
+//            byte c = 0;
+//            int startIndex = 5; // 从第6位开始，索引是5（因为索引从0开始）
+//            int endIndex = buf.readableBytes() - 1; // 到倒数第二位结束
+//            // 截取并处理指定范围内的字节
+//            if (startIndex <= endIndex) {
+//                // 临时存放截取的字节
+//                byte[] slice = new byte[endIndex - startIndex + 1];
+//                // 从ByteBuf中获取数据
+//                buf.getBytes(startIndex, slice);
+//                c=checksum8(slice);
+//                // 更新Checksum对象
+//                //checksum.update(slice, 0, slice.length);
+//            }
+//            buf.writeByte(c);
+//            // 将checksumBuffer追加到buffer末尾
+//            buf.writeBytes(checksumBuffer);
+//            System.out.println(EnumUtil.byteBufTo16Str(buf));
+//            udpClientService.sendData(buf);
+//            try {
+//                Thread.sleep(100);
+//            } catch (InterruptedException e) {
+//                throw new RuntimeException(e);
+//            }
         }
     }
 
diff --git a/device_udpclent/src/main/resources/application-dev.yml b/device_udpclent/src/main/resources/application-dev.yml
index 5c9ec18..71ae995 100644
--- a/device_udpclent/src/main/resources/application-dev.yml
+++ b/device_udpclent/src/main/resources/application-dev.yml
@@ -91,7 +91,7 @@ udp:
     host: 172.26.4.59
     port: 9300
 upLoad:
-  url: http://116.196.120.81:18081/file/img/zs/
+  url: http://192.168.1.83:18081/file/img/zs/
   path: D:\\service\\fileService\\img\\zs\\
 python:
   path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
diff --git a/device_udpclent/src/main/resources/application.yml b/device_udpclent/src/main/resources/application.yml
index 9297701..19a3b56 100644
--- a/device_udpclent/src/main/resources/application.yml
+++ b/device_udpclent/src/main/resources/application.yml
@@ -11,4 +11,7 @@ logging:
       boot:
         autoconfigure:
           logging: debug
+  level:
+    com.xr.device_udpclent: debug
+