diff --git a/src/main/java/com/glxp/api/config/MinioConfig.java b/src/main/java/com/glxp/api/config/MinioConfig.java
index 39f14056..23c81fdb 100644
--- a/src/main/java/com/glxp/api/config/MinioConfig.java
+++ b/src/main/java/com/glxp/api/config/MinioConfig.java
@@ -9,8 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
-@RequiredArgsConstructor
+//@Configuration
+//@RequiredArgsConstructor
 public class MinioConfig {
 
     @Data
diff --git a/src/main/java/com/glxp/api/constant/SocketMsgType.java b/src/main/java/com/glxp/api/constant/SocketMsgType.java
index 5d8e8e8f..aeaf7329 100644
--- a/src/main/java/com/glxp/api/constant/SocketMsgType.java
+++ b/src/main/java/com/glxp/api/constant/SocketMsgType.java
@@ -10,6 +10,7 @@ public interface SocketMsgType {
      * 任务类型
      */
     String TASK_INVOICE_CONFIRM = "TASK_INVOICE_CONFIRM";       //发票确认
+    String TASK_SYNC_DELETE = "TASK_SYNC_DELETE";               //同步删除
 
     String BASIC_DATA_DELETE = "BASIC_DATA_DELETE"; //耗材字典删除
 
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 67392b1c..7a059c65 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -680,6 +680,9 @@ public class IoOrderController extends BaseController {
     public BaseResponse updateOrder(@RequestBody IoOrderEntity ioOrderEntity) {
         ioOrderEntity.setUpdateTime(new Date());
         orderService.updateByBillNo(ioOrderEntity);
+
+//        webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.TASK_SYNC_DELETE).content(ioOrderEntity.getBillNo()).remark("单据删除").build(), null);
+
         webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.TASK_INVOICE_CONFIRM).content(ioOrderEntity.getBillNo()).remark("发票确认").build(), null);
         return ResultVOUtils.success();
     }
diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java
index a33fb0e4..195bf2b5 100644
--- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java
+++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java
@@ -53,17 +53,18 @@ public class DeviceInspectTakeController {
         PageInfo<DeviceInspectTakeResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
+
     @PostMapping("/udiwms/inv/device/inspect/take/uploadDeviceInspecTake")
     public BaseResponse uploadDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
         deviceInspectTaskEntity.setUpdateTime(new Date());
-        if(deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_DURINGINSPECTTION){
+        if (deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_DURINGINSPECTTION) {
             deviceInspectTaskEntity.setStrartTime(new Date());
-        }else if (deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_INSPECTED){
+        } else if (deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_INSPECTED) {
             deviceInspectTaskEntity.setEndTime(new Date());
         }
-        boolean falg=deviceInspectTaskService.updateById(deviceInspectTaskEntity);
-        if(!falg){
-            return ResultVOUtils.error(999,"更新失败");
+        boolean falg = deviceInspectTaskService.updateById(deviceInspectTaskEntity);
+        if (!falg) {
+            return ResultVOUtils.error(999, "更新失败");
         }
         return ResultVOUtils.success();
     }
@@ -71,71 +72,67 @@ public class DeviceInspectTakeController {
     @PostMapping("/udiwms/inv/device/inspect/take/uploadDeviceTake")
     public BaseResponse uploadDeviceTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
         deviceInspectTaskEntity.setUpdateTime(new Date());
-        boolean falg=deviceInspectTaskService.updateById(deviceInspectTaskEntity);
-        if(!falg){
-            return ResultVOUtils.error(999,"更新失败");
+        boolean falg = deviceInspectTaskService.updateById(deviceInspectTaskEntity);
+        if (!falg) {
+            return ResultVOUtils.error(999, "更新失败");
         }
         return ResultVOUtils.success();
     }
 
 
-
     @PostMapping("/udiwms/inv/device/inspect/take/addDeviceInspecTake")
-    public BaseResponse addDeviceInspecTake(@RequestBody  DeviceInspectTaskEntity deviceInspectTaskEntity) {
+    public BaseResponse addDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
         String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_PLAN_ORDER, "yyyyMMdd"));
         deviceInspectTaskEntity.setOrderId(orderId);
         deviceInspectTaskEntity.setCreateTime(new Date());
-         deviceInspectTaskService.addDeviceInspectTask(deviceInspectTaskEntity);
-         return ResultVOUtils.success(deviceInspectTaskEntity);
+        deviceInspectTaskService.addDeviceInspectTask(deviceInspectTaskEntity);
+        return ResultVOUtils.success(deviceInspectTaskEntity);
     }
 
     @PostMapping("/udiwms/inv/device/inspect/take/delectDeviceInspecTake")
-    public BaseResponse delectDeviceInspecTake(@RequestBody  DeviceInspectTaskEntity deviceInspectTaskEntity) {
+    public BaseResponse delectDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
 
         deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity);
         return ResultVOUtils.success(deviceInspectTaskEntity);
     }
 
 
-   //从管理接收任务信息
+    //从管理接收任务信息
     @PostMapping("/deviceTakeApi/sps/sync/deviceTake/upload")
     public BaseResponse getDeviceInspecTake(@RequestBody SpsSyncDeviceTakeResponse spsSyncDeviceTakeResponse) {
 
         //新增
-       if(spsSyncDeviceTakeResponse.getType() == 1){
-        DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity();
-           deviceInspectTaskEntity.setId(null);
-           deviceInspectTaskService.save(deviceInspectTaskEntity);
-           List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList();
-           for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) {
-               deviceInspectTaskDetailEntity.setId(null);
-               deviceInspectTaskDetailService.save(deviceInspectTaskDetailEntity);
-           }
-       }else if(spsSyncDeviceTakeResponse.getType() == 2){
-           //编辑
-           DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity();
-           deviceInspectTaskService.updateById(deviceInspectTaskEntity);
-           deviceInspectTaskDetailService.remove(new QueryWrapper<DeviceInspectTaskDetailEntity>().eq("taskOrderIdFk",deviceInspectTaskEntity.getOrderId()));
-           List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList();
-           for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) {
-               deviceInspectTaskDetailService.save(deviceInspectTaskDetailEntity);
-           }
-       }else if(spsSyncDeviceTakeResponse.getType() == 3){
-           //删除
-           DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity();
-           deviceInspectTaskService.removeById(deviceInspectTaskEntity);
-           List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList();
-           for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) {
-               deviceInspectTaskDetailService.removeById(deviceInspectTaskDetailEntity);
-           }
-       }
+        if (spsSyncDeviceTakeResponse.getType() == 1) {
+            DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity();
+            deviceInspectTaskEntity.setId(null);
+            deviceInspectTaskService.save(deviceInspectTaskEntity);
+            List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList();
+            for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) {
+                deviceInspectTaskDetailEntity.setId(null);
+                deviceInspectTaskDetailService.save(deviceInspectTaskDetailEntity);
+            }
+        } else if (spsSyncDeviceTakeResponse.getType() == 2) {
+            //编辑
+            DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity();
+            deviceInspectTaskService.updateById(deviceInspectTaskEntity);
+            deviceInspectTaskDetailService.remove(new QueryWrapper<DeviceInspectTaskDetailEntity>().eq("taskOrderIdFk", deviceInspectTaskEntity.getOrderId()));
+            List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList();
+            for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) {
+                deviceInspectTaskDetailService.save(deviceInspectTaskDetailEntity);
+            }
+        } else if (spsSyncDeviceTakeResponse.getType() == 3) {
+            //删除
+            DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity();
+            deviceInspectTaskService.removeById(deviceInspectTaskEntity);
+            List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList();
+            for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) {
+                deviceInspectTaskDetailService.removeById(deviceInspectTaskDetailEntity);
+            }
+        }
         return ResultVOUtils.success();
     }
 
 
