From 1f7c1f07cdb00c04257a0b3f4616e4333978c413 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 27 Jun 2023 09:14:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?update=20=E9=AB=98=E5=BE=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/service/PileRemoteService.java | 10 ++++---- .../controller/pile/PileRemoteController.java | 7 +++--- .../test/java/SpringBootTestController.java | 2 +- .../ykcCommond/UpdateFirmwareCommand.java | 6 ++++- .../jsowell/pile/dto/UpdateFirmwareDTO.java | 24 +++++++++++++++++++ .../impl/YKCPushCommandServiceImpl.java | 2 +- jsowell-ui/src/views/pile/basic/detail.vue | 15 ++++++++---- 7 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java index eb5527f39..7ca899c46 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ykcCommond.*; import com.jsowell.pile.dto.RemoteAccountBalanceUpdateDTO; +import com.jsowell.pile.dto.UpdateFirmwareDTO; import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.domain.PileBillingRelation; import com.jsowell.pile.domain.PileBillingTemplate; @@ -185,12 +186,13 @@ public class PileRemoteService { /** * 远程更新 - * - * @param pileSns 前台传的桩号集合 */ - public void updateFirmware(List pileSns) { + public void updateFirmware(UpdateFirmwareDTO dto) { // - UpdateFirmwareCommand command = UpdateFirmwareCommand.builder().pileSnList(pileSns).build(); + UpdateFirmwareCommand command = UpdateFirmwareCommand.builder() + .pileSnList(dto.getPileSns()) + .filePath(dto.getFilePath()) + .build(); ykcPushCommandService.pushUpdateFileCommand(command); } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java index 2a8caf97a..ba9f28a43 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java @@ -5,6 +5,7 @@ import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.dto.QueryPileDTO; +import com.jsowell.pile.dto.UpdateFirmwareDTO; import com.jsowell.service.OrderService; import com.jsowell.service.PileRemoteService; import org.apache.commons.collections4.CollectionUtils; @@ -105,11 +106,11 @@ public class PileRemoteController { * @return */ @PostMapping("/updateFirmware") - public AjaxResult updateFirmware(@RequestBody QueryPileDTO queryPileDTO) { - if (CollectionUtils.isEmpty(queryPileDTO.getPileSns())) { + public AjaxResult updateFirmware(@RequestBody UpdateFirmwareDTO dto) { + if (CollectionUtils.isEmpty(dto.getPileSns())) { return AjaxResult.error("参数不能为空"); } - pileRemoteService.updateFirmware(queryPileDTO.getPileSns()); + pileRemoteService.updateFirmware(dto); return AjaxResult.success(); } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 51e6b25ee..db78c6409 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -973,7 +973,7 @@ public class SpringBootTestController { public void testRemoteUpdate() { ArrayList list = new ArrayList<>(); list.add("88000000000001"); - pileRemoteService.updateFirmware(list); + // pileRemoteService.updateFirmware(list); } @Test diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java index cac3a4255..39ceb78c0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java @@ -12,5 +12,9 @@ import java.util.List; @AllArgsConstructor @Builder public class UpdateFirmwareCommand { - List pileSnList; + private List pileSnList; + + // /update.bin + private String filePath; + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java new file mode 100644 index 000000000..64a8a8a11 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java @@ -0,0 +1,24 @@ +package com.jsowell.pile.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class UpdateFirmwareDTO { + /** + * 桩编码List + */ + private List pileSns; + + /** + * 固件路径 + */ + private String filePath; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index 2cc895c1b..6b0dd4f64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -340,7 +340,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { byte[] passwordByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.updateServerPassword), 32); // 文件路径 - byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.filePath), 64); + byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(command.getFilePath()), 64); // 执行控制 01：立即执行 02：空闲执行 byte[] performTypeByteArr = Constants.oneByteArray; diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue index 83222bd20..a19444cb2 100644 --- a/jsowell-ui/src/views/pile/basic/detail.vue +++ b/jsowell-ui/src/views/pile/basic/detail.vue @@ -213,10 +213,14 @@ - - - 远程升级 - + + + 远程升级 + + + + 远程升级2 + @@ -290,9 +294,10 @@ export default { }, methods: { // 远程升级固件 - updateFirmware() { + updateFirmware(filePath) { const data = { pileSns: [this.pileSn], + filePath: filePath }; console.log("远程升级固件:", data); updateFirmware(data).then((response) => { From 62264c59f571fe6ffe6bf07252ecb6f4531a1cdc Mon Sep 17 00:00:00 2001 From: admin-lmm <2497833386@QQ.com> Date: Tue, 27 Jun 2023 09:16:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/assets/images/dingdan.png | Bin 3277 -> 3540 bytes jsowell-ui/src/assets/images/shebei.png | Bin 4675 -> 2607 bytes jsowell-ui/src/assets/images/zongfeiyong.png | Bin 9084 -> 5980 bytes jsowell-ui/src/views/homeIndex/homeIndex.vue | 13 +++++++------ .../pile/merchant/components/adapayMember.vue | 14 +++++++------- .../pile/merchant/components/revenue.vue | 6 ++++-- jsowell-ui/src/views/pile/merchant/detail.vue | 4 ++-- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/jsowell-ui/src/assets/images/dingdan.png b/jsowell-ui/src/assets/images/dingdan.png index f52bfa0447bf316caa7ba5943c7fb941c770e198..2a859eb19bcd13824749106e14abceb8c0969b13 100644 GIT binary patch literal 3540 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 Wlw>z4I9)cz|6Sa`a86mkO6~7L`z&q% literal 3277 zcmds4X;4#H77iLEY$DJQCLNZD+BFzaDChy2Cd!VWs0|pDB@Nn$EMYMa76}FjU?9L? zv&bejDs}}SAQ@u9(yt-JHVOir&^brU8&$(-sd+oMvWfp`S5f4h#%DKB@+A_eN&TN(F`E{DpwP zm+!WLOx30=`2t-2V~yjj&9mFB>3Ysbkv@SZaB0egTbgzU0sH$WI+c?-oDRJ0Q6gn~ zQP3pqQ>p6VtMrtJD#1y(Q7DxJlXD&EN&b{PjJvrc;+Fn=YhRcL z2C&Z{b2n$Erltmd8n{#6z$Cv&K|8Bg_qf)PiK|vI<9z;Ns{Z^_Nl*15svowd5j60* zJ~K_iuzq8cOyigR78J>$I8l@i;%*3 z>y`;Pv&>9OOzbGw0nPuuISu=nFK}GJ0V$Xi4?UV zRJO3!a>5Gm{1VZYp<}+>6i&agj=^_vLDG0gFXxFEau(iRyt)cbo$~Q-OAq4E-zK4c zi=~Q$U#pA3)Nx#dVjU!<{dQ5_t)sE_rNR4TP3j zAN;I4Qx6+6)<#h9K?-_g_eR8H#Y8SY<#YO~15FjFv33pnD}U)LKDsaTKvNi}g0LEI zlBu6SMkbJ(t#9gH@@l>S;$pO=_O`&J|NHJrPP9SJ&WP>%a4%}{PKnHZZDO~lqq;OF zOlvU?Dzo`4LY%y2e%(J#$&yrbL(?RpO2GQQG)HQIym7+7 zi=~ux?mw1bTyfc$QJg(Xe(gR5jB<@vc$&mVi8*OR+5IF+m@P8rCilX{WnP2Y_Eq0DmI!Gh6`o1B^TbO;I(aE<`xH=}@mT#^25BBqU( zo4kYRlzH?3;Ks_z&5rBJetfzY6hRnkO`PlR5K%2ySmu}#M5$SVV+*D^LD~$pP4W5 zkZ+k~4UM4B)dn`7*kFZAC-=K=fN^9Bk1d5pC7?z z!!_d7{4oGE@Y6Lz`M0ssPMP5}xgq@PiZdl~VFfQUgYD;-I#j>wPz84-AQnJXsE&{VmmA^C*UwMSbCRK!O*9&AKL(gv$G`q6MpB&23KH1N zL;X^KUSU)wT{Vsxj(f#}`pQhTLpo*j@!(@q*%Tj^x|)FuB17Hx49+YfoVEbW595oV zw)_ZYBQKWQCv$uMB6q{A5rsHg*GSv<((iM4Ul8IGA1422v+>`Aa~;w=IAxRy_|VoT zTu8z6l@Ox!aazH>3LYnew`lIjZqG|Sc07|!D>T7%7Gh#mjUC7fZ(Z^CW>5|8It{g< zh|${!v2}4=r#Yq7TJ*cDqbCJG8Z#EQI5*2ACy|W1OE0TN&d&_hLn=6?GY@lqS|*ci zX`48<=YM-ek;z65q7?OVL|jd!#0o za2pE~d1Dpz$2}H@$>FP3l7OJ&CFSP$HZkH-dp^aWduR1zBd&Mfb~vR_Zr`|!5N&wZ oac!=#GPXSbJBt2~4+Uv$>KopI>x0>Y&@%<*>3Ytk(TPC)C&}30!~g&Q diff --git a/jsowell-ui/src/assets/images/shebei.png b/jsowell-ui/src/assets/images/shebei.png index 1f42f20b502ad970b019ed4e2b9a244dda844032..daf09e1b05ee054e13128890592d3e245088efde 100644 GIT binary patch literal 2607 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�T`cQY<N_9f5U}9t1 zBf>Q!nx$>9_ez-xN~>*r`96q}tf^TElp&xB^j)-^8z#<`ecf;cgUjUebwIh!@*1;1 z8smU`Fl%l4l5HYxrf-5IEUg1&{cQx7o-)`?oyvSYElQ0O8GHnTGME2sr1&<26`Lc` zpiK1K>3fFRz9=(q{ibR}!pH!1^SM4l~!Cikwxds|qqMZL?5TV%e zM|g_9qHlCaRGg}bTLAg+tQsO&$;HV5+Y2ihCvh!8GzUA51Wn9&XEV!@x^LNK(fSHM z!lQRrAt|#Cn~^NgZHk&4xTJh60!R9%7s`D^~Dx4o&`p+1>>>x{fDb1OZF tQ@T^0w6FOB9Ut3&+X!TJ6eCYtbH=8iPLVMEP&*s~c^y9KL3a!O>Aw!J11SIi diff --git a/jsowell-ui/src/assets/images/zongfeiyong.png b/jsowell-ui/src/assets/images/zongfeiyong.png index f3f5183f1ebfd780990d29c12a43d0f1fa86d7c0..9838a5cf9208922afcc41f87fb46d76e0e77f57d 100644 GIT binary patch literal 5980 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 literal 9084 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 diff --git a/jsowell-ui/src/views/homeIndex/homeIndex.vue b/jsowell-ui/src/views/homeIndex/homeIndex.vue index 0edfe8916..17142b9d3 100644 --- a/jsowell-ui/src/views/homeIndex/homeIndex.vue +++ b/jsowell-ui/src/views/homeIndex/homeIndex.vue @@ -8,9 +8,8 @@ :src="require('@/assets/images/lightning.png')" />
- {{ generalSituation.totalChargingDegree }} + {{ generalSituation.totalChargingDegree}}
总充电电量(度)
-
@@ -19,7 +18,6 @@
{{ generalSituation.totalChargingAmount}}
总充电费用(元)
-
@@ -29,7 +27,6 @@
{{ generalSituation.totalChargingQuantity}}
总充电订单数(笔)
-
@@ -39,7 +36,6 @@
{{ generalSituation.totalPileQuantity }}
总充电设备数量(座)
-
@@ -50,7 +46,6 @@
{{ generalSituation.totalMemberAmount }}
总客户余额(元)
-
@@ -366,9 +361,15 @@ export default { box-shadow: 0 15px 10px -11px #1ab394; margin-right: 24px; margin-bottom: 20px; + position: relative; .box-image{ width: 60px; height: 60px; + // background-size: 100% 100%; + // position: absolute; + // right: 0; + // bottom: 0; + // filter: drop-shadow(40px 0px gray); } .flex1{ flex: 1; diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 1ffef9950..3e61cce8a 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -18,18 +18,18 @@