fix: admin 表id取消自增

feat: 同步旧系统设备和订单

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -22,7 +22,7 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
         String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/**","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
                 "/tProportion/**","/tProduct/**","/tPromoCode/**", "/tApkInfo/**", "/tProduct/selectProductList",  "/tApkInfo/**","/tJoinpayMchCheck/**","/tTimeRule/**","/sysRoleMenu/**",
                 "/tEquipmentApply/**","/tEquipment/**","/api/**","/tOrder/**","/tAlarmClock/**","/tNotice/**","/tParameters/**","/tAdmin/setRole",
-                "/tLabel/**","/tArea/**","/error","/tWechat/**","/wxLogin/**", "/syncByClient/**", "/syncByTime/**"};
+                "/tLabel/**","/tArea/**","/error","/tWechat/**","/wxLogin/**", "/syncByClient/**", "/syncByTime/**", "/syncOrder/**"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,14 +36,17 @@ public class SyncByTimeController {
         this.syncOldFeign = syncOldFeign;
     }
 
-    @ApiOperation(value = "同步旧系统某一时间段内的 t_admin ")
+    @ApiOperation(value = "同步旧系统某一时间段内的 t_equipment ")
     @PostMapping("/getEquipmentInTime")
     public ResponseModel<?> getEquipmentInTime(String startTime, String endTime) {
         if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
             List<TEquipment> oldEquipmentList = R.getDataIfSuccess(syncOldFeign.getEquipmentInTime(startTime, endTime));
+
+            // 构建MybatisBatch
+//            new MybatisBatch<>(SqlSessionFactory, )
+
             for (TEquipment oldEquipment : oldEquipmentList) {
 //                equipmentService.saveOrUpdate(oldEquipment); // 防止新旧表结构不同，不做直接插入
-
                 Long id = oldEquipment.getId();
                 Date createDate = oldEquipment.getCreateDate();
                 Date modifyDate = oldEquipment.getModifyDate();
@@ -168,10 +172,7 @@ public class SyncByTimeController {
                 equipment.setCompanyType(companyType);
                 equipment.setPaymentType(paymentType);
 
-
-
                 equipmentService.saveOrUpdate(oldEquipment);
-
             }
         }
         return R.fail("时间参数有误");

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

@@ -0,0 +1,14 @@
+package com.szwl.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Api(value = "/syncCoinOrder", tags = {"同步旧系统的coinOrder数据"})
+@RestController
+@RequestMapping("/syncCoinOrder")
+public class SyncCoinOrderController {
+
+}

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

@@ -0,0 +1,57 @@
+package com.szwl.controller;
+
+import com.szwl.feign.bean.SyncOldFeign;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TOrder;
+import com.szwl.service.TOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Api(value = "/syncOrder", tags = {"同步旧系统的order数据"})
+@RestController
+@RequestMapping("/syncOrder")
+public class SyncOrderController {
+
+    TOrderService orderService;
+
+    SyncOldFeign syncOldFeign;
+    public SyncOrderController(TOrderService orderService, SyncOldFeign syncOldFeign) {
+        this.orderService = orderService;
+        this.syncOldFeign = syncOldFeign;
+    }
+
+
+
+    @ApiOperation(value = "同步某客户的某一设备某一时间段内的订单")
+    @PostMapping("/getOrderByCAT")
+    public ResponseModel<?> getOrderByCAT(String adminId, String clientId, String startTime, String endTime) {
+        if (StringUtils.isNotEmpty(adminId) && StringUtils.isNotEmpty(clientId) && StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            long l = Long.parseLong(adminId);
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//            Date start = sdf.parse(startTime);
+//            Date end = sdf.parse(endTime);
+
+            List<TOrder> orderList = R.getDataIfSuccess(syncOldFeign.getOrderByACT(l, clientId, startTime, endTime));
+
+            for (TOrder order : orderList) {
+                System.out.println("order》》" + order);
+//                TODO: 这里插入数据失败
+//                orderService.save(order);
+            }
+            return R.ok(adminId + "同步设备" + clientId + "从" + startTime + "至" + endTime + "的 order 信息成功");
+        }
+        return R.fail("参数不能为空");
+    }
+
+}

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

@@ -498,7 +498,7 @@ public class TAdminController {
                 return R.fail(ResponseCodesEnum.A0002, "验证码错误");
             }
             tMessageCode.setStatus("1");
-            admin.setId(IDGenerator.commonID());
+//            admin.setId(IDGenerator.commonID()); // admin 表改回原来的自增ID
             admin.setCreateDate(new Date());
             admin.setModifyDate(new Date());
             admin.setIsAdmined(true);

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

@@ -3,6 +3,7 @@ package com.szwl.feign.bean;
 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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,25 +17,49 @@ import java.util.List;
 public interface SyncOldFeign {
 
     /**
-     * syncOldByClient
+     * syncOrder 同步 order 表
+     * @param adminId
+     * @param clientId
+     * @param startTime
+     * @param endTime
+     * @return
      */
+    @PostMapping("/syncOrder/getOrderByACT")
+    ResponseModel<List<TOrder>> getOrderByACT(@RequestParam Long adminId, @RequestParam String clientId, @RequestParam String startTime, @RequestParam String endTime);
+
 
+    /**
+     * 通过 adminId 获取用户信息
+     * @param adminId
+     * @return
+     */
     @GetMapping("/syncOldByClient/getAdminById")
     ResponseModel<TAdmin> getAdminById(@RequestParam String adminId);
 
+    /**
+     * 通过 clientId 获取机器信息
+     * @param clientId
+     * @return
+     */
     @GetMapping("/syncOldByClient/getEquipmentByClientId")
     ResponseModel<TEquipment> getEquipmentByClientId(@RequestParam String clientId);
 
 
 
     /**
-     * syncOldByTime
+     * 获取某一时间段内的所有 equipment
      * @param startTime
      * @param endTime
      */
     @PostMapping("/syncOldByTime/getEquipmentInTime")
     ResponseModel<List<TEquipment>> getEquipmentInTime(@RequestParam String startTime, @RequestParam String endTime);
 
+    /**
+     * 获取某一时间段内的所有 admin
+     * @param startTime
+     * @param endTime
+     * @return
+     */
     @PostMapping("/syncOldByTime/getAdminInTime")
     ResponseModel<List<TAdmin>> getAdminInTime(@RequestParam String startTime, @RequestParam String endTime);
 

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

@@ -12,7 +12,7 @@ public class IDGenerator {
 
 
     /**
-     * 生成唯一的16位长整型ID --> admin，equipment等常用表
+     * 生成唯一的16位长整型ID --> equipment等常用表
      *
      * @return 订单ID
      */