:space_invader:feat: 获取旧系统数据调整

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

@@ -37,6 +37,26 @@ public class SyncAllController {
         this.coinOrderService = coinOrderService;
     }
 
+    // 售后同时输入设备唯一码，点击同步即可
+    @ApiOperation(value = "")
+    @GetMapping("/getAllDataByAdminIdClientId")
+    public ResponseModel<?> getAllDataByAdminIdClientId(Long adminId, String clientId) {
+        if (StringUtils.isEmpty(clientId) || adminId == null) {
+            return R.fail("参数不能为空");
+        }
+
+        // 获取该设备信息
+
+        // 获取该设备花型信息
+
+        // 获取账户分销信息
+
+        // 获取账户汇聚支付
+
+        // 获取账户该设备的订单
+
+        return R.ok();
+    }
 
     @ApiOperation(value = "获取某一设备的所有数据")
     @PostMapping ("/getAllDataByClient")

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

@@ -13,7 +13,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 @RestController
 @RequestMapping("/oldEquipment")
 public class SyncEquipmentController {
@@ -23,6 +27,41 @@ public class SyncEquipmentController {
         this.equipmentService = equipmentService;
     }
 
+    @ApiOperation(value = "判断设备是否未脱机")
+    @GetMapping("/isOnline")
+    public Boolean isOnline(TEquipment equipment) {
+        if (Objects.isNull(equipment)) {
+            return false;
+        }
+        String clientId = equipment.getClientId();
+        boolean endsWith = clientId.endsWith("xxx"); // 区分大小写
+//        boolean endsWith = clientId.toLowerCase().endsWith("xxx"); // 不区分大小写
+//        boolean endsWith = clientId.toUpperCase().endsWith("xxx"); // 不区分大小写
+        return !endsWith;
+    }
+
+    @ApiOperation(value = "同步未脱机的设备")
+    @GetMapping("/getOnline")
+    public ResponseModel<List<TEquipment>> getOnline(String equipmentId) {
+        if (equipmentId.isEmpty()) {
+            return R.fail("equipmentId不能为空");
+        }
+        LambdaQueryWrapper<TEquipment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TEquipment::getId, equipmentId);
+        List<TEquipment> equipmentList = equipmentService.list(lqw);
+        List<TEquipment> tEquipments = new ArrayList<>();
+
+        for (TEquipment equipment : equipmentList) {
+            Boolean online = this.isOnline(equipment);
+            if (online) {
+                // 可以同步
+                tEquipments.add(equipment);
+            }
+        }
+        return R.ok(tEquipments);
+    }
+
+
     @ApiOperation(value = "获取某一时间段内的 equipment 设备信息")
     @GetMapping("/getEquipmentInTime")
     public ResponseModel<List<TEquipment>> getEquipmentInTime(String startTime, String endTime) {

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

@@ -32,9 +32,9 @@ public class SyncJoinpayMchController {
         LambdaQueryWrapper<TJoinpayMch> lqw = Wrappers.lambdaQuery();
         lqw.eq(TJoinpayMch::getAdminId, adminId);
         TJoinpayMch joinpayMch = joinpayMchService.getOne(lqw);
-        if (Objects.isNull(joinpayMch)) {
-            return R.fail("未查询到汇聚支付信息");
-        }
+//        if (Objects.isNull(joinpayMch)) {
+//            return R.fail("未查询到汇聚支付信息");
+//        }
         return R.ok(joinpayMch);
     }
 }

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

@@ -30,9 +30,9 @@ public class SyncProportionController {
         LambdaQueryWrapper<TProportion> lqw = Wrappers.lambdaQuery();
         lqw.eq(TProportion::getAdminId, adminId);
         TProportion proportion = proportionService.getOne(lqw);
-        if (Objects.isNull(proportion)) {
-            return R.fail("未查询到分销信息");
-        }
+//        if (Objects.isNull(proportion)) {
+//            return R.fail("未查询到分销信息");
+//        }
         return R.ok(proportion);
     }
 }

src/test/java/com/szwl/AutoGeneratorTests.java

@@ -47,7 +47,7 @@ class AutoGeneratorTests {
 		strategyConfig
 //				.setCapitalMode(true)//设置全局大写命名
 				.setInclude(new String[]{
-						"t_equipment"
+						"t_proportion"
 				})//只会生成该表
 				.setEntityLombokModel(true)//实体类生成之后自动添加lombok注解
 				.setNaming(NamingStrategy.underline_to_camel)//数据库表映射到实体的命名策略