From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
index 6e576bc..e4b5621 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -8,18 +8,24 @@
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.framework.exception.CoolException;
import com.zy.acs.manager.common.annotation.OperationLog;
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.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Code;
+import com.zy.acs.manager.manager.entity.CodeGap;
+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.manager.service.impl.CodeServiceImpl;
import com.zy.acs.manager.system.controller.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -32,6 +38,10 @@
@Autowired
private CodeService codeService;
+ @Autowired
+ private CodeGapService codeGapService;
+ @Autowired
+ private RouteService routeService;
@PreAuthorize("hasAuthority('manager:code:list')")
@PostMapping("/code/page")
@@ -56,7 +66,7 @@
@PreAuthorize("hasAuthority('manager:code:list')")
@GetMapping("/code/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(codeService.getById(id));
+ return R.ok().add(codeService.getCacheById(id));
}
@PreAuthorize("hasAuthority('manager:code:save')")
@@ -97,9 +107,21 @@
@PreAuthorize("hasAuthority('manager:code:remove')")
@OperationLog("Delete Code")
@PostMapping("/code/remove/{ids}")
+ @Transactional
public R remove(@PathVariable Long[] ids) {
- if (!codeService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ for (Long id : ids) {
+ Code code = codeService.getById(id);
+ if (null == code) {
+ continue;
+ }
+ codeGapService.remove(new LambdaQueryWrapper<CodeGap>().eq(CodeGap::getCode0, code.getId()).or().eq(CodeGap::getCode1, code.getId()));
+ routeService.remove(new LambdaQueryWrapper<Route>().eq(Route::getStartCode, code.getId()).or().eq(Route::getEndCode, code.getId()));
+ if (!codeService.removeById(id)) {
+ throw new CoolException("failed to remove code");
+ } else {
+ CodeServiceImpl.CODE_ID_CACHE.remove(code.getId());
+ CodeServiceImpl.CODE_DATA_CACHE.remove(code.getData());
+ }
}
return R.ok("Delete Success").add(ids);
}
@@ -135,7 +157,7 @@
}
code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
code.setUuid("code".concat(code.getData()));
- code.setConcer(0);
+// code.setCorner(0);
code.setScale(GsonUtils.toJson(Cools.add("x", 1).add("y", 1)));
code.setCreateBy(userId);
code.setCreateTime(now);
--
Gitblit v1.9.1