:space_invader: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/**", "/syncOrder/**", "/syncCoinOrder/**"};
+                "/tLabel/**","/tArea/**","/error","/tWechat/**","/wxLogin/**", "/syncOldAdmin/**", "/syncOldAll/**", "/syncOldEquipment/**", "/syncOldProduct/**"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

src/main/java/com/szwl/config/MybatisPlusConfig.java

@@ -3,6 +3,7 @@ package com.szwl.config;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.szwl.util.InsertBatchSomeColumnSqlInjector;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -20,4 +21,9 @@ public class MybatisPlusConfig {
         return interceptor;
     }
 
+
+    @Bean
+    public InsertBatchSomeColumnSqlInjector insertBatchSomeColumnSqlInjector() {
+        return new InsertBatchSomeColumnSqlInjector();
+    }
 }

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

@@ -1,86 +0,0 @@
-package com.szwl.controller;
-
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
-import com.szwl.feign.bean.SyncOldFeign;
-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.service.TAdminService;
-import com.szwl.service.TEquipmentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@Slf4j
-@Api(value = "/syncByClient", tags = {"根据设备&用户同步旧系统数据"})
-@RestController
-@RequestMapping("/syncByClient")
-public class SyncByClientController {
-
-    TAdminService adminService;
-    SyncOldFeign syncOldFeign;
-    TEquipmentService equipmentService;
-
-    public SyncByClientController(TAdminService adminService, SyncOldFeign syncOldFeign, TEquipmentService equipmentService) {
-        this.adminService = adminService;
-        this.syncOldFeign = syncOldFeign;
-        this.equipmentService = equipmentService;
-    }
-
-
-    @ApiOperation(value = "根据 adminId 同步用户的所有机器设备") // 考虑权限和上下级
-    @PostMapping("/getEquipmentByAdminId")
-    public ResponseModel<?> getEquipmentByAdminId(Long adminId) {
-        if (adminId != null) {
-            List<TEquipment> equipmentList = R.getDataIfSuccess(syncOldFeign.getEquipmentByAdminId(adminId));
-            // TODO: 批量插入到新系统数据库
-//            InsertBatchSomeColumn
-//            InsertBatchSomeColumn insertBatchSomeColumn = new InsertBatchSomeColumn;
-//            insertBatchSomeColumn()
-//            equipmentList.add(new InsertBatchSomeColumn(i -> i.getFieldFill() != FieldFill.UPDATE));
-            equipmentService.saveBatch(equipmentList);
-
-//            if (b) {
-                return R.ok("批量插入成功");
-//            }
-        } else {
-            return R.fail("旧系统用户不存在");
-        }
-    }
-
-
-    @ApiOperation(value = "根据设备同步旧系统数据")
-    @PostMapping("/syncOldByClient")
-    public ResponseModel<?> syncOldByClient(@RequestBody Map<String, String> params) {
-
-        // 查询 2023-03-19 开始到现在的所有表信息
-        String clientId = params.get("clientId");
-        String adminId = params.get("adminId");
-
-        // 查旧系统的admin信息
-//        ResponseModel<?> adminOld = syncOldFeign.getAdminById(adminId);
-//        adminOld.getData();
-
-        // 查旧系统的equipment信息
-        syncOldFeign.getEquipmentByClientId(clientId);
-
-        // 插入到新系统数据库
-        TAdmin adminNew = new TAdmin();
-        TEquipment equipmentNew = new TEquipment();
-
-        TAdmin adminOld = R.getDataIfSuccess(syncOldFeign.getAdminById(adminId));
-//        System.out.println(adminOld);
-
-        adminService.saveOrUpdate(adminOld);
-
-        return R.ok("同步成功");
-    }
-
-
-}

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

@@ -1,56 +0,0 @@
-package com.szwl.controller;
-
-import com.szwl.feign.bean.PayFeign;
-import com.szwl.feign.bean.SyncOldFeign;
-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 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.util.List;
-
-@Slf4j
-@Api(value = "/syncCoinOrder", tags = {"同步旧系统的coinOrder数据"})
-@RestController
-@RequestMapping("/syncCoinOrder")
-public class SyncCoinOrderController {
-
-    SyncOldFeign syncOldFeign;
-
-    PayFeign payFeign;
-
-    public SyncCoinOrderController(SyncOldFeign syncOldFeign, PayFeign payFeign) {
-        this.syncOldFeign = syncOldFeign;
-        this.payFeign = payFeign;
-    }
-
-
-    @ApiOperation(value = "同步海外某客户的某一设备某一时间段内的 coinOrder 订单")
-    @PostMapping("/getCoinOrderByCAT")
-    public ResponseModel<?> getCoinOrderByCAT(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);
-
-            List<TCoinOrder> coinOrderList = R.getDataIfSuccess(syncOldFeign.getCoinOrderByACT(l, clientId, startTime, endTime));
-
-            if (coinOrderList.size()>1000) {
-                return R.fail("数据量过大，请缩短时间范围");
-            }
-            for (TCoinOrder coinOrder : coinOrderList) {
-//                System.out.println("coinOrder》》" + coinOrder);
-                payFeign.addCoinOrder(coinOrder);
-            }
-
-            return R.ok(adminId + "同步设备" + clientId + "从" + startTime + "至" + endTime + "的 coinOrder 信息成功");
-        } else {
-            return R.fail("参数不能为空");
-        }
-    }
-}

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

@@ -0,0 +1,67 @@
+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.TAdmin;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.service.TAdminService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Slf4j
+@Api(value = "/syncOldAll", tags = {"根据设备&用户同步旧系统数据"})
+@RestController
+@RequestMapping("/syncOldAll")
+public class SyncOldAllController {
+
+    SyncOldFeign syncOldFeign;
+    TAdminService adminService;
+
+    public SyncOldAllController(SyncOldFeign syncOldFeign, TAdminService adminService) {
+        this.syncOldFeign = syncOldFeign;
+        this.adminService = adminService;
+    }
+
+    @ApiOperation(value = "根据设备同步旧系统所有数据")
+    @PostMapping("/byClient")
+    public ResponseModel<?> byClient(@RequestBody Map<String, String> params) {
+
+        // 查询 2023-03-19 开始到现在的所有表信息
+        String clientId = params.get("clientId");
+        String adminId = params.get("adminId");
+
+        // 查旧系统的admin信息
+//        ResponseModel<?> adminOld = syncOldFeign.getAdminById(adminId);
+//        adminOld.getData();
+
+        // 查旧系统的equipment信息
+        syncOldFeign.getEquipmentByClientId(clientId);
+
+        // 插入到新系统数据库
+        TAdmin adminNew = new TAdmin();
+        TEquipment equipmentNew = new TEquipment();
+
+        TAdmin adminOld = R.getDataIfSuccess(syncOldFeign.getAdminById(adminId));
+//        System.out.println(adminOld);
+
+        adminService.saveOrUpdate(adminOld);
+
+        return R.ok("同步成功");
+    }
+
+
+    @ApiOperation(value = "同步某一时间段内的所有数据")
+    @PostMapping("/inTime")
+    public ResponseModel<?> inTime(@RequestBody Map<String, String> params) {
+
+        return R.ok("同步成功");
+    }
+}

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

@@ -0,0 +1,509 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.feign.bean.SyncOldFeign;
+import com.szwl.mapper.TEquipmentMapper;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.service.TEquipmentService;
+import com.szwl.util.IDGenerator;
+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 javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Api(value = "/syncOldEquipment", tags = {"同步旧系统的 equipment 设备数据"})
+@RestController
+@RequestMapping("/syncOldEquipment")
+public class SyncOldEquipmentController {
+
+    SyncOldFeign syncOldFeign;
+
+    TEquipmentService equipmentService;
+
+    @Resource
+    TEquipmentMapper equipmentMapper;
+
+    public SyncOldEquipmentController(SyncOldFeign syncOldFeign, TEquipmentService equipmentService) {
+        this.syncOldFeign = syncOldFeign;
+        this.equipmentService = equipmentService;
+    }
+
+    @ApiOperation(value = "同步某一台机器的信息")
+    @PostMapping("/syncOneEquipmentByClientId")
+    public ResponseModel<?> syncOneEquipmentByClientId(String clientId) {
+        if (StringUtils.isNotEmpty(clientId)) {
+            TEquipment oldEquipment = R.getDataIfSuccess(syncOldFeign.getEquipmentByClientId(clientId));
+
+            Long id = oldEquipment.getId();
+            Date createDate = oldEquipment.getCreateDate();
+            Date modifyDate = oldEquipment.getModifyDate();
+            Long adminId = oldEquipment.getAdminId();
+            String adminLevel = oldEquipment.getAdminLevel();
+            String adminPwd = oldEquipment.getAdminPwd();
+            Long areaId = oldEquipment.getAreaId();
+            String cabinetHd = oldEquipment.getCabinetHd();
+            String cabinetTm = oldEquipment.getCabinetTm();
+//            String clientId = oldEquipment.getClientId();
+            String contactName = oldEquipment.getContactName();
+            String contactPhone = oldEquipment.getContactPhone();
+            String operationalPhone = oldEquipment.getOperationalPhone();
+            String operationalName = oldEquipment.getOperationalName();
+            String furnaceSp = oldEquipment.getFurnaceSp();
+            String furnaceTm = oldEquipment.getFurnaceTm();
+            String guestPwd = oldEquipment.getGuestPwd();
+            Boolean isNetWork = oldEquipment.getIsNetWork();
+            Boolean isUsing = oldEquipment.getIsUsing();
+            Date lastUpdateTime = oldEquipment.getLastUpdateTime();
+            Double latitude = oldEquipment.getLatitude();
+            Double longitude = oldEquipment.getLongitude();
+            String managerId = oldEquipment.getManagerId();
+            String selfName = oldEquipment.getSelfName();
+            String channel = oldEquipment.getChannel();
+            String name = oldEquipment.getName();
+            String netWorkingMode = oldEquipment.getNetWorkingMode();
+            String operator = oldEquipment.getOperator();
+            Integer payType = oldEquipment.getPayType();
+            Integer productTotal = oldEquipment.getProductTotal();
+            String simNo = oldEquipment.getSimNo();
+            String sn = oldEquipment.getSn();
+            String adminUserName = oldEquipment.getAdminUserName();
+            Long agencyId = oldEquipment.getAgencyId();
+            Long merchantId = oldEquipment.getMerchantId();
+            String companyPhone = oldEquipment.getCompanyPhone();
+            Long personageId = oldEquipment.getPersonageId();
+            Integer type = oldEquipment.getType();
+            String fullName = oldEquipment.getFullName();
+            Date pushUpdateTime = oldEquipment.getPushUpdateTime();
+            Long timeRuleId = oldEquipment.getTimeRuleId();
+            String gtClientId = oldEquipment.getGtClientId();
+            Integer eqeStatus = oldEquipment.getEqeStatus();
+            Boolean isBlocked = oldEquipment.getIsBlocked();
+            String messageReceiver = oldEquipment.getMessageReceiver();
+            Boolean isSleep = oldEquipment.getIsSleep();
+            String advancedParameters = oldEquipment.getAdvancedParameters();
+            String volume = oldEquipment.getVolume();
+            String commonParameters = oldEquipment.getCommonParameters();
+            String network = oldEquipment.getNetwork();
+            String offTime = oldEquipment.getOffTime();
+            String bootTime = oldEquipment.getBootTime();
+            String plcVersion = oldEquipment.getPlcVersion();
+            String equipmentType = oldEquipment.getEquimentType();
+            Date endDate = oldEquipment.getEndDate();
+            String flowers = oldEquipment.getFlowers();
+            String machineType = oldEquipment.getMachineType();
+//                String apkVersion = oldEquipment.getApkVersion(); // 旧系统没有
+//                String couponStatus = oldEquipment.getCouponStatus(); // 旧系统没有
+            String paymentType = oldEquipment.getPaymentType();
+            String companyType = oldEquipment.getCompanyType();
+
+            TEquipment equipment = new TEquipment();
+            equipment.setId(id);
+            equipment.setCreateDate(createDate);
+            equipment.setModifyDate(modifyDate);
+            equipment.setAdminId(adminId);
+            equipment.setAdminLevel(adminLevel);
+            equipment.setAdminPwd(adminPwd);
+            equipment.setAreaId(areaId);
+            equipment.setCabinetHd(cabinetHd);
+            equipment.setCabinetTm(cabinetTm);
+            equipment.setClientId(clientId);
+            equipment.setContactName(contactName);
+            equipment.setContactPhone(contactPhone);
+            equipment.setOperationalPhone(operationalPhone);
+            equipment.setOperationalName(operationalName);
+            equipment.setFurnaceSp(furnaceSp);
+            equipment.setFurnaceTm(furnaceTm);
+            equipment.setGuestPwd(guestPwd);
+            equipment.setIsNetWork(isNetWork);
+            equipment.setIsUsing(isUsing);
+            equipment.setLastUpdateTime(lastUpdateTime);
+            equipment.setLatitude(latitude);
+            equipment.setLongitude(longitude);
+            equipment.setManagerId(managerId);
+            equipment.setSelfName(selfName);
+            equipment.setChannel(channel);
+            equipment.setName(name);
+            equipment.setNetWorkingMode(netWorkingMode);
+            equipment.setOperator(operator);
+            equipment.setPayType(payType);
+            equipment.setProductTotal(productTotal);
+            equipment.setSimNo(simNo);
+            equipment.setSn(sn);
+            equipment.setAdminUserName(adminUserName);
+            equipment.setAgencyId(agencyId);
+            equipment.setMerchantId(merchantId);
+            equipment.setCompanyPhone(companyPhone);
+            equipment.setPersonageId(personageId);
+            equipment.setType(type);
+            equipment.setFullName(fullName);
+            equipment.setPushUpdateTime(pushUpdateTime);
+            equipment.setTimeRuleId(timeRuleId);
+            equipment.setGtClientId(gtClientId);
+            equipment.setEqeStatus(eqeStatus);
+            equipment.setIsBlocked(isBlocked);
+            equipment.setMessageReceiver(messageReceiver);
+            equipment.setIsSleep(isSleep);
+            equipment.setAdvancedParameters(advancedParameters);
+            equipment.setVolume(volume);
+            equipment.setCommonParameters(commonParameters);
+            equipment.setNetwork(network);
+            equipment.setOffTime(offTime);
+            equipment.setBootTime(bootTime);
+            equipment.setPlcVersion(plcVersion);
+            equipment.setEquimentType(equipmentType);
+            equipment.setEndDate(endDate);
+            equipment.setFlowers(flowers);
+            equipment.setMachineType(machineType);
+//                equipment.setApkVersion();
+//                equipment.setCouponStatus();
+            equipment.setCompanyType(companyType);
+            equipment.setPaymentType(paymentType);
+
+            equipmentService.save(oldEquipment);
+
+            return R.ok("同步设备编号" + clientId + "的 equipment 信息成功");
+
+
+        } else {
+            return R.fail("参数有误");
+        }
+    }
+
+//    @ApiOperation(value = "同步一台机器设备")
+
+    /*
+        获取 adminId 的所有设备信息
+        先查新旧系统两边的设备信息
+            if 新系统账户下没有设备
+                直接将旧系统的设备批量插入
+            if 新系统账户下有设备
+                比较设备编号有没有重复的
+                if 没有，直接插入
+                if 有，报错
+     */
+    @ApiOperation(value = "同步 adminId 用户名下的所有机器设备") // 考虑权限和上下级
+    @PostMapping("/syncEquipmentsByAdminId")
+    public ResponseModel<?> syncEquipmentsByAdminId(Long adminId) {
+        if (adminId != null) {
+            List<TEquipment> oldEquipmentList = R.getDataIfSuccess(syncOldFeign.getEquipmentByAdminId(adminId));
+
+
+            LambdaQueryWrapper<TEquipment> lqw = Wrappers.lambdaQuery();
+            lqw.eq(TEquipment::getAdminId, adminId);
+            List<TEquipment> newEquipmentList = equipmentService.list(lqw);
+
+
+            if (newEquipmentList.isEmpty()) {
+                // 伪批量插入
+//                equipmentService.saveBatch(oldEquipmentList);
+                // 真批量插入
+//                equipmentMapper.insertBatchSomeColumn(oldEquipmentList);
+                for (TEquipment oldEquipment : oldEquipmentList) {
+                    Long id = oldEquipment.getId();
+                    Date createDate = oldEquipment.getCreateDate();
+                    Date modifyDate = oldEquipment.getModifyDate();
+//                    Long adminId = oldEquipment.getAdminId();
+                    String adminLevel = oldEquipment.getAdminLevel();
+                    String adminPwd = oldEquipment.getAdminPwd();
+                    Long areaId = oldEquipment.getAreaId();
+                    String cabinetHd = oldEquipment.getCabinetHd();
+                    String cabinetTm = oldEquipment.getCabinetTm();
+//                    String clientId = oldEquipment.getClientId();
+                    String contactName = oldEquipment.getContactName();
+                    String contactPhone = oldEquipment.getContactPhone();
+                    String operationalPhone = oldEquipment.getOperationalPhone();
+                    String operationalName = oldEquipment.getOperationalName();
+                    String furnaceSp = oldEquipment.getFurnaceSp();
+                    String furnaceTm = oldEquipment.getFurnaceTm();
+                    String guestPwd = oldEquipment.getGuestPwd();
+                    Boolean isNetWork = oldEquipment.getIsNetWork();
+                    Boolean isUsing = oldEquipment.getIsUsing();
+                    Date lastUpdateTime = oldEquipment.getLastUpdateTime();
+                    Double latitude = oldEquipment.getLatitude();
+                    Double longitude = oldEquipment.getLongitude();
+                    String managerId = oldEquipment.getManagerId();
+                    String selfName = oldEquipment.getSelfName();
+                    String channel = oldEquipment.getChannel();
+                    String name = oldEquipment.getName();
+                    String netWorkingMode = oldEquipment.getNetWorkingMode();
+                    String operator = oldEquipment.getOperator();
+                    Integer payType = oldEquipment.getPayType();
+                    Integer productTotal = oldEquipment.getProductTotal();
+                    String simNo = oldEquipment.getSimNo();
+                    String sn = oldEquipment.getSn();
+                    String adminUserName = oldEquipment.getAdminUserName();
+                    Long agencyId = oldEquipment.getAgencyId();
+                    Long merchantId = oldEquipment.getMerchantId();
+                    String companyPhone = oldEquipment.getCompanyPhone();
+                    Long personageId = oldEquipment.getPersonageId();
+                    Integer type = oldEquipment.getType();
+                    String fullName = oldEquipment.getFullName();
+                    Date pushUpdateTime = oldEquipment.getPushUpdateTime();
+                    Long timeRuleId = oldEquipment.getTimeRuleId();
+                    String gtClientId = oldEquipment.getGtClientId();
+                    Integer eqeStatus = oldEquipment.getEqeStatus();
+                    Boolean isBlocked = oldEquipment.getIsBlocked();
+                    String messageReceiver = oldEquipment.getMessageReceiver();
+                    Boolean isSleep = oldEquipment.getIsSleep();
+                    String advancedParameters = oldEquipment.getAdvancedParameters();
+                    String volume = oldEquipment.getVolume();
+                    String commonParameters = oldEquipment.getCommonParameters();
+                    String network = oldEquipment.getNetwork();
+                    String offTime = oldEquipment.getOffTime();
+                    String bootTime = oldEquipment.getBootTime();
+                    String plcVersion = oldEquipment.getPlcVersion();
+                    String equipmentType = oldEquipment.getEquimentType();
+                    Date endDate = oldEquipment.getEndDate();
+                    String flowers = oldEquipment.getFlowers();
+                    String machineType = oldEquipment.getMachineType();
+//                    String apkVersion = oldEquipment.getApkVersion(); // 旧系统没有
+//                    String couponStatus = oldEquipment.getCouponStatus(); // 旧系统没有
+                    String paymentType = oldEquipment.getPaymentType();
+                    String companyType = oldEquipment.getCompanyType();
+
+                    TEquipment equipment = new TEquipment();
+                    equipment.setId(id);
+                    equipment.setCreateDate(createDate);
+                    equipment.setModifyDate(modifyDate);
+                    equipment.setAdminId(adminId);
+                    equipment.setAdminLevel(adminLevel);
+                    equipment.setAdminPwd(adminPwd);
+                    equipment.setAreaId(areaId);
+                    equipment.setCabinetHd(cabinetHd);
+                    equipment.setCabinetTm(cabinetTm);
+//                    equipment.setClientId(clientId);
+                    equipment.setContactName(contactName);
+                    equipment.setContactPhone(contactPhone);
+                    equipment.setOperationalPhone(operationalPhone);
+                    equipment.setOperationalName(operationalName);
+                    equipment.setFurnaceSp(furnaceSp);
+                    equipment.setFurnaceTm(furnaceTm);
+                    equipment.setGuestPwd(guestPwd);
+                    equipment.setIsNetWork(isNetWork);
+                    equipment.setIsUsing(isUsing);
+                    equipment.setLastUpdateTime(lastUpdateTime);
+                    equipment.setLatitude(latitude);
+                    equipment.setLongitude(longitude);
+                    equipment.setManagerId(managerId);
+                    equipment.setSelfName(selfName);
+                    equipment.setChannel(channel);
+                    equipment.setName(name);
+                    equipment.setNetWorkingMode(netWorkingMode);
+                    equipment.setOperator(operator);
+                    equipment.setPayType(payType);
+                    equipment.setProductTotal(productTotal);
+                    equipment.setSimNo(simNo);
+                    equipment.setSn(sn);
+                    equipment.setAdminUserName(adminUserName);
+                    equipment.setAgencyId(agencyId);
+                    equipment.setMerchantId(merchantId);
+                    equipment.setCompanyPhone(companyPhone);
+                    equipment.setPersonageId(personageId);
+                    equipment.setType(type);
+                    equipment.setFullName(fullName);
+                    equipment.setPushUpdateTime(pushUpdateTime);
+                    equipment.setTimeRuleId(timeRuleId);
+                    equipment.setGtClientId(gtClientId);
+                    equipment.setEqeStatus(eqeStatus);
+                    equipment.setIsBlocked(isBlocked);
+                    equipment.setMessageReceiver(messageReceiver);
+                    equipment.setIsSleep(isSleep);
+                    equipment.setAdvancedParameters(advancedParameters);
+                    equipment.setVolume(volume);
+                    equipment.setCommonParameters(commonParameters);
+                    equipment.setNetwork(network);
+                    equipment.setOffTime(offTime);
+                    equipment.setBootTime(bootTime);
+                    equipment.setPlcVersion(plcVersion);
+                    equipment.setEquimentType(equipmentType);
+                    equipment.setEndDate(endDate);
+                    equipment.setFlowers(flowers);
+                    equipment.setMachineType(machineType);
+//                    equipment.setApkVersion();
+//                    equipment.setCouponStatus();
+                    equipment.setCompanyType(companyType);
+                    equipment.setPaymentType(paymentType);
+
+                    equipmentService.save(oldEquipment);
+
+                }
+
+            }
+//            else {
+//                for (TEquipment oldEquipment : oldEquipmentList) {
+//                    for (TEquipment newEquipment : newEquipmentList) {
+//                        if (newEquipment.getId().equals(oldEquipment.getId())) {
+//                            return R.fail("新系统已存在相同id的记录");
+//                        }
+//                        else {
+//                            equipmentService.save(oldEquipment);
+//                        }
+//                    }
+//                }
+//            }
+
+
+            return R.ok("批量插入成功");
+        } else {
+            return R.fail("旧系统用户不存在");
+        }
+    }
+
+    @ApiOperation(value = "同步旧系统某一时间段内的所有 t_equipment ") // 废弃~~~ 改用 getEquipmentByAdmin
+    @PostMapping("/syncEquipmentsInTime")
+    public ResponseModel<?> syncEquipmentsInTime(String startTime, String endTime) {
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            List<TEquipment> oldEquipmentList = R.getDataIfSuccess(syncOldFeign.getEquipmentInTime(startTime, endTime));
+
+//            equipmentService.saveBatch(oldEquipmentList); // 伪批量
+
+//            equipmentMapper.insertBatchSomeColumn(oldEquipmentList); // 真批量
+
+            for (TEquipment oldEquipment : oldEquipmentList) {
+//                equipmentService.saveOrUpdate(oldEquipment); // 防止新旧表结构不同，不做直接插入
+                Long id = oldEquipment.getId();
+                Date createDate = oldEquipment.getCreateDate();
+                Date modifyDate = oldEquipment.getModifyDate();
+                Long adminId = oldEquipment.getAdminId();
+                String adminLevel = oldEquipment.getAdminLevel();
+                String adminPwd = oldEquipment.getAdminPwd();
+                Long areaId = oldEquipment.getAreaId();
+                String cabinetHd = oldEquipment.getCabinetHd();
+                String cabinetTm = oldEquipment.getCabinetTm();
+                String clientId = oldEquipment.getClientId();
+                String contactName = oldEquipment.getContactName();
+                String contactPhone = oldEquipment.getContactPhone();
+                String operationalPhone = oldEquipment.getOperationalPhone();
+                String operationalName = oldEquipment.getOperationalName();
+                String furnaceSp = oldEquipment.getFurnaceSp();
+                String furnaceTm = oldEquipment.getFurnaceTm();
+                String guestPwd = oldEquipment.getGuestPwd();
+                Boolean isNetWork = oldEquipment.getIsNetWork();
+                Boolean isUsing = oldEquipment.getIsUsing();
+                Date lastUpdateTime = oldEquipment.getLastUpdateTime();
+                Double latitude = oldEquipment.getLatitude();
+                Double longitude = oldEquipment.getLongitude();
+                String managerId = oldEquipment.getManagerId();
+                String selfName = oldEquipment.getSelfName();
+                String channel = oldEquipment.getChannel();
+                String name = oldEquipment.getName();
+                String netWorkingMode = oldEquipment.getNetWorkingMode();
+                String operator = oldEquipment.getOperator();
+                Integer payType = oldEquipment.getPayType();
+                Integer productTotal = oldEquipment.getProductTotal();
+                String simNo = oldEquipment.getSimNo();
+                String sn = oldEquipment.getSn();
+                String adminUserName = oldEquipment.getAdminUserName();
+                Long agencyId = oldEquipment.getAgencyId();
+                Long merchantId = oldEquipment.getMerchantId();
+                String companyPhone = oldEquipment.getCompanyPhone();
+                Long personageId = oldEquipment.getPersonageId();
+                Integer type = oldEquipment.getType();
+                String fullName = oldEquipment.getFullName();
+                Date pushUpdateTime = oldEquipment.getPushUpdateTime();
+                Long timeRuleId = oldEquipment.getTimeRuleId();
+                String gtClientId = oldEquipment.getGtClientId();
+                Integer eqeStatus = oldEquipment.getEqeStatus();
+                Boolean isBlocked = oldEquipment.getIsBlocked();
+                String messageReceiver = oldEquipment.getMessageReceiver();
+                Boolean isSleep = oldEquipment.getIsSleep();
+                String advancedParameters = oldEquipment.getAdvancedParameters();
+                String volume = oldEquipment.getVolume();
+                String commonParameters = oldEquipment.getCommonParameters();
+                String network = oldEquipment.getNetwork();
+                String offTime = oldEquipment.getOffTime();
+                String bootTime = oldEquipment.getBootTime();
+                String plcVersion = oldEquipment.getPlcVersion();
+                String equipmentType = oldEquipment.getEquimentType();
+                Date endDate = oldEquipment.getEndDate();
+                String flowers = oldEquipment.getFlowers();
+                String machineType = oldEquipment.getMachineType();
+//                String apkVersion = oldEquipment.getApkVersion(); // 旧系统没有
+//                String couponStatus = oldEquipment.getCouponStatus(); // 旧系统没有
+                String paymentType = oldEquipment.getPaymentType();
+                String companyType = oldEquipment.getCompanyType();
+
+                TEquipment equipment = new TEquipment();
+                equipment.setId(id);
+                equipment.setCreateDate(createDate);
+                equipment.setModifyDate(modifyDate);
+                equipment.setAdminId(adminId);
+                equipment.setAdminLevel(adminLevel);
+                equipment.setAdminPwd(adminPwd);
+                equipment.setAreaId(areaId);
+                equipment.setCabinetHd(cabinetHd);
+                equipment.setCabinetTm(cabinetTm);
+                equipment.setClientId(clientId);
+                equipment.setContactName(contactName);
+                equipment.setContactPhone(contactPhone);
+                equipment.setOperationalPhone(operationalPhone);
+                equipment.setOperationalName(operationalName);
+                equipment.setFurnaceSp(furnaceSp);
+                equipment.setFurnaceTm(furnaceTm);
+                equipment.setGuestPwd(guestPwd);
+                equipment.setIsNetWork(isNetWork);
+                equipment.setIsUsing(isUsing);
+                equipment.setLastUpdateTime(lastUpdateTime);
+                equipment.setLatitude(latitude);
+                equipment.setLongitude(longitude);
+                equipment.setManagerId(managerId);
+                equipment.setSelfName(selfName);
+                equipment.setChannel(channel);
+                equipment.setName(name);
+                equipment.setNetWorkingMode(netWorkingMode);
+                equipment.setOperator(operator);
+                equipment.setPayType(payType);
+                equipment.setProductTotal(productTotal);
+                equipment.setSimNo(simNo);
+                equipment.setSn(sn);
+                equipment.setAdminUserName(adminUserName);
+                equipment.setAgencyId(agencyId);
+                equipment.setMerchantId(merchantId);
+                equipment.setCompanyPhone(companyPhone);
+                equipment.setPersonageId(personageId);
+                equipment.setType(type);
+                equipment.setFullName(fullName);
+                equipment.setPushUpdateTime(pushUpdateTime);
+                equipment.setTimeRuleId(timeRuleId);
+                equipment.setGtClientId(gtClientId);
+                equipment.setEqeStatus(eqeStatus);
+                equipment.setIsBlocked(isBlocked);
+                equipment.setMessageReceiver(messageReceiver);
+                equipment.setIsSleep(isSleep);
+                equipment.setAdvancedParameters(advancedParameters);
+                equipment.setVolume(volume);
+                equipment.setCommonParameters(commonParameters);
+                equipment.setNetwork(network);
+                equipment.setOffTime(offTime);
+                equipment.setBootTime(bootTime);
+                equipment.setPlcVersion(plcVersion);
+                equipment.setEquimentType(equipmentType);
+                equipment.setEndDate(endDate);
+                equipment.setFlowers(flowers);
+                equipment.setMachineType(machineType);
+//                equipment.setApkVersion();
+//                equipment.setCouponStatus();
+                equipment.setCompanyType(companyType);
+                equipment.setPaymentType(paymentType);
+
+                equipmentService.save(oldEquipment);
+            }
+            return R.ok("同步" + startTime + "至" + endTime + "的 equipment 信息成功");
+        } else {
+            return R.fail("时间参数不能为空");
+        }
+    }
+
+
+}

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

