From 06b28f194ef21c9b24d0c8e4e852af719bdce707 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Tue, 10 Sep 2024 14:18:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=85=E7=94=B5?=
 =?UTF-8?q?=E6=A1=A9=E5=9B=BA=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=97=B6=20=20?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E6=A1=86=20=20=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E5=B7=B2=E6=B7=BB=E5=8A=A0=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/firmware/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jsowell-ui/src/views/pile/firmware/index.vue b/jsowell-ui/src/views/pile/firmware/index.vue
index 5123ac5b9..554291632 100644
--- a/jsowell-ui/src/views/pile/firmware/index.vue
+++ b/jsowell-ui/src/views/pile/firmware/index.vue
@@ -96,7 +96,7 @@
         />
 
         <!-- 添加或修改充电桩固件信息对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="cancel">
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="固件名称" prop="name">
                     <el-input v-model="form.name" placeholder="请输入固件名称" />
@@ -202,6 +202,7 @@ export default {
         cancel() {
             this.open = false;
             this.reset();
+            this.$refs.upload.clearFiles();
         },
         // 表单重置
         reset() {

From d6262adf87830d1b093014267b5c483031932b53 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Tue, 10 Sep 2024 14:40:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/basic/components/remoteUpgrade.vue   | 126 ++++++++++--------
 1 file changed, 68 insertions(+), 58 deletions(-)

diff --git a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
index ff8d98d04..a617ff781 100644
--- a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
+++ b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue
@@ -1,96 +1,106 @@
 <template>
-  <div style="margin-top:10px">
-    <el-button type="primary" icon="el-icon-s-tools" round @click="dialogTableVisible = true">远程固件升级</el-button>
-    <el-dialog title="配件升级" :visible.sync="dialogTableVisible" :before-close="handleClose">
-      <el-table
-        :data="firmwareList"
-        border
-        stripe
-        ref="firmwareList"
-        >
+  <div style="margin-top: 10px">
+    <el-button
+      type="primary"
+      icon="el-icon-s-tools"
+      round
+      @click="dialogTableVisible = true"
+      >远程固件升级</el-button
+    >
+    <el-dialog
+      title="配件升级"
+      :visible.sync="dialogTableVisible"
+      :before-close="handleClose"
+    >
+      <el-table :data="firmwareList" border stripe ref="firmwareList">
         <el-table-column width="80" label="选择" @row-click="singleElection">
-            <template slot-scope="scope">
-                <el-radio class="radio" v-model="templateRadioId" :label="scope.$index+1">
-                  <p v-html>&nbsp;</p>
-                </el-radio>
-            </template>
+          <template slot-scope="scope">
+            <el-radio class="radio" v-model="templateRadioId" :label="scope.$index + 1">
+              <p v-html>&nbsp;</p>
+            </el-radio>
+          </template>
         </el-table-column>
         <el-table-column prop="name" label="固件名称"></el-table-column>
         <el-table-column prop="description" label="固件描述"></el-table-column>
         <el-table-column prop="filePath" label="路径"></el-table-column>
-      </el-table>  
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
       <div style="margin-top: 20px">
         <el-button type="primary" @click="submit">提交</el-button>
         <!-- <el-button @click="">取消选择</el-button> -->
       </div>
-    </el-dialog>  
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listFirmware } from "@/api/pile/firmware";
-import {updateFirmware} from "@/api/pile/pileRemote";
+import { updateFirmware } from "@/api/pile/pileRemote";
 export default {
-  props:['pileSn'],
+  props: ["pileSn"],
   data() {
     return {
-      templateSelection: '',
+      templateSelection: "",
       templateRadioId: null,
       dialogTableVisible: false,
-       queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                name: null,
-            },
-        multipleSelection: [],
-        firmwareList:[]
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+      },
+      multipleSelection: [],
+      firmwareList: [],
     };
   },
   methods: {
-    submit(){
-      console.log('this.templateRadioId',this.templateRadioId)
-      if(this.templateRadioId === null) return this.$modal.msgWarning('请选择文件')
+    submit() {
+      console.log("this.templateRadioId", this.templateRadioId);
+      if (this.templateRadioId === null) return this.$modal.msgWarning("请选择文件");
       //  console.log('接收传递的 pileSn',this.pileSn,this.templateRadioId);
       const data = {
         pileSns: [this.pileSn],
-        firmwareId: this.firmwareList[this.templateRadioId-1].id
+        firmwareId: this.firmwareList[this.templateRadioId - 1].id,
       };
       console.log("远程升级固件:", data);
       updateFirmware(data).then((response) => {
         console.log("updateFirmware结果：", response);
-        if(response.code === 200) {
-          this.$modal.msgSuccess('升级成功')
-          this.dialogTableVisible = false
+        if (response.code === 200) {
+          this.$modal.msgSuccess("升级成功");
+          this.dialogTableVisible = false;
         }
       });
     },
-      getList() {
-            this.loading = true;
-            listFirmware(this.queryParams).then(response => {
-              console.log('查询固件接口 firmwareList',response)
-                this.firmwareList = response.rows;
-                this.total = response.total;
-                this.loading = false;
-            });
-        },
-      // 选择单选框的点击事件
-      singleElection (row) {
-        this.templateSelection = this.firmwareList.indexOf(row);
-        console.log('this.templateSelection',this.templateSelection)
-        this.templateRadioId = row.id;
-        console.log(this.templateRadioId,'this.templateRadioId');
-      },
-      handleClose(){
-         this.dialogTableVisible = false
-        this.templateRadioId = ''
-      }
+    getList() {
+      this.loading = true;
+      listFirmware(this.queryParams).then((response) => {
+        console.log("查询固件接口 firmwareList", response);
+        this.firmwareList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 选择单选框的点击事件
+    singleElection(row) {
+      this.templateSelection = this.firmwareList.indexOf(row);
+      console.log("this.templateSelection", this.templateSelection);
+      this.templateRadioId = row.id;
+      console.log(this.templateRadioId, "this.templateRadioId");
+    },
+    handleClose() {
+      this.dialogTableVisible = false;
+      this.templateRadioId = "";
+    },
   },
   created() {
     // this.getList()
-  }
-}
+  },
+};
 </script>
 
-<style>
-
-</style>
\ No newline at end of file
+<style></style>

From eb3d74923e7e0420dcafcca030103af8f2510df2 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 10 Sep 2024 16:47:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=BA=BF=E7=A8=8B=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/framework/config/ThreadPoolConfig.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java b/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
index 2eb7b6dbe..729c46d9c 100644
--- a/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
+++ b/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
@@ -22,10 +22,10 @@ public class ThreadPoolConfig {
 	Logger log = LoggerFactory.getLogger(ThreadPoolConfig.class);
 
 	// 核心线程池大小
-	private final int corePoolSize = 50;
+	private final int corePoolSize = 500;
 
 	// 最大可创建的线程数
-	private final int maxPoolSize = 200;
+	private final int maxPoolSize = 1000;
 
 	// 队列最大长度
 	private final int queueCapacity = 1000;