:space_invader:feat: 获取旧系统的数据

pom.xml

@@ -250,6 +250,15 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>test</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/szwl/controller/SyncAdminController.java

@@ -0,0 +1,56 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAdmin;
+import com.szwl.service.TAdminService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.szwl.constant.ResponseCodesEnum.A0206;
+
+@RestController
+@RequestMapping("/oldAdmin")
+public class SyncAdminController {
+
+    TAdminService adminService;
+
+    public SyncAdminController(TAdminService adminService) {
+        this.adminService = adminService;
+    }
+
+    @ApiOperation(value = "获取某一时间段内的所有 admin 用户信息")
+    @GetMapping("/getAdminInTime")
+    public ResponseModel<List<TAdmin>> getAdminInTime(String startTime, String endTime) {
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            LambdaQueryWrapper<TAdmin> lqw = Wrappers.lambdaQuery();
+            lqw.between(TAdmin::getCreateDate, startTime, endTime);
+            List<TAdmin> list = adminService.list(lqw);
+
+            return R.ok(list);
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+
+    @ApiOperation(value = "通过 adminId 获取用户信息")
+    @GetMapping("/getAdminById")
+    public ResponseModel<TAdmin> getAdminById(String adminId) {
+        if (StringUtils.isNotEmpty(adminId)) {
+            LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(TAdmin::getId, adminId);
+            TAdmin admin = adminService.getOne(wrapper);
+            return R.ok(admin);
+        } else {
+            return R.fail(A0206);
+        }
+    }
+}

src/main/java/com/szwl/controller/SyncAllController.java

@@ -0,0 +1,91 @@
+package com.szwl.controller;
+
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.service.TAdminService;
+import com.szwl.service.TCoinOrderService;
+import com.szwl.service.TEquipmentService;
+import com.szwl.service.TOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/oldAll")
+public class SyncAllController {
+
+    /**
+     * 旧系统同步方案一：
+     *  根据设备编号和用户id进行同步：
+     *      e.g. 同步某一客户，某台机，从2023-3-19至今的所有 t_order 信息
+     *  目前要做的事：
+     *      先将旧系统的一条信息查出来，再插入到新系统中，以 t_admin 表为例
+     */
+    TEquipmentService equipmentService;
+    TAdminService adminService;
+
+    TOrderService orderService;
+
+    TCoinOrderService coinOrderService;
+
+    public SyncAllController(TEquipmentService equipmentService, TAdminService adminService, TOrderService orderService, TCoinOrderService coinOrderService) {
+        this.equipmentService = equipmentService;
+        this.adminService = adminService;
+        this.orderService = orderService;
+        this.coinOrderService = coinOrderService;
+    }
+
+
+    @ApiOperation(value = "获取某一设备的所有数据")
+    @PostMapping ("/getAllDataByClient")
+    public ResponseModel<List<?>> getAllDataByClient(String clientId) {
+        if (StringUtils.isNotEmpty(clientId)) {
+            // 获取某一设备对应的所有 admin
+            // 获取某一设备对应的所有 equipment
+            // 获取某一设备对应的所有 order
+            // 获取某一设备对应的所有 coin_order
+            // 获取某一设备对应的所有 t_joinpay_mch
+            // 获取某一设备对应的所有 proportion
+            // 获取某一设备对应的所有 product
+            // 获取某一设备对应的所有 maintaining_history
+            // 获取某一设备对应的所有 equipment_apply
+            // 获取某一设备对应的所有 apk_info
+            // 获取某一设备对应的所有 ad
+            return R.ok();
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+
+
+    /**
+     * 旧系统同步方案二：
+     *  根据时间段进行同步：
+     *      e.g. 同步某一时间内的数据，涉及的表有 t_admin, t_equipment, t_order, t_coin_order, ...
+     *      e.g. proportion, product, maintaining_history, equipment_apply, apk_info, ad
+     *  目前在做：
+     *      同步某一段时间内的 admin 信息，并插入到新系统
+     */
+    @ApiOperation(value = "获取某一时间段内的所有数据")
+    @PostMapping ("/getAllDataInTime")
+    public ResponseModel<List<?>> getAllDataInTime(String startTime, String endTime) {
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            // 获取某一时段内的所有 admin
+            // 获取某一时段内的所有 equipment
+            // 获取某一时段内的所有 order
+            // 获取某一时段内的所有 coin_order
+            // 获取某一时段内的所有 proportion
+            // 获取某一时段内的所有 product
+            // 获取某一时段内的所有 maintaining_history
+            // 获取某一时段内的所有 equipment_apply
+            // 获取某一时段内的所有 apk_info
+            // 获取某一时段内的所有 ad
+            return R.ok();
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+
+}

src/main/java/com/szwl/controller/SyncCoinOrderController.java

@@ -0,0 +1,46 @@
+package com.szwl.controller;
+
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TCoinOrder;
+import com.szwl.model.entity.TOrder;
+import com.szwl.service.TCoinOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping("/oldCoinOrder")
+public class SyncCoinOrderController {
+
+    TCoinOrderService coinOrderService;
+
+    public SyncCoinOrderController(TCoinOrderService coinOrderService) {
+        this.coinOrderService = coinOrderService;
+    }
+
+    @ApiOperation(value = "通过 adminId, clientId, time 获取 coinOrder 海外订单信息")
+    @PostMapping("/getCoinOrderByACT")
+    public ResponseModel<List<TCoinOrder>> getCoinOrderByACT(Long adminId, String clientId, String startTime, String endTime) {
+        if (adminId != null && StringUtils.isNotEmpty(clientId) && StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            try {
+                Date start = sdf.parse(startTime);
+                Date end = sdf.parse(endTime);
+                List<TCoinOrder> coinOrderList = coinOrderService.selectCoinOrderByAdminIdAndClientIdAndTimeRange(adminId, clientId, start, end);
+                return R.ok(coinOrderList);
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+}

src/main/java/com/szwl/controller/SyncEquipmentController.java

@@ -0,0 +1,64 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.service.TEquipmentService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+@RestController
+@RequestMapping("/oldEquipment")
+public class SyncEquipmentController {
+    TEquipmentService equipmentService;
+
+    public SyncEquipmentController(TEquipmentService equipmentService) {
+        this.equipmentService = equipmentService;
+    }
+
+    @ApiOperation(value = "获取某一时间段内的 equipment 设备信息")
+    @GetMapping("/getEquipmentInTime")
+    public ResponseModel<List<TEquipment>> getEquipmentInTime(String startTime, String endTime) {
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            LambdaQueryWrapper<TEquipment> lqw = Wrappers.lambdaQuery();
+            lqw.between(TEquipment::getCreateDate, startTime, endTime);
+            List<TEquipment> list = equipmentService.list(lqw);
+
+            return R.ok(list);
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+
+    @ApiOperation(value = "通过 clientId 获取设备信息")
+    @GetMapping("/getEquipmentByClientId")
+    public ResponseModel<TEquipment> getEquipmentByClientId(String clientId) {
+        if (StringUtils.isNotEmpty(clientId)) {
+            LambdaQueryWrapper<TEquipment> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(TEquipment::getClientId, clientId);
+            TEquipment equipment = equipmentService.getOne(wrapper);
+            return R.ok(equipment);
+        } else {
+            return R.fail("未找到设备");
+        }
+    }
+
+    @ApiOperation(value = "获取某一用户的所有 equipment 设备信息")
+    @GetMapping("/getEquipmentByAdminId")
+    public ResponseModel<List<TEquipment>> getEquipmentByAdminId(Long adminId) {
+        if (adminId == null) {
+            return R.fail("用户id为空");
+        }
+        LambdaQueryWrapper<TEquipment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TEquipment::getAdminId, adminId);
+        List<TEquipment> equipmentList = equipmentService.list(lqw);
+        return R.ok(equipmentList);
+    }
+}

src/main/java/com/szwl/controller/SyncJoinpayMchController.java

@@ -0,0 +1,40 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TJoinpayMch;
+import com.szwl.service.TJoinpayMchService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/oldJoinpayMch")
+public class SyncJoinpayMchController {
+
+    TJoinpayMchService joinpayMchService;
+
+    public SyncJoinpayMchController(TJoinpayMchService joinpayMchService) {
+        this.joinpayMchService = joinpayMchService;
+    }
+
+    @ApiOperation(value = "根据adminId查找用户的汇聚支付信息")
+    @GetMapping("/getJoinpayMchByAdminId")
+    public ResponseModel<TJoinpayMch> getJoinpayMchByAdminId(Long adminId) {
+        if (adminId == null) {
+            return R.fail("用户id不能为空");
+        }
+        LambdaQueryWrapper<TJoinpayMch> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TJoinpayMch::getAdminId, adminId);
+        TJoinpayMch joinpayMch = joinpayMchService.getOne(lqw);
+        if (Objects.isNull(joinpayMch)) {
+            return R.fail("未查询到汇聚支付信息");
+        }
+        return R.ok(joinpayMch);
+    }
+}

src/main/java/com/szwl/controller/SyncOldByClientController.java

@@ -1,72 +0,0 @@
-package com.szwl.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.szwl.model.bo.R;
-import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.entity.TAdmin;
-import com.szwl.model.entity.TEquipment;
-import com.szwl.model.entity.TOrder;
-import com.szwl.service.TAdminService;
-import com.szwl.service.TCoinOrderService;
-import com.szwl.service.TEquipmentService;
-import com.szwl.service.TOrderService;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import static com.szwl.constant.ResponseCodesEnum.A0206;
-
-@RestController
-@RequestMapping("/syncOldByClient")
-public class SyncOldByClientController {
-
-    /**
-     * 旧系统同步方案一：
-     *  根据设备编号和用户id进行同步：
-     *      e.g. 同步某一客户，某台机，从2023-3-19至今的所有 t_order 信息
-     *  目前要做的事：
-     *      先将旧系统的一条信息查出来，再插入到新系统中，以 t_admin 表为例
-     */
-    TEquipmentService equipmentService;
-    TAdminService adminService;
-
-    TOrderService orderService;
-
-    TCoinOrderService coinOrderService;
-
-    public SyncOldByClientController(TEquipmentService equipmentService, TAdminService adminService, TOrderService orderService, TCoinOrderService coinOrderService) {
-        this.equipmentService = equipmentService;
-        this.adminService = adminService;
-        this.orderService = orderService;
-        this.coinOrderService = coinOrderService;
-    }
-
-    @ApiOperation(value = "通过 clientId 获取机器信息")
-    @GetMapping("/getEquipmentByClientId")
-    public ResponseModel<TEquipment> getEquipmentByClientId(String clientId) {
-        if (StringUtils.isNotEmpty(clientId)) {
-            LambdaQueryWrapper<TEquipment> wrapper = Wrappers.lambdaQuery();
-            wrapper.eq(TEquipment::getClientId, clientId);
-            TEquipment equipment = equipmentService.getOne(wrapper);
-            return R.ok(equipment);
-        }
-        return R.fail("未找到设备");
-    }
-
-
-    @ApiOperation(value = "通过 adminId 获取用户信息")
-    @GetMapping("/getAdminById")
-    public ResponseModel<TAdmin> getAdminById(String adminId) {
-        if (StringUtils.isNotEmpty(adminId)) {
-            LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
-            wrapper.eq(TAdmin::getId, adminId);
-            TAdmin admin = adminService.getOne(wrapper);
-            return R.ok(admin);
-        }
-        return R.fail(A0206);
-    }
-
-}

src/main/java/com/szwl/controller/SyncOldByTimeController.java

@@ -1,106 +0,0 @@
-package com.szwl.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.szwl.model.bo.R;
-import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.entity.TAdmin;
-import com.szwl.model.entity.TEquipment;
-import com.szwl.model.entity.TOrder;
-import com.szwl.service.TAdminService;
-import com.szwl.service.TCoinOrderService;
-import com.szwl.service.TEquipmentService;
-import com.szwl.service.TOrderService;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-@RestController
-@RequestMapping("/syncOldByTime")
-public class SyncOldByTimeController {
-
-    /**
-     * 旧系统同步方案二：
-     *  根据时间段进行同步：
-     *      e.g. 同步某一时间内的数据，涉及的表有 t_admin, t_equipment, t_order, t_coin_order, ...
-     *      e.g. proportion, product, maintaining_history, equipment_apply, apk_info, ad
-     *  目前在做：
-     *      同步某一段时间内的 admin 信息，并插入到新系统
-     */
-    TEquipmentService equipmentService;
-    TAdminService adminService;
-
-    TOrderService orderService;
-
-    TCoinOrderService coinOrderService;
-
-    public SyncOldByTimeController(TEquipmentService equipmentService, TAdminService adminService, TOrderService orderService, TCoinOrderService coinOrderService) {
-        this.equipmentService = equipmentService;
-        this.adminService = adminService;
-        this.orderService = orderService;
-        this.coinOrderService = coinOrderService;
-    }
-
-    @ApiOperation(value = "获取某一时间段内的所有 order")
-    @PostMapping("/getOrderInTime")
-    public ResponseModel<List<TOrder>> getOrderInTime(String startTime, String endTime) {
-        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
-            LambdaQueryWrapper<TOrder> lqw = Wrappers.lambdaQuery();
-            lqw.between(TOrder::getCreateDate, startTime, endTime);
-            List<TOrder> list = orderService.list(lqw);
-
-            return R.ok(list);
-        }
-        return R.fail("时间参数为空");
-    }
-
-    @ApiOperation(value = "获取某一时间段内的所有 equipment")
-    @PostMapping ("/getEquipmentInTime")
-    public ResponseModel<List<TEquipment>> getEquipmentInTime(String startTime, String endTime) {
-        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
-            LambdaQueryWrapper<TEquipment> lqw = Wrappers.lambdaQuery();
-            lqw.between(TEquipment::getCreateDate, startTime, endTime);
-            List<TEquipment> list = equipmentService.list(lqw);
-
-            return R.ok(list);
-        }
-        return R.fail("时间参数为空");
-    }
-
-    @ApiOperation(value = "获取某一时间段内的所有 admin")
-    @PostMapping ("/getAdminInTime")
-    public ResponseModel<List<TAdmin>> getAdminInTime(String startTime, String endTime) {
-        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
-            LambdaQueryWrapper<TAdmin> lqw = Wrappers.lambdaQuery();
-            lqw.between(TAdmin::getCreateDate, startTime, endTime);
-            List<TAdmin> list = adminService.list(lqw);
-
-            return R.ok(list);
-        }
-
-        return R.fail("时间参数为空");
-    }
-
-    @ApiOperation(value = "获取某一时间段内的所有数据")
-    @PostMapping ("/getAllDataInTime")
-    public ResponseModel<List<?>> getAllDataInTime(String startTime, String endTime) {
-        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
-            // 获取某一时段内的所有 admin
-            // 获取某一时段内的所有 equipment
-            // 获取某一时段内的所有 order
-            // 获取某一时段内的所有 coin_order
-            // 获取某一时段内的所有 proportion
-            // 获取某一时段内的所有 product
-            // 获取某一时段内的所有 maintaining_history
-            // 获取某一时段内的所有 equipment_apply
-            // 获取某一时段内的所有 apk_info
-            // 获取某一时段内的所有 ad
-            return R.ok();
-        }
-        return R.fail("时间参数为空");
-    }
-
-}

src/main/java/com/szwl/controller/SyncOrderController.java

@@ -0,0 +1,70 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.mapper.TOrderMapper;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.model.entity.TOrder;
+import com.szwl.service.TOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping("/oldOrder")
+public class SyncOrderController {
+
+    TOrderService orderService;
+
+    public SyncOrderController(TOrderService orderService) {
+        this.orderService = orderService;
+    }
+
+    @ApiOperation(value = "通过 adminId, clientId, time 获取 order 国内订单信息")
+    @PostMapping("/getOrderByACT")
+    public ResponseModel<List<TOrder>> getOrderByACT(Long adminId, String clientId, String startTime, String endTime) {
+        //        if (StringUtils.isNotEmpty(clientId)) {
+//            LambdaQueryWrapper<TEquipment> wrapper = Wrappers.lambdaQuery();
+//            wrapper.eq(TEquipment::getClientId, clientId);
+//            TEquipment equipment = equipmentService.getOne(wrapper);
+//            return R.ok(equipment);
+//        }
+        if (adminId != null && StringUtils.isNotEmpty(clientId) && StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            try {
+                Date start = sdf.parse(startTime);
+                Date end = sdf.parse(endTime);
+                List<TOrder> orderList = orderService.selectOrderByAdminIdAndClientIdAndTimeRange(adminId, clientId, start, end);
+                return R.ok(orderList);
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+
+    @ApiOperation(value = "获取某一时间段内的 order 国内订单信息")
+    @PostMapping("/getOrderInTime")
+    public ResponseModel<List<TOrder>> getOrderInTime(String startTime, String endTime) {
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            LambdaQueryWrapper<TOrder> lqw = Wrappers.lambdaQuery();
+            lqw.between(TOrder::getCreateDate, startTime, endTime);
+            List<TOrder> list = orderService.list(lqw);
+
+            return R.ok(list);
+        } else {
+            return R.fail("参数不能为空");
+        }
+    }
+}

src/main/java/com/szwl/controller/SyncProductController.java

@@ -0,0 +1,39 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TProduct;
+import com.szwl.service.TProductService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/oldProduct")
+public class SyncProductController {
+
+    TProductService productService;
+
+    public SyncProductController(TProductService productService) {
+        this.productService = productService;
+    }
+
+    @ApiOperation(value = "通过设备id获取花型信息")
+    @GetMapping("/getProductByEquipmentId")
+    public ResponseModel<List<TProduct>> getProductByEquipmentId(String equipmentId) {
+        LambdaQueryWrapper<TProduct> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TProduct::getEquipmentId, equipmentId);
+        List<TProduct> productList = productService.list(lqw);
+        if (Objects.isNull(productList)) {
+            return R.fail("未查询到花型信息");
+        }
+        return R.ok(productList);
+    }
+
+}

src/main/java/com/szwl/controller/SyncProportionController.java

@@ -0,0 +1,38 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TProduct;
+import com.szwl.model.entity.TProportion;
+import com.szwl.service.TProductService;
+import com.szwl.service.TProportionService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/oldProportion")
+public class SyncProportionController {
+    TProportionService proportionService;
+
+    public SyncProportionController(TProportionService proportionService) {
+        this.proportionService = proportionService;
+    }
+
+    @ApiOperation(value = "通过用户id获取分销信息")
+    @GetMapping("/getProportionByAdminId")
+    public ResponseModel<TProportion> getProportionByAdminId(Long adminId) {
+        LambdaQueryWrapper<TProportion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TProportion::getAdminId, adminId);
+        TProportion proportion = proportionService.getOne(lqw);
+        if (Objects.isNull(proportion)) {
+            return R.fail("未查询到分销信息");
+        }
+        return R.ok(proportion);
+    }
+}

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -0,0 +1,21 @@
+package com.szwl.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-16
+ */
+@RestController
+@RequestMapping("/tJoinpayMch")
+public class TJoinpayMchController {
+
+}
+

src/main/java/com/szwl/controller/TProductController.java

@@ -0,0 +1,22 @@
+package com.szwl.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-15
+ */
+@RestController
+@RequestMapping("/tProduct")
+public class TProductController {
+
+
+}
+

src/main/java/com/szwl/controller/TProportionController.java

@@ -0,0 +1,21 @@
+package com.szwl.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-18
+ */
+@RestController
+@RequestMapping("/tProportion")
+public class TProportionController {
+
+}
+

src/main/java/com/szwl/feign/bean/SzwlFeign.java

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.Date;
 
 
-//@FeignClient(name = "szwl-server")
-@FeignClient(name = "szwl-server", url = "http://127.0.0.1:49011/")
+@FeignClient(name = "szwl-server")
+//@FeignClient(name = "szwl-server", url = "http://127.0.0.1:49011/")
 public interface SzwlFeign {
 
     @GetMapping("/test/testGetAdmin")

src/main/java/com/szwl/mapper/TCoinOrderMapper.java

@@ -2,6 +2,11 @@ package com.szwl.mapper;
 
 import com.szwl.model.entity.TCoinOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.szwl.model.entity.TOrder;
+import feign.Param;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TCoinOrderMapper extends BaseMapper<TCoinOrder> {
 
+    List<TCoinOrder> selectCoinOrderByAdminIdAndClientIdAndTimeRange(@Param("adminId") Long adminId, @Param("clientId") String clientId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }

src/main/java/com/szwl/mapper/TJoinpayMchMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TJoinpayMch;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-16
+ */
+public interface TJoinpayMchMapper extends BaseMapper<TJoinpayMch> {
+
+}

src/main/java/com/szwl/mapper/TOrderMapper.java

@@ -2,6 +2,11 @@ package com.szwl.mapper;
 
 import com.szwl.model.entity.TOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import feign.Param;
+
+import javax.persistence.criteria.Order;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2023-10-18
  */
 public interface TOrderMapper extends BaseMapper<TOrder> {
-
+    List<TOrder> selectOrderByAdminIdAndClientIdAndTimeRange(@Param("adminId") Long adminId, @Param("clientId") String clientId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }

src/main/java/com/szwl/mapper/TProductMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-15
+ */
+public interface TProductMapper extends BaseMapper<TProduct> {
+
+}

src/main/java/com/szwl/mapper/TProportionMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TProportion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-18
+ */
+public interface TProportionMapper extends BaseMapper<TProportion> {
+
+}

src/main/java/com/szwl/mapper/xml/TOrderMapper.xml

@@ -51,4 +51,15 @@
         id, create_date, modify_date, admin_id, admin_proportion, agency_id, agency_proportion, alt_info, client_id, equipment_id, frp_code, merchant_id, merchant_proportion, pay_date, personage_id, personage_proportion, price, product_id, product_desc, product_name, product_no, refund_date, sn, status, type, trx_no, refund_trx_no, es, refund_amount, note, pay_platform, is_settlement, wx_id, proportion_desc, marketing_amount, coupons, product_number, is_invoice, refund_reason, company_type
     </sql>
 
+    <!-- 查询某用户的某台设备在某一时间范围内的所有订单 -->
+    <select id="selectOrderByAdminIdAndClientIdAndTimeRange" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM t_order
+        WHERE admin_id = #{adminId, jdbcType=BIGINT}
+        AND client_id = #{clientId, jdbcType=BIGINT}
+        AND create_date BETWEEN #{startTime, javaType=java.util.Date, jdbcType=TIMESTAMP} AND #{endTime, javaType=java.util.Date, jdbcType=TIMESTAMP}
+    </select>
+
+
+
 </mapper>

src/main/java/com/szwl/mapper/xml/TProductMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.szwl.mapper.TProductMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TProduct">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="code_price" property="codePrice" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="name" property="name" />
+        <result column="product_name" property="productName" />
+        <result column="rmb_price" property="rmbPrice" />
+        <result column="sell_status" property="sellStatus" />
+        <result column="show_type" property="showType" />
+        <result column="no" property="no" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, code_price, equipment_id, name, product_name, rmb_price, sell_status, show_type, no
+    </sql>
+
+</mapper>

src/main/java/com/szwl/mapper/xml/TProportionMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.szwl.mapper.TProportionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TProportion">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="admin_id" property="adminId" />
+        <result column="client_id" property="clientId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="admin_proportion" property="adminProportion" />
+        <result column="agency_proportion" property="agencyProportion" />
+        <result column="merchant_proportion" property="merchantProportion" />
+        <result column="personage_proportion" property="personageProportion" />
+        <result column="proportion" property="proportion" />
+        <result column="proportion_desc" property="proportionDesc" />
+        <result column="agency_id" property="agencyId" />
+        <result column="merchant_id" property="merchantId" />
+        <result column="personage_id" property="personageId" />
+        <result column="agency_name" property="agencyName" />
+        <result column="merchant_name" property="merchantName" />
+        <result column="personage_name" property="personageName" />
+        <result column="type" property="type" />
+        <result column="equipment_name" property="equipmentName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, admin_id, client_id, equipment_id, admin_proportion, agency_proportion, merchant_proportion, personage_proportion, proportion, proportion_desc, agency_id, merchant_id, personage_id, agency_name, merchant_name, personage_name, type, equipment_name
+    </sql>
+
+</mapper>

src/main/java/com/szwl/model/entity/TJoinpayMch.java

@@ -0,0 +1,109 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TJoinpayMch对象", description="")
+public class TJoinpayMch implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private Long adminId;
+
+    private BigDecimal altAvilBalance;
+
+    private BigDecimal altGuarBalance;
+
+    private BigDecimal altMainBalance;
+
+    private String altMchName;
+
+    private String altMchNo;
+
+    private String altMchShortName;
+
+    private Integer altMerchantType;
+
+    private String bankAccountName;
+
+    private String bankAccountNo;
+
+    private Integer bankAccountType;
+
+    private String bankChannelNo;
+
+    private String bizCode;
+
+    private String busiContactMobileNo;
+
+    private String busiContactName;
+
+    private String idCardExpiry;
+
+    private String idCardNo;
+
+    private String legalPerson;
+
+    private String licenseExpiry;
+
+    private String licenseNo;
+
+    private String loginName;
+
+    private String manageAddr;
+
+    private String manageScope;
+
+    private String orderStatus;
+
+    private String phoneNo;
+
+    private String respCode;
+
+    private Integer riskDay;
+
+    private Integer settDateType;
+
+    private Integer settMode;
+
+    private String status;
+
+    private String signStatus;
+
+    private String signTrxNo;
+
+    private String approveNote;
+
+    private String approveStatus;
+
+    private String type;
+
+    @ApiModelProperty(value = "步骤  0：图片未上传  1：图片已上传")
+    private String step;
+
+
+}

src/main/java/com/szwl/model/entity/TProduct.java

@@ -0,0 +1,54 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TProduct对象", description="")
+public class TProduct implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private BigDecimal codePrice;
+
+    private Long equipmentId;
+
+    private String name;
+
+    private String productName;
+
+    private BigDecimal rmbPrice;
+
+    private Boolean sellStatus;
+
+    @ApiModelProperty(value = "是否显示")
+    private String showType;
+
+    @ApiModelProperty(value = "商品编号")
+    private String no;
+
+
+}

src/main/java/com/szwl/model/entity/TProportion.java

@@ -0,0 +1,75 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TProportion对象", description="")
+public class TProportion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private Long adminId;
+
+    private String clientId;
+
+    private Long equipmentId;
+
+    private BigDecimal adminProportion;
+
+    private BigDecimal agencyProportion;
+
+    private BigDecimal merchantProportion;
+
+    private BigDecimal personageProportion;
+
+    @ApiModelProperty(value = "商家自己的分销")
+    private BigDecimal proportion;
+
+    @ApiModelProperty(value = "当分账方超过4个时启用，分销详情（adminId1：分销1，adminId2：分销2.。。。）")
+    private String proportionDesc;
+
+    @ApiModelProperty(value = "一级分销商家id")
+    private Long agencyId;
+
+    @ApiModelProperty(value = "二级分销商家id")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "三级分销商家id")
+    private Long personageId;
+
+    private String agencyName;
+
+    private String merchantName;
+
+    private String personageName;
+
+    private Integer type;
+
+    private String equipmentName;
+
+
+}

src/main/java/com/szwl/service/TCoinOrderService.java

@@ -2,6 +2,10 @@ package com.szwl.service;
 
 import com.szwl.model.entity.TCoinOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.szwl.model.entity.TOrder;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface TCoinOrderService extends IService<TCoinOrder> {
 
+    List<TCoinOrder> selectCoinOrderByAdminIdAndClientIdAndTimeRange(Long adminId, String clientId, Date startTime, Date endTime);
+
 }

src/main/java/com/szwl/service/TJoinpayMchService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TJoinpayMch;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-16
+ */
+public interface TJoinpayMchService extends IService<TJoinpayMch> {
+
+}

src/main/java/com/szwl/service/TOrderService.java

@@ -3,6 +3,9 @@ package com.szwl.service;
 import com.szwl.model.entity.TOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-10-18
  */
 public interface TOrderService extends IService<TOrder> {
-
+    List<TOrder> selectOrderByAdminIdAndClientIdAndTimeRange(Long adminId, String clientId, Date startTime, Date endTime);
 }

src/main/java/com/szwl/service/TProductService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TProduct;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-15
+ */
+public interface TProductService extends IService<TProduct> {
+
+}

src/main/java/com/szwl/service/TProportionService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TProportion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-18
+ */
+public interface TProportionService extends IService<TProportion> {
+
+}

src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -6,6 +6,9 @@ import com.szwl.service.TCoinOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOrder> implements TCoinOrderService {
 
+    @Override
+    public List<TCoinOrder> selectCoinOrderByAdminIdAndClientIdAndTimeRange(Long adminId, String clientId, Date startTime, Date endTime) {
+        return this.baseMapper.selectCoinOrderByAdminIdAndClientIdAndTimeRange(adminId, clientId, startTime, endTime);
+    }
 }

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TJoinpayMch;
+import com.szwl.mapper.TJoinpayMchMapper;
+import com.szwl.service.TJoinpayMchService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-16
+ */
+@Service
+public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoinpayMch> implements TJoinpayMchService {
+
+}

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -6,6 +6,9 @@ import com.szwl.service.TOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +19,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements TOrderService {
-
+    @Override
+    public List<TOrder> selectOrderByAdminIdAndClientIdAndTimeRange(Long adminId, String clientId, Date startTime, Date endTime) {
+        return this.baseMapper.selectOrderByAdminIdAndClientIdAndTimeRange(adminId, clientId, startTime, endTime);
+    }
 }

src/main/java/com/szwl/service/impl/TProductServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TProduct;
+import com.szwl.mapper.TProductMapper;
+import com.szwl.service.TProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-15
+ */
+@Service
+public class TProductServiceImpl extends ServiceImpl<TProductMapper, TProduct> implements TProductService {
+
+}

src/main/java/com/szwl/service/impl/TProportionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TProportion;
+import com.szwl.mapper.TProportionMapper;
+import com.szwl.service.TProportionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-18
+ */
+@Service
+public class TProportionServiceImpl extends ServiceImpl<TProportionMapper, TProportion> implements TProportionService {
+
+}

src/main/java/com/szwl/util/IDGenerator.java

@@ -1,97 +0,0 @@
-package com.szwl.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class IDGenerator {
-    private static final AtomicLong seq = new AtomicLong(0);
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-    private static final SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-
-
-    /**
-     * 生成唯一的16位长整型ID --> admin，equipment等常用表
-     *
-     * @return 订单ID
-     */
-    public static synchronized long commonID() {
-        String timestamp = dateFormat1.format(new Date()).substring(2);
-        long threadId = Thread.currentThread().getId();
-        String s1 = String.valueOf(threadId);
-        char c = s1.charAt(s1.length() - 1);
-        //huTool工具集的雪花算法 --> 生成19位id
-        //参数1为终端ID
-        //参数2为数据中心ID
-//        Snowflake snowflake = IdUtil.getSnowflake(1, 1);
-//        long id = snowflake.nextId();
-//        System.out.println("id***" + id);
-
-        return Long.parseLong(timestamp + c);
-    }
-
-    /**
-     * 生成唯一的18位长整型ID --> 用于国内订单
-     *
-     * @return 订单ID
-     */
-    public static synchronized long orderID() {
-        String timestamp = dateFormat.format(new Date()).substring(2);
-        long threadId = Thread.currentThread().getId();
-        String s1 = String.valueOf(threadId);
-        char c = s1.charAt(s1.length() - 1);
-        String randomNumber = generateRandomNumber();
-
-        // 乐观锁部分
-        long currentSeq;
-        long nextSeq;
-        do {
-            currentSeq = seq.get();
-            nextSeq = (currentSeq >= 999) ? 0 : currentSeq + 1;
-        } while (!seq.compareAndSet(currentSeq, nextSeq));
-        String s2 = String.valueOf(nextSeq);
-        char c1 = s2.charAt(s2.length() - 1);
-
-        String s = "5"; // 表示国内订单
-        return Long.parseLong(s + timestamp + c + randomNumber + c1);
-    }
-
-    /**
-     * 生成唯一的18位长整型ID --> 用于海外订单
-     *
-     * @return 订单ID
-     */
-    public static synchronized long coinOrderID() {
-        String timestamp = dateFormat.format(new Date()).substring(2);
-        long threadId = Thread.currentThread().getId();
-        String s1 = String.valueOf(threadId);
-        char c = s1.charAt(s1.length() - 1);
-        String randomNumber = generateRandomNumber();
-
-        // 乐观锁部分
-        long currentSeq;
-        long nextSeq;
-        do {
-            currentSeq = seq.get();
-            nextSeq = (currentSeq >= 999) ? 0 : currentSeq + 1;
-        } while (!seq.compareAndSet(currentSeq, nextSeq));
-        String s2 = String.valueOf(nextSeq);
-        char c1 = s2.charAt(s2.length() - 1);
-
-        String s = "1"; // 表示海外订单
-        return Long.parseLong(s + timestamp + c + randomNumber + c1);
-    }
-
-    /**
-     * 生成3位伪随机数
-     * 因为long类型范围是-9223372036854775808到9223372036854775807，无法容纳更大范围数字，可以将数据库字段类型改为无符号，或者使用varchar类型
-     * @return 随机数
-     */
-    private static String generateRandomNumber() {
-        Random random = new Random();
-        int nextInt = random.nextInt(1000);
-        // 格式化为3位数，并在不满三位的数字前面补零
-        return String.format("%03d", nextInt);
-    }
-}