-
-
-
     //------------------------------------------ 详情方法--------------------------------------------------------------//
     @GetMapping("/udiwms/inv/device/inspect/take/detail/selectDeviceInspecTakeDetail")
     public BaseResponse selectDeviceInspecTakeDetail(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
@@ -144,21 +141,21 @@ public class DeviceInspectTakeController {
     }
 
     @PostMapping("/udiwms/inv/device/inspect/take/detail/uploadDeviceInspecTakeDetail")
-    public BaseResponse uploadDeviceInspecTakeDetail(@RequestBody  DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
+    public BaseResponse uploadDeviceInspecTakeDetail(@RequestBody DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
         deviceInspectTaskDetailEntity.setUpdateTime(new Date());
-       boolean falg=deviceInspectTaskDetailService.uploadDeviceInspecTakeDetail(deviceInspectTaskDetailEntity);
-       if(!falg){
-           return ResultVOUtils.error(999,"更新失败");
-       }
+        boolean falg = deviceInspectTaskDetailService.uploadDeviceInspecTakeDetail(deviceInspectTaskDetailEntity);
+        if (!falg) {
+            return ResultVOUtils.error(999, "更新失败");
+        }
         return ResultVOUtils.success();
     }
 
     @PostMapping("/udiwms/inv/device/inspect/take/detail/addDeviceInspecTakeDetail")
-    public BaseResponse addDeviceInspecTakeDetail(@RequestBody  DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
+    public BaseResponse addDeviceInspecTakeDetail(@RequestBody DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
 
-        boolean falg=deviceInspectTaskDetailService.addDeviceInspectTaskDelect(deviceInspectTaskDetailEntity);
-        if(!falg){
-            return ResultVOUtils.error(999,"更新失败");
+        boolean falg = deviceInspectTaskDetailService.addDeviceInspectTaskDelect(deviceInspectTaskDetailEntity);
+        if (!falg) {
+            return ResultVOUtils.error(999, "更新失败");
         }
         return ResultVOUtils.success();
     }
@@ -166,13 +163,12 @@ public class DeviceInspectTakeController {
     @GetMapping("/udiwms/inv/device/inspect/take/detail/delectDeviceInspecTakeDetail")
     public BaseResponse delecttDeviceInspecTakeDetail(String id) {
 
-        boolean falg=deviceInspectTaskDetailService.removeById(id);
-        if(!falg){
-            return ResultVOUtils.error(999,"删除失败");
+        boolean falg = deviceInspectTaskDetailService.removeById(id);
+        if (!falg) {
+            return ResultVOUtils.error(999, "删除失败");
         }
         return ResultVOUtils.success();
     }
 
 
-
 }
diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java
index e8a107e6..4d8c5691 100644
--- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java
@@ -13,7 +13,7 @@ import java.util.Date;
 @TableName(value = "device_inspect_task_detail")
 public class DeviceInspectTaskDetailEntity implements Serializable {
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 巡检项目编码
@@ -67,4 +67,4 @@ public class DeviceInspectTaskDetailEntity implements Serializable {
     private String inspectName;
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java
index efc5e417..21c70ac9 100644
--- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java
+++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java
@@ -12,7 +12,7 @@ import java.util.Date;
 @TableName(value = "device_inspect_task")
 public class DeviceInspectTaskEntity{
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 任务单号
diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java
index c1f14b5e..1ec783aa 100644
--- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java
+++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java
@@ -1,5 +1,6 @@
 package com.glxp.api.service.inv;
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper;
@@ -16,13 +17,16 @@ public class DeviceInspectTaskDetailService extends ServiceImpl<DeviceInspectTas
     @Resource
     private DeviceInspectTaskDetailMapper deviceInspectTaskDetailMapper;
 
-    public Boolean addDeviceInspectTaskDelect(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity){
+    public Boolean addDeviceInspectTaskDelect(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
         deviceInspectTaskDetailEntity.setUpdateTime(new Date());
+        if (deviceInspectTaskDetailEntity.getId() == null) {
+            deviceInspectTaskDetailEntity.setId(IdUtil.getSnowflakeNextId());
+        }
         deviceInspectTaskDetailMapper.insert(deviceInspectTaskDetailEntity);
         return true;
     }
 
-    public Boolean addDeviceInspectTaskDelectList(List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList){
+    public Boolean addDeviceInspectTaskDelectList(List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList) {
         deviceInspectTaskDetailMapper.insertBatch(deviceInspectTaskDetailEntityList);
         return true;
     }
@@ -31,27 +35,26 @@ public class DeviceInspectTaskDetailService extends ServiceImpl<DeviceInspectTas
     public List<DeviceInspectTaskDetailEntity> selectDeviceInspectTakeDetail(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {
 
         QueryWrapper<DeviceInspectTaskDetailEntity> ew = new QueryWrapper<>();
-        if(deviceInspectTaskDetailEntity.getProjectCode() != null){
-            ew.eq("projectCode",deviceInspectTaskDetailEntity.getProjectCode());
+        if (deviceInspectTaskDetailEntity.getProjectCode() != null) {
+            ew.eq("projectCode", deviceInspectTaskDetailEntity.getProjectCode());
         }
-        if(deviceInspectTaskDetailEntity.getId() != null){
-            ew.eq("id",deviceInspectTaskDetailEntity.getId());
+        if (deviceInspectTaskDetailEntity.getId() != null) {
+            ew.eq("id", deviceInspectTaskDetailEntity.getId());
         }
-        if(deviceInspectTaskDetailEntity.getTaskOrderIdFk() != null){
-            ew.eq("taskOrderIdFk",deviceInspectTaskDetailEntity.getTaskOrderIdFk());
+        if (deviceInspectTaskDetailEntity.getTaskOrderIdFk() != null) {
+            ew.eq("taskOrderIdFk", deviceInspectTaskDetailEntity.getTaskOrderIdFk());
         }
-        if(deviceInspectTaskDetailEntity.getStatus() != null){
-            ew.like("status",deviceInspectTaskDetailEntity.getStatus());
+        if (deviceInspectTaskDetailEntity.getStatus() != null) {
+            ew.like("status", deviceInspectTaskDetailEntity.getStatus());
         }
         ew.select("*, ( SELECT `employeeName` FROM auth_user WHERE id = device_inspect_task_detail.inspectUser ) inspectName");
-        List<DeviceInspectTaskDetailEntity> deviceInspectPlanDelectEntities=deviceInspectTaskDetailMapper.selectList(ew);
+        List<DeviceInspectTaskDetailEntity> deviceInspectPlanDelectEntities = deviceInspectTaskDetailMapper.selectList(ew);
         return deviceInspectPlanDelectEntities;
     }
 
-    public Boolean uploadDeviceInspecTakeDetail(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntityList){
-        return  deviceInspectTaskDetailMapper.updateById(deviceInspectTaskDetailEntityList) > 0 ? true : false;
+    public Boolean uploadDeviceInspecTakeDetail(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntityList) {
+        return deviceInspectTaskDetailMapper.updateById(deviceInspectTaskDetailEntityList) > 0 ? true : false;
     }
 
 
-
 }
diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java
index 97cd4eaf..ccaf3c41 100644
--- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java
+++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java
@@ -1,6 +1,7 @@
 package com.glxp.api.service.inv;
 
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
@@ -20,19 +21,21 @@ public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMappe
     @Resource
     private DeviceInspectTaskMapper deviceInspectTaskMapper;
 
-   public Boolean addDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity){
-       deviceInspectTaskEntity.setUpdateTime(new Date());
-       deviceInspectTaskMapper.insert(deviceInspectTaskEntity);
-       return true;
+    public Boolean addDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity) {
+        deviceInspectTaskEntity.setUpdateTime(new Date());
+        if (deviceInspectTaskEntity.getId() == null) {
+            deviceInspectTaskEntity.setId(IdUtil.getSnowflakeNextId());
+        }
+        deviceInspectTaskMapper.insert(deviceInspectTaskEntity);
+        return true;
     }
 
-    public Boolean delectDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity){
+    public Boolean delectDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity) {
         deviceInspectTaskMapper.deleteById(deviceInspectTaskEntity);
         return true;
     }
 
 
-
     public List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest) {
         if (null == filterDeviceInspectTakeRequest) {
             return Collections.emptyList();
diff --git a/src/main/java/com/glxp/api/upload/uploadController.java b/src/main/java/com/glxp/api/upload/uploadController.java
index 6db36223..e41ddb8c 100644
--- a/src/main/java/com/glxp/api/upload/uploadController.java
+++ b/src/main/java/com/glxp/api/upload/uploadController.java
@@ -24,128 +24,128 @@ import java.util.UUID;
 @RestController
 public class uploadController {
 
-//    @Value("${file_path}")
-//    private String filePath;
-//    @Value("${file_url}")
-//    private String fileUrl;
-//    @Value("${file_lpath}")
-//    private String fileLpath;
-//    @Value("${minio_path}")
-//    private String minioPath;
-//    @Value("${minio_url}")
-//    private String minioUrl;
-//
-//
-//    /**
-//     * 上传PDF模板
-//     */
-//
-//    @PostMapping("/udiwms/upload/pdf/template/jasper")
-//    public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
-//        if (file.isEmpty()) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
-//        }
-//        // 保存文件 ---------------------
-//        String fileName = file.getOriginalFilename();
-//        String fileType = fileName.substring(fileName.lastIndexOf("."));
-//        // 文件类型判断
-//        if (StringUtils.isBlank(fileType) || !fileType.equals(".jasper")) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jasper 格式");
-//        }
-//        String newName = UUID.randomUUID() + fileType;//生成新文件名
-//        String savePath = filePath + "/pdf/template";
-//
-//        File file1 = new File(savePath);
-//        if (!file1.exists()) {// 判断目录是否存在
-//            file1.mkdirs();// 创建多层目录
-//        }
-//        file1 = new File(savePath + "/" + newName);
-//        try {
-//            file.transferTo(file1);
-//            Map<String, String> rMap = new HashMap<>();
-//            rMap.put("msg", "上传成功");
-//            rMap.put("path", newName);
-//            return ResultVOUtils.success(rMap);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
-//    }
-//
-//
-//    @PostMapping("/udiwms/upload/pdf/template/jrxml")
-//    public BaseResponse uploadPDFJrxmlTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
-//        if (file.isEmpty()) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
-//        }
-//        // 保存文件 ---------------------
-//        String fileName = file.getOriginalFilename();
-//        String fileType = fileName.substring(fileName.lastIndexOf("."));
-//        // 文件类型判断
-//        if (StringUtils.isBlank(fileType) || !fileType.equals(".jrxml")) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jrxml 格式");
-//        }
-//        String newName = UUID.randomUUID() + fileType;//生成新文件名
-//        String savePath = filePath + "/pdf/template";
-//
-//        File file1 = new File(savePath);
-//        if (!file1.exists()) {// 判断目录是否存在
-//            file1.mkdirs();// 创建多层目录
-//        }
-//        file1 = new File(savePath + "/" + newName);
-//        try {
-//            file.transferTo(file1);
-//            Map<String, String> rMap = new HashMap<>();
-//            rMap.put("msg", "上传成功");
-//            rMap.put("path", savePath + "/" + newName);
-//            return ResultVOUtils.success(rMap);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
-//    }
-//
-//    /**
-//     * 注册页面上传文件
-//     */
-//    @PostMapping("/udiwms/upload/register/file")
-//    public BaseResponse uploadRegisterFile(@RequestParam("file") MultipartFile file,
-//                                           @RequestParam("type") String type) throws UnsupportedEncodingException {
-//        if (file.isEmpty()) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
-//        }
-//        if (StringUtils.isBlank(type)) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件类型不能为空");
-//        }
-//
-//        // 保存文件 ---------------------
-//        String fileName = file.getOriginalFilename();
-//        String fileType = fileName.substring(fileName.lastIndexOf("."));
-//        // 文件类型判断
-//        if (StringUtils.isBlank(fileType) || (!fileType.equals(".jpg") && !fileType.equals(".png") && !fileType.equals(".doc") && !fileType.equals(".pdf"))) {
-//            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式");
-//        }
-//        String newName = UUID.randomUUID() + fileType;//生成新文件名
-//        String savePath = filePath + "/register/file/" + type;
-//        String savePath1 = fileLpath + "?type=" + type;
-//        String fileFullName = savePath + "/" + newName;
-//
-//        File file1 = new File(savePath);
-//        if (!file1.exists()) {// 判断目录是否存在
-//            file1.mkdirs();// 创建多层目录
-//        }
-//        file1 = new File(savePath + "/" + newName);
-//        try {
-//            file.transferTo(file1);
-////            MinioUtil.uploadFile(fileFullName, file);
-//            Map<String, String> rMap = new HashMap<>();
-//            rMap.put("msg", "上传成功");
-//            rMap.put("name", fileUrl + savePath1 + "&name=" + newName);
-//            rMap.put("type", type);
-//            return ResultVOUtils.success(rMap);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
-//    }
+    @Value("${file_path}")
+    private String filePath;
+    @Value("${file_url}")
+    private String fileUrl;
+    @Value("${file_lpath}")
+    private String fileLpath;
+    @Value("${minio_path}")
+    private String minioPath;
+    @Value("${minio_url}")
+    private String minioUrl;
+
+
+    /**
+     * 上传PDF模板
+     */
+
+    @PostMapping("/udiwms/upload/pdf/template/jasper")
+    public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
+        if (file.isEmpty()) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
+        }
+        // 保存文件 ---------------------
+        String fileName = file.getOriginalFilename();
+        String fileType = fileName.substring(fileName.lastIndexOf("."));
+        // 文件类型判断
+        if (StringUtils.isBlank(fileType) || !fileType.equals(".jasper")) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jasper 格式");
+        }
+        String newName = UUID.randomUUID() + fileType;//生成新文件名
+        String savePath = filePath + "/pdf/template";
+
+        File file1 = new File(savePath);
+        if (!file1.exists()) {// 判断目录是否存在
+            file1.mkdirs();// 创建多层目录
+        }
+        file1 = new File(savePath + "/" + newName);
+        try {
+            file.transferTo(file1);
+            Map<String, String> rMap = new HashMap<>();
+            rMap.put("msg", "上传成功");
+            rMap.put("path", newName);
+            return ResultVOUtils.success(rMap);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
+    }
+
+
+    @PostMapping("/udiwms/upload/pdf/template/jrxml")
+    public BaseResponse uploadPDFJrxmlTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
+        if (file.isEmpty()) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
+        }
+        // 保存文件 ---------------------
+        String fileName = file.getOriginalFilename();
+        String fileType = fileName.substring(fileName.lastIndexOf("."));
+        // 文件类型判断
+        if (StringUtils.isBlank(fileType) || !fileType.equals(".jrxml")) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jrxml 格式");
+        }
+        String newName = UUID.randomUUID() + fileType;//生成新文件名
+        String savePath = filePath + "/pdf/template";
+
+        File file1 = new File(savePath);
+        if (!file1.exists()) {// 判断目录是否存在
+            file1.mkdirs();// 创建多层目录
+        }
+        file1 = new File(savePath + "/" + newName);
+        try {
+            file.transferTo(file1);
+            Map<String, String> rMap = new HashMap<>();
+            rMap.put("msg", "上传成功");
+            rMap.put("path", savePath + "/" + newName);
+            return ResultVOUtils.success(rMap);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
+    }
+
+    /**
+     * 注册页面上传文件
+     */
+    @PostMapping("/udiwms/upload/register/file")
+    public BaseResponse uploadRegisterFile(@RequestParam("file") MultipartFile file,
+                                           @RequestParam("type") String type) throws UnsupportedEncodingException {
+        if (file.isEmpty()) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
+        }
+        if (StringUtils.isBlank(type)) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件类型不能为空");
+        }
+
+        // 保存文件 ---------------------
+        String fileName = file.getOriginalFilename();
+        String fileType = fileName.substring(fileName.lastIndexOf("."));
+        // 文件类型判断
+        if (StringUtils.isBlank(fileType) || (!fileType.equals(".jpg") && !fileType.equals(".png") && !fileType.equals(".doc") && !fileType.equals(".pdf"))) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式");
+        }
+        String newName = UUID.randomUUID() + fileType;//生成新文件名
+        String savePath = filePath + "/register/file/" + type;
+        String savePath1 = fileLpath + "?type=" + type;
+        String fileFullName = savePath + "/" + newName;
+
+        File file1 = new File(savePath);
+        if (!file1.exists()) {// 判断目录是否存在
+            file1.mkdirs();// 创建多层目录
+        }
+        file1 = new File(savePath + "/" + newName);
+        try {
+            file.transferTo(file1);
+//            MinioUtil.uploadFile(fileFullName, file);
+            Map<String, String> rMap = new HashMap<>();
+            rMap.put("msg", "上传成功");
+            rMap.put("name", fileUrl + savePath1 + "&name=" + newName);
+            rMap.put("type", type);
+            return ResultVOUtils.success(rMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
+    }
 }
diff --git a/src/main/java/com/glxp/api/util/MinioUtil.java b/src/main/java/com/glxp/api/util/MinioUtil.java
index 4b82148a..21b2d235 100644
--- a/src/main/java/com/glxp/api/util/MinioUtil.java
+++ b/src/main/java/com/glxp/api/util/MinioUtil.java
@@ -20,7 +20,7 @@ import java.security.NoSuchAlgorithmException;
  * minio工具类
  */
 @Slf4j
-@Component
+//@Component
 public class MinioUtil {
 
     private static MinioClient minioClient;
diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql
index 593d55b9..e0e27d66 100644
--- a/src/main/resources/schemas/schema_v2.2.sql
+++ b/src/main/resources/schemas/schema_v2.2.sql
@@ -131,4 +131,8 @@ CREATE TABLE IF NOT EXISTS `device_project_set`
   AUTO_INCREMENT = 3
   CHARACTER SET = utf8mb4
   COLLATE = utf8mb4_0900_ai_ci
-  ROW_FORMAT = Dynamic;
\ No newline at end of file
+  ROW_FORMAT = Dynamic;
+
+
+CALL Pro_Temp_ColumnWork('device_inspect_task', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('device_inspect_task_detail', 'id', 'bigint', 2);