From ccfb7dd5574724024bc2c48d3ca36f9c8b6896d4 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 14 十二月 2023 10:27:10 +0800
Subject: [PATCH] 重置密码

---
 src/main/java/com/whyc/service/DevUpdateStateService.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/whyc/service/DevUpdateStateService.java b/src/main/java/com/whyc/service/DevUpdateStateService.java
index e135a49..318b7ec 100644
--- a/src/main/java/com/whyc/service/DevUpdateStateService.java
+++ b/src/main/java/com/whyc/service/DevUpdateStateService.java
@@ -1,7 +1,9 @@
 package com.whyc.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.whyc.mapper.DevUpdateStateMapper;
+import com.whyc.pojo.DevUpdateState;
 import com.whyc.pojo.Response;
 import com.whyc.util.FileDirPath;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,13 +19,13 @@
 public class DevUpdateStateService {
     @Autowired(required = false)
     private DevUpdateStateMapper mapper;
-    //妫�娴嬫槸鍚﹀瓨鍦ㄩ噸鏂颁笂浼犵殑浜鸿劯
-    public boolean updateDfu(MultipartFile file,int devId){
+    //妫�娴嬫槸鍚﹀瓨鍦ㄦ枃浠�
+    public boolean copyDfu(MultipartFile file,int devId){
         boolean bl=false;
         String fileDirName = FileDirPath.getFileDirName();
         String root=fileDirName+ File.separator+"FDFiles"+File.separator+devId+File.separator+"update";
         String fileFileName = file.getOriginalFilename();
-        String filePath = root + fileFileName;
+        String filePath = root +File.separator+ fileFileName;
         createFilefolderIFNotExist(filePath);
         try {
             file.transferTo(new File(filePath));
@@ -35,19 +37,19 @@
 
     }
     //杩滅▼鍗囩骇
-    public Response updateDfu(MultipartFile file, DevUpdateState dfu) {
+    public Response updateDfu(MultipartFile file,int devId) {
         if(file==null){
             return new Response().set(1,false,"鏂囦欢澶辫触,鏂囦欢涓嶅瓨鍦�");
         }
         String fileFileName = file.getOriginalFilename();
-        boolean bl=updateDfu(file,dfu.getDevId());
+        boolean bl=copyDfu(file,devId);
         if(bl){
             UpdateWrapper wrapper=new UpdateWrapper();
             wrapper.set("dfu_file",fileFileName);
             wrapper.set("dfu_en",1);
-            wrapper.set("dfu_wr_stat",dfu.getDfuWrStat());
-            wrapper.set("dfu_data_blocknum",dfu.getDfuDataBlocknum());
-            wrapper.eq("dev_id",dfu.getDevId());
+            wrapper.set("dfu_wr_stat",1);
+            wrapper.set("dfu_data_blocknum",1);
+            wrapper.eq("dev_id",devId);
             mapper.update(null,wrapper);
             return new Response().set(1,bl,"鍗囩骇鏂囦欢涓婁紶鎴愬姛");
         }else {
@@ -63,4 +65,13 @@
         mapper.update(null,wrapper);
         return new Response().set(1,true);
     }
+
+    //dfu杩滅▼鍗囩骇鐨剋ebsocket瀹炴椂鎺ㄩ�佽澶囧崌绾�
+    public Response getDfuStatus(int devId) {
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("dev_id",devId);
+        queryWrapper.last("limit 1");
+        DevUpdateState dfu=mapper.selectOne(queryWrapper);
+        return new Response().setII(1,dfu!=null,dfu,"涓嬭浇鎴愬姛杩斿洖鏁版嵁");
+    }
 }

--
Gitblit v1.9.1