From e64669bf3528ac7c2e0cbcb956574721b376bd38 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 14:37:14 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java | 21 +++++++++++++++++++++
zy-acs-common/src/main/java/com/zy/acs/common/utils/Utils.java | 3 ---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java | 4 ++++
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/utils/Utils.java b/zy-acs-common/src/main/java/com/zy/acs/common/utils/Utils.java
index 9aeb598..2c250f3 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/utils/Utils.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/utils/Utils.java
@@ -182,9 +182,6 @@
}
}
- /**
- * 澶ч┘宄� 杞� symbol灏忛┘宄�
- */
public static String toSymbolCase(String str, char symbol) {
if (str == null) {
return null;
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 aaa84f0..58d15e3 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,6 +2,8 @@
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.utils.Utils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.OperationLog;
@@ -10,6 +12,7 @@
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Route;
+import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.RouteService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
@RestController
@RequestMapping("/api")
@@ -25,6 +30,8 @@
@Autowired
private RouteService routeService;
+ @Autowired
+ private CodeService codeService;
@PreAuthorize("hasAuthority('manager:route:list')")
@PostMapping("/route/page")
@@ -112,7 +119,21 @@
@PostMapping("/route/import")
public R importBatch(@RequestBody List<Map<String, Object>> list) {
Date now = new Date(); Long userId = getLoginUserId();
+ String regex = "([a-zA-Z]+)\\(";
+ Pattern pattern = Pattern.compile(regex);
for (Map<String, Object> map : list) {
+ Map<String, Object> one = new HashMap<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String key = entry.getKey();
+ Matcher matcher = pattern.matcher(key);
+ if (matcher.find()) {
+ key = matcher.group(1);
+ }
+ key = Utils.toCamelCase(key);
+ one.put(key, entry.getValue());
+ }
+ Route route = Cools.conver(one, Route.class);
+ System.out.println(GsonUtils.toJson(route));
}
return R.ok();
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java
index 7d4df2a..c77e036 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java
@@ -1,6 +1,7 @@
package com.zy.acs.manager.manager.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.acs.framework.common.SpringUtils;
@@ -114,6 +115,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField(exist = false)
+ private Double distance;
+
public Route() {}
public Route(String uuid,String name,Long startCode,Long endCode,String codeArr,String codeDataArr,Integer direction,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
--
Gitblit v1.9.1