@@ -0,0 +1,43 @@
+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.TJoinpayMch;
+import com.szwl.service.TJoinpayMchService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@Slf4j
+@Api(value = "/syncOldJoinpayMch", tags = {"根据用户同步旧系统分销数据"})
+@RestController
+@RequestMapping("/syncOldJoinpayMch")
+public class SyncOldJoinpayMchController {
+
+    TJoinpayMchService joinpayMchService;
+    SyncOldFeign syncOldFeign;
+
+    public SyncOldJoinpayMchController(TJoinpayMchService joinpayMchService, SyncOldFeign syncOldFeign) {
+        this.joinpayMchService = joinpayMchService;
+        this.syncOldFeign = syncOldFeign;
+    }
+
+    @ApiOperation(value = "根据用户id同步汇聚支付信息")
+    @PostMapping("/syncJoinpayMchByAdminId")
+    public ResponseModel<?> syncJoinpayMchByAdminId(Long adminId) {
+        if (adminId == null) {
+            return R.fail("参数不能为空");
+        }
+        TJoinpayMch joinpayMch = R.getDataIfSuccess(syncOldFeign.getJoinpayMchByAdminId(adminId));
+        if (Objects.nonNull(joinpayMch)) {
+            joinpayMchService.save(joinpayMch);
+        }
+        return R.ok("同步用户" + adminId + "的汇聚支付信息成功");
+    }
+}

