From 0738b44fe051878706298958e76a6e74babb2ab2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 15:11:18 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
index 58d15e3..e1d0eb6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.acs.common.utils.GsonUtils;
+import com.zy.acs.common.constant.CommonConstant;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
@@ -10,8 +10,11 @@
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.RouteExcel;
import com.zy.acs.manager.common.utils.ExcelUtil;
+import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Route;
+import com.zy.acs.manager.manager.service.CodeGapService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.RouteService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -32,6 +35,8 @@
private RouteService routeService;
@Autowired
private CodeService codeService;
+ @Autowired
+ private CodeGapService codeGapService;
@PreAuthorize("hasAuthority('manager:route:list')")
@PostMapping("/route/page")
@@ -118,7 +123,7 @@
@PreAuthorize("hasAuthority('manager:route:save')")
@PostMapping("/route/import")
public R importBatch(@RequestBody List<Map<String, Object>> list) {
- Date now = new Date(); Long userId = getLoginUserId();
+ Long userId = getLoginUserId();
String regex = "([a-zA-Z]+)\\(";
Pattern pattern = Pattern.compile(regex);
for (Map<String, Object> map : list) {
@@ -132,8 +137,15 @@
key = Utils.toCamelCase(key);
one.put(key, entry.getValue());
}
- Route route = Cools.conver(one, Route.class);
- System.out.println(GsonUtils.toJson(route));
+ RouteExcel excelDto = Cools.conver(one, RouteExcel.class);
+
+ Code code0 = codeService.selectByData(Utils.zeroFill(excelDto.getStartCode(), CommonConstant.QR_CODE_LEN));
+ Code code1 = codeService.selectByData(Utils.zeroFill(excelDto.getEndCode(), CommonConstant.QR_CODE_LEN));
+
+ if (null == code0 || null == code1) { continue; }
+
+ routeService.createRouteByCode(code0, code1, excelDto.getDirection(), userId);
+ codeGapService.createCodeGapByCode(code0, code1, userId);
}
return R.ok();
}
--
Gitblit v1.9.1