From 7038a7eff19b407c44e012adbba2d9711ea38f49 Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Mon, 21 Apr 2025 09:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E9=99=84=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=A1=B6=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E6=A1=B6=EF=BC=88=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=98=E9=87=8F=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BE=BF?=
 =?UTF-8?q?=E4=BA=8E=E4=B8=9A=E5=8A=A1=E7=90=86=E8=A7=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeBikeInfoController.java   | 14 +--
 .../impl/EbikeBikeInfoServiceImpl.java        | 47 +++++-----
 .../ebikemaintenance/utils/MinioUtil.java     |  6 +-
 .../model/entity/EbikeUserBacksite.java       | 22 +----
 .../orders/EbikeOrdersApplicationTests.java   | 85 +++++++++++++++++++
 5 files changed, 119 insertions(+), 55 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
index 1ae60682..81f677e0 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
@@ -362,22 +362,22 @@ public class EbikeBikeInfoController {
     public JsonResult<?> fileUpload(@RequestParam("multipartFile") MultipartFile multipartFile) {
 
         try {
-            minioUtil.createBucket("fault-report-bucket");
+            minioUtil.createBucket(MinioUtil.BUCKET_FAULT);
             InputStream inputStream = multipartFile.getInputStream();
             String fileName = multipartFile.getOriginalFilename();
             String fileUniqueKey = UUID.randomUUID() + fileName.substring(fileName.lastIndexOf("."));
-            minioUtil.uploadFile(inputStream, "fault-report-bucket", fileUniqueKey);
-            String fileUrl = minioUtil.getFileUrl("fault-report-bucket", fileUniqueKey);
+            minioUtil.uploadFile(inputStream, MinioUtil.BUCKET_FAULT, fileUniqueKey);
+            String fileUrl = minioUtil.getFileUrl(MinioUtil.BUCKET_FAULT, fileUniqueKey);
             ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
             resEbikeFaultReportFileDto.setUrl(fileUrl);
             resEbikeFaultReportFileDto.setFileUniqueKey(fileUniqueKey);
-            resEbikeFaultReportFileDto.setFileBucket("fault-report-bucket");
+            //resEbikeFaultReportFileDto.setFileBucket(MinioUtil.BUCKET_FAULT);
             resEbikeFaultReportFileDto.setFileName(fileName);
             resEbikeFaultReportFileDto.setFileType(fileName.substring(fileName.lastIndexOf(".")));
             resEbikeFaultReportFileDto.setFileSize(multipartFile.getSize());
             return JsonResult.success(resEbikeFaultReportFileDto);
         } catch (Exception e) {
-            log.error("fileUpload===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("fileUpload===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return JsonResult.failed("上传失败");
         }
     }
@@ -392,10 +392,10 @@ public class EbikeBikeInfoController {
     public JsonResult<?> deletedFile(@RequestParam(name = "fileUniqueKey") String fileUniqueKey) {
 
         try {
-            minioUtil.deleteObject("fault-report-bucket", fileUniqueKey);
+            minioUtil.deleteObject(MinioUtil.BUCKET_FAULT, fileUniqueKey);
             return JsonResult.success("删除成功");
         } catch (Exception e) {
-            log.error("deletedFile===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("deletedFile===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return JsonResult.failed("删除失败");
         }
     }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index 8cf9d529..c4af90e2 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -146,7 +146,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeBikeInfoMapper.insert(ebikeBikeInfo);
             return true;
         } catch (Exception e) {
-            log.error("saveEbikeInfo===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("saveEbikeInfo===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -170,7 +170,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeHelmetChangeMapper.insert(ebikeBikeHelmetChange);
             return true;
         } catch (Exception e) {
-            log.error("updateEbikeHelmet===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("updateEbikeHelmet===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -196,7 +196,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeBikeEcuMapper.insert(ebikeBikeEcu);
             return true;
         } catch (Exception e) {
-            log.error("updateEbikeEcu===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("updateEbikeEcu===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -245,7 +245,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             return resEbikeBikeAndEcuCodeDto;
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("getBikeINfoData===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("getBikeINfoData===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return null;
         }
     }
@@ -311,7 +311,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeBikeQrcodeMapper.insert(ebikeBikeQrcodeRecords);
             return true;
         } catch (Exception e) {
-            log.error("updateBikeQRCode===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("updateBikeQRCode===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -367,7 +367,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                     reqBulkDeliveryDto.getStatus(), reqBulkDeliveryDto.getRegionId());
             return true;
         } catch (Exception e) {
-            log.error("vehicleLeaveWarehouse===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("vehicleLeaveWarehouse===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -399,7 +399,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             }
             return true;
         } catch (Exception e) {
-            log.error("faultReporting===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("faultReporting===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -436,8 +436,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
                 BeanUtils.copyProperties(ebikeBikeFaultReportFile, resEbikeFaultReportFileDto);
                 //try {
-                    String bucket = ebikeBikeFaultReportFile.getFileBucket();
-                    String faultReportBucket = minioUtil.getFileUrl2(bucket==null||bucket.isEmpty()? "fault-report-bucket": bucket, ebikeBikeFaultReportFile.getFileUniqueKey());
+                    String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultReportFile.getFileBucket(), ebikeBikeFaultReportFile.getFileUniqueKey());
                     resEbikeFaultReportFileDto.setUrl(faultReportBucket);
                 //} catch (Exception e) {
                 //    throw new RuntimeException(e);
@@ -661,7 +660,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             query.eq(EBIKE_BIKE_ORDER.IS_DELETED.getName(), "0");
             return ebikeBikeOrderMapper.selectOneByQuery(query);
         } catch (Exception e) {
-            log.error("inspectHaveOrNotWorkOrder===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("inspectHaveOrNotWorkOrder===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return null;
         }
 
@@ -682,7 +681,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             EbikeBikeInfo ebikeBikeInfo = ebikeBikeInfoMapper.selectOneByQuery(query);
             return ebikeBikeInfo != null;
         } catch (Exception e) {
-            log.error("inspectHaveOrNotWorkOrder===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("inspectBikeHaveOrNot===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -710,7 +709,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 resEbikeBikeFaultReportListDtos.add(resEbikeBikeFaultReportListDto);
             }
         } catch (Exception e) {
-            log.error("inspectHaveOrNotWorkOrder===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("getFaultReportList===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
         }
         return resEbikeBikeFaultReportListDtos;
     }
@@ -848,7 +847,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             }
             return true;
         } catch (Exception e) {
-            log.error("inspectHaveOrNotWorkOrder===>" + e.getMessage() + Arrays.toString(e.getStackTrace()));
+            log.error("canCellWorkOrder===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));
             return false;
         }
     }
@@ -1013,13 +1012,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             for (EbikeBikeFaultReportFile ebikeBikeFaultReportFile : ebikeBikeFaultReportFiles) {
                 ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
                 BeanUtils.copyProperties(ebikeBikeFaultReport, resEbikeFaultReportFileDto);
-                try {
-                    String bucket = ebikeBikeFaultReportFile.getFileBucket();
-                    String faultReportBucket = minioUtil.getFileUrl(bucket==null||bucket.isEmpty()?"fault-report-bucket" : bucket, ebikeBikeFaultReportFile.getFileUniqueKey());
+                //try {
+                    String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultReportFile.getFileBucket(), ebikeBikeFaultReportFile.getFileUniqueKey());
                     resEbikeFaultReportFileDto.setUrl(faultReportBucket);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+                //} catch (Exception e) {
+                //    throw new RuntimeException(e);
+                //}
                 faultReportFiles.add(resEbikeFaultReportFileDto);
             }
         }
@@ -1029,13 +1027,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         for (EbikeBikeFaultHandleFile ebikeBikeFaultHandleFile : ebikeBikeFaultHandleFiles) {
             ResEbikeFaultHandleFileDto resEbikeFaultHandleFileDto = new ResEbikeFaultHandleFileDto();
             BeanUtils.copyProperties(ebikeBikeFaultHandleFile, resEbikeFaultHandleFileDto);
-            try {
-                String bucket = ebikeBikeFaultHandleFile.getFileBucket();
-                String faultReportBucket = minioUtil.getFileUrl(bucket==null||bucket.isEmpty()?"fault-report-bucket": bucket, ebikeBikeFaultHandleFile.getFileUniqueKey());
+            //try {
+                String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultHandleFile.getFileBucket(), ebikeBikeFaultHandleFile.getFileUniqueKey());
                 resEbikeFaultHandleFileDto.setUrl(faultReportBucket);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+            //} catch (Exception e) {
+            //    throw new RuntimeException(e);
+            //}
             faultHandleFiles.add(resEbikeFaultHandleFileDto);
         }
         //寻找最新的上报时间
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java
index aa88f5b1..4f78e2a9 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java
@@ -14,6 +14,8 @@ import java.util.stream.Collectors;
 @Component
 public class MinioUtil {
 
+    public final static String BUCKET_FAULT = "fault-report-bucket";
+
     @Resource
     private MinioClient minioClient;
 
@@ -55,7 +57,7 @@ public class MinioUtil {
         return minioClient.getPresignedObjectUrl(
                 GetPresignedObjectUrlArgs.builder()
                         .method(Method.GET)
-                        .bucket(bucket)
+                        .bucket(bucket==null||bucket.isEmpty()? BUCKET_FAULT: bucket)
                         .object(fileName)
                         .expiry(7, TimeUnit.DAYS)  // 有效期7天
                         .build()
@@ -71,7 +73,7 @@ public class MinioUtil {
      */
     public String getFileUrl2(String bucket, String fileName){
         try {
-            String url = getFileUrl(bucket, fileName);
+            String url = getFileUrl(bucket==null||bucket.isEmpty()? BUCKET_FAULT: bucket, fileName);
             return url;
         }catch (Exception e){
             return null;
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserBacksite.java b/ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserBacksite.java
index d1d169bc..c919a78b 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserBacksite.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserBacksite.java
@@ -14,7 +14,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * 还车点申请表 实体类。
+ * 还车点申请 实体类。
  *
  * @author dingchao
  * @since 2025-04-15
@@ -76,24 +76,4 @@ public class EbikeUserBacksite implements Serializable {
      */
     private String applyReason;
 
-    /**
-     * 处理状态
-     */
-    private String dealState;
-
-    /**
-     * 操作人
-     */
-    private String dealUser;
-
-    /**
-     * 处理时间
-     */
-    private LocalDateTime dealTime;
-
-    /**
-     * 操作备注
-     */
-    private String dealNotes;
-
 }
diff --git a/ebike-orders/src/test/java/com/cdzy/orders/EbikeOrdersApplicationTests.java b/ebike-orders/src/test/java/com/cdzy/orders/EbikeOrdersApplicationTests.java
index 938c6b51..6de3bbce 100644
--- a/ebike-orders/src/test/java/com/cdzy/orders/EbikeOrdersApplicationTests.java
+++ b/ebike-orders/src/test/java/com/cdzy/orders/EbikeOrdersApplicationTests.java
@@ -8,6 +8,9 @@ import com.cdzy.orders.mapper.UserOrdersMapper;
 import com.cdzy.orders.model.dto.res.RedisPoint;
 import com.cdzy.orders.model.entity.UserOrders;
 import com.cdzy.orders.uitls.RedisUtil;
+import com.mybatisflex.codegen.Generator;
+import com.mybatisflex.codegen.config.GlobalConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import com.cdzy.orders.uitls.TimeUtils;
 import com.ebike.feign.clients.MaintenanceFeignClient;
 import com.ebike.feign.model.rsp.FeignEbikeBikeInfoDto;
@@ -42,6 +45,88 @@ class EbikeOrdersApplicationTests {
         nearbyMembers.forEach(System.out::println);
     }
 
+    private static final String model_path ="D:/Projects/eBIKE/mybatis-flex/ebike-orders";
+    private static final String mapperPath="D:/Projects/eBIKE/mybatis-flex/ebike-orders/resources/mapper";
+    private static final String packageName ="com.cdzy.orders";
+    private static final String[] tables= new String[]{
+            "ebike_order_attachment_file",
+            "ebike_user_faultreport",
+            "ebike_attachefile_assosiated",
+            "ebike_faultreport_review",
+            "ebike_user_backsite_deal"
+    };
+
+    @Test
+    public void gen_mybatis_code() {
+        //配置数据源
+        HikariDataSource dataSource = new HikariDataSource();
+        dataSource.setJdbcUrl("jdbc:mysql://192.168.2.226:3306/ebike_orders?characterEncoding=utf-8");
+        dataSource.setUsername("root");
+        dataSource.setPassword("970529");
+        //生成全库的
+        GlobalConfig globalConfig = createGlobalConfigUseStyle2();
+        //单表的
+        //        GlobalConfig globalConfig = createGlobalConfigUseStyle2();
+        Generator generator = new Generator(dataSource, globalConfig);
+        //生成代码
+        generator.generate();
+    }
+    private GlobalConfig createGlobalConfigUseStyle1() {
+        // 创建配置内容
+        GlobalConfig globalConfig = new GlobalConfig();
+        // 设置项目源目录和基础包
+        globalConfig.getPackageConfig()
+                .setSourceDir(model_path)
+                .setBasePackage(packageName);
+        // 启用生成 entity，并启用 Lombok
+        globalConfig.setEntityGenerateEnable(true);
+        globalConfig.setEntityWithLombok(true);
+        // 设置项目的JDK版本
+        globalConfig.setEntityJdkVersion(17);
+        // 启用生成 mapper、service、controller
+        globalConfig.enableEntity();
+        globalConfig.enableMapper();
+        globalConfig.enableService();
+        globalConfig.enableServiceImpl();
+        globalConfig.enableController();
+        globalConfig.enableMapperXml();
+        globalConfig.setMapperXmlPath(mapperPath);
+        // 配置 Mapper XML 生成路径和文件名
+        globalConfig.getMapperXmlConfig()
+                .setFilePrefix("")  // 设置合适的前缀
+                .setFileSuffix("Mapper");  // 确保设置正确的后缀名
+        return globalConfig;
+    }
+    private GlobalConfig createGlobalConfigUseStyle2() {
+        // 创建配置内容
+        GlobalConfig globalConfig = new GlobalConfig();
+        // 设置项目源目录和基础包
+        globalConfig.getPackageConfig()
+                .setSourceDir(model_path)
+                .setBasePackage(packageName);
+        // 启用生成 entity，并启用 Lombok
+        globalConfig.setEntityGenerateEnable(true);
+        globalConfig.setEntityWithLombok(true);
+        // 设置项目的JDK版本
+        globalConfig.setEntityJdkVersion(17);
+        // 启用生成 mapper、service、controller
+        globalConfig.enableEntity();
+        globalConfig.enableMapper();
+        globalConfig.enableService();
+        globalConfig.enableServiceImpl();
+        globalConfig.enableController();
+        globalConfig.enableMapperXml();
+        globalConfig.setMapperXmlPath(mapperPath);
+        // 配置 Mapper XML 生成路径和文件名
+        globalConfig.getMapperXmlConfig()
+                .setFilePrefix("")  // 设置合适的前缀
+                .setFileSuffix("Mapper");  // 确保设置正确的后缀名
+        //设置表前缀和只生成哪些表
+        //        globalConfig.setTablePrefix("tb_");
+        globalConfig.setGenerateTable(tables);
+        // 返回配置
+        return globalConfig;
+    }
     @Test
     void time() {
         UserOrders userOrders = ordersMapper.selectOneById(267861509802156032L);