src/main/java/com/szwl/controller/SyncOldProductController.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.feign.bean.SyncOldFeign;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.model.entity.TProduct;
+import com.szwl.service.TEquipmentService;
+import com.szwl.service.TProductService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.omg.CORBA.Object;
+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 java.util.Objects;
+
+@Slf4j
+@Api(value = "/syncOldProduct", tags = {"同步旧系统的 product 花型数据"})
+@RestController
+@RequestMapping("/syncOldProduct")
+public class SyncOldProductController {
+
+    TEquipmentService equipmentService;
+
+    TProductService productService;
+
+    SyncOldFeign syncOldFeign;
+
+    public SyncOldProductController(TEquipmentService equipmentService, TProductService productService, SyncOldFeign syncOldFeign) {
+        this.equipmentService = equipmentService;
+        this.productService = productService;
+        this.syncOldFeign = syncOldFeign;
+    }
+
+
+    @ApiOperation(value = "同步花型数据")
+    @PostMapping("/syncProductByEquipmentId")
+    public ResponseModel<?> syncProductByEquipmentId(String equipmentId) {
+        if (StringUtils.isEmpty(equipmentId)) {
+            return R.fail("参数不能为空");
+        }
+
+        LambdaQueryWrapper<TProduct> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(TProduct::getEquipmentId, equipmentId);
+        TProduct product = productService.getOne(wrapper);
+        if (Objects.isNull(product)) {
+            List<TProduct> productList = R.getDataIfSuccess(syncOldFeign.getProductByEquipmentId(equipmentId));
+//            TProduct newProduct = new TProduct();
+            productService.saveBatch(productList);
+            return R.ok("同步" + equipmentId + "的花型数据成功");
+        } else {
+            return R.fail("花型数据已存在");
+        }
+    }
+
+}

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

@@ -0,0 +1,49 @@
+package com.szwl.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.feign.bean.SyncOldFeign;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TProportion;
+import com.szwl.service.TProportionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@Slf4j
+@Api(value = "/syncOldProportion", tags = {"同步旧系统的分销信息"})
+@RestController
+@RequestMapping("/syncOldProportion")
+public class SyncOldProportionController {
+
+    SyncOldFeign syncOldFeign;
+    TProportionService proportionService;
+
+
+    public SyncOldProportionController(SyncOldFeign syncOldFeign, TProportionService proportionService) {
+        this.syncOldFeign = syncOldFeign;
+        this.proportionService = proportionService;
+    }
+
+
+    @ApiOperation(value = "根据用户id同步分销信息")
+    @PostMapping("/syncProportionByAdminId")
+    public ResponseModel<?> syncProportionByAdminId(Long adminId) {
+        if(adminId == null) {
+            return R.fail("参数不能为空");
+        }
+
+        TProportion proportion = R.getDataIfSuccess(syncOldFeign.getProportionByAdminId(adminId));
+        if (Objects.nonNull(proportion)) {
+            proportionService.save(proportion);
+        }
+        return R.ok("同步用户" + adminId + "分销信息成功");
+    }
+
+}

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

@@ -1,62 +0,0 @@
-package com.szwl.controller;
-
-import com.szwl.feign.bean.PayFeign;
-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 {
-
-    PayFeign payFeign;
-    TOrderService orderService;
-    SyncOldFeign syncOldFeign;
-    public SyncOrderController(PayFeign payFeign, TOrderService orderService, SyncOldFeign syncOldFeign) {
-        this.payFeign = payFeign;
-        this.orderService = orderService;
-        this.syncOldFeign = syncOldFeign;
-    }
-
-    @ApiOperation(value = "同步国内某客户的某一设备某一时间段内的 order 订单")
-    @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));
-
-            if (orderList.size()>1000) {
-                return R.fail("数据量过大，请缩短时间范围");
-            }
-
-            for (TOrder order : orderList) {
-//                System.out.println("order》》" + order);
-                payFeign.addOrder(order);
-            }
-
-            return R.ok(adminId + "同步设备" + clientId + "从" + startTime + "至" + endTime + "的 order 信息成功");
-        } else {
-            return R.fail("参数不能为空");
-        }
-    }
-
-}

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

@@ -15,6 +15,7 @@ import com.szwl.model.entity.*;
 import com.szwl.model.utils.PushUtils;
 import com.szwl.service.*;
 import com.szwl.service.es.EsTEquipmentService;
+import com.szwl.util.IDGenerator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -212,6 +213,7 @@ public class TEquipmentApplyController {
                             return R.ok(null,"审核成功");
                         }
                         TEquipment equipment = new TEquipment();
+                        equipment.setId(IDGenerator.commonID());
                         equipment.setCreateDate(new Date());
                         equipment.setModifyDate(new Date());
                         equipment.setClientId(clientId);

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

@@ -1,13 +1,11 @@
 package com.szwl.feign.bean;
 
 import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.entity.TAdmin;
-import com.szwl.model.entity.TCoinOrder;
-import com.szwl.model.entity.TEquipment;
-import com.szwl.model.entity.TOrder;
+import com.szwl.model.entity.*;
 import org.springframework.cloud.openfeign.FeignClient;
 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.RequestParam;
 
 import java.util.Date;
@@ -16,46 +14,30 @@ import java.util.List;
 @FeignClient(name = "syncOld-server")
 //@FeignClient(name = "syncOld-server", url = "http://127.0.0.1:49015")
 public interface SyncOldFeign {
+    @GetMapping("/oldProportion/getProportionByAdminId")
+    ResponseModel<TProportion> getProportionByAdminId(@RequestParam Long adminId);
 
+    @GetMapping("/oldJoinpayMch/getJoinpayMchByAdminId")
+    ResponseModel<TJoinpayMch> getJoinpayMchByAdminId(@RequestParam Long adminId);
 
-
-    /**
-     * syncOrder 同步 coinOrder 表
-     * @param adminId
-     * @param clientId
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    @PostMapping("/syncCoinOrder/getCoinOrderByACT")
-    ResponseModel<List<TCoinOrder>> getCoinOrderByACT(@RequestParam Long adminId, @RequestParam String clientId, @RequestParam String startTime, @RequestParam String endTime);
-
-    /**
-     * 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);
-
+    @GetMapping("/oldProduct/getProductByEquipmentId")
+    ResponseModel<List<TProduct>> getProductByEquipmentId(@RequestParam String equipmentId);
 
     /**
      * 通过 adminId 获取用户信息
      * @param adminId
      * @return
      */
-    @GetMapping("/syncOldByClient/getAdminById")
+    @GetMapping("/oldAdmin/getAdminById")
     ResponseModel<TAdmin> getAdminById(@RequestParam String adminId);
 
+
     /**
      * 查找 adminId 用户的所有 equipment
      * @param adminId
      * @return
      */
-    @PostMapping("/syncOldByClient/getEquipmentByAdminId")
+    @GetMapping("/oldEquipment/getEquipmentByAdminId")
     ResponseModel<List<TEquipment>> getEquipmentByAdminId(@RequestParam Long adminId);
 
 
@@ -64,7 +46,7 @@ public interface SyncOldFeign {
      * @param clientId
      * @return
      */
-    @GetMapping("/syncOldByClient/getEquipmentByClientId")
+    @GetMapping("/oldEquipment/getEquipmentByClientId")
     ResponseModel<TEquipment> getEquipmentByClientId(@RequestParam String clientId);
 
 
@@ -73,7 +55,7 @@ public interface SyncOldFeign {
      * @param startTime
      * @param endTime
      */
-    @PostMapping("/syncOldByTime/getEquipmentInTime")
+    @GetMapping("/oldEquipment/getEquipmentInTime")
     ResponseModel<List<TEquipment>> getEquipmentInTime(@RequestParam String startTime, @RequestParam String endTime);
 
     /**
@@ -82,7 +64,7 @@ public interface SyncOldFeign {
      * @param endTime
      * @return
      */
-    @PostMapping("/syncOldByTime/getAdminInTime")
+    @GetMapping("/oldAdmin/getAdminInTime")
     ResponseModel<List<TAdmin>> getAdminInTime(@RequestParam String startTime, @RequestParam String endTime);
 
 

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

@@ -4,6 +4,8 @@ import com.szwl.model.entity.TEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.szwl.model.query.StatisticsParam;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -17,4 +19,7 @@ public interface TEquipmentMapper extends BaseMapper<TEquipment> {
     String findMachineTotalNum(StatisticsParam param);
 
     String findMachineUseNum(StatisticsParam param);
+
+    int insertBatchSomeColumn(List<TEquipment> entityList);
+
 }

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

@@ -68,4 +68,11 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
     public String findMachineUseNum(StatisticsParam param) {
         return tEquipmentMapper.findMachineUseNum(param);
     }
+
+//    @Override
+//    public Integer insertBatchSomeColumn(List<TEquipment> entityList) {
+//        return tEquipmentMapper.insertBatchSomeColumn(entityList);
+//    }
+
+
 }

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

@@ -0,0 +1,16 @@
+package com.szwl.util;
+
+import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
+import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
+
+import java.util.List;
+
+public class InsertBatchSomeColumnSqlInjector extends DefaultSqlInjector {
+    @Override
+    public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
+        List<AbstractMethod> methodList = super.getMethodList(mapperClass);
+        methodList.add(new InsertBatchSomeColumn());
+        return methodList;
+    }
+}