From b37bdc2060e6bd7bf8cb2b2d844fe45a549d210a Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 21 Jun 2023 12:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
index 4a4c64c..4cf34b4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
@@ -16,10 +16,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.node.ForestNodeMerger;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@@ -41,6 +39,37 @@
private final IAttAdBaseService attAdBaseService;
+ @ApiOperation(value = "中台行政区划-添加", notes = "中台行政区划-添加")
+ @PostMapping(value = "/save")
+ public R add(AttAdBase attAdBase) {
+ return R.data(attAdBaseService.save(attAdBase));
+ }
+
+ @ApiOperation(value = "中台行政区划-修改", notes = "中台行政区划-修改")
+ @PostMapping(value = "/edit")
+ public R edit(AttAdBase attAdBase) {
+ return R.data(attAdBaseService.updateById(attAdBase));
+ }
+
+ @ApiOperation(value = "中台行政区划-添加修改", notes = "中台行政区划-添加修改")
+ @PostMapping(value = "/submit")
+ public R submit(AttAdBase attAdBase) {
+ return R.data(attAdBaseService.saveOrUpdate(attAdBase));
+ }
+
+ @ApiOperation(value = "中台行政区划-删除", notes = "中台行政区划-删除")
+ @GetMapping(value = "/remove")
+ public R edit(String guid) {
+ return R.data(attAdBaseService.removeById(guid));
+ }
+
+ @ApiOperation(value = "中台行政区划-查询详情", notes = "中台行政区划-查询详情")
+ @GetMapping(value = "/getDetail")
+ public R getDetail(AttAdBase attAdBase) {
+ AttAdBaseVO one = attAdBaseService.getDetail(attAdBase);
+ return R.data(one);
+ }
+
@ApiOperation(value = "中台行政区划-分页列表查询", notes = "中台行政区划-分页列表查询")
@GetMapping(value = "/list")
public R queryPageList(AttAdBase attAdBase, Query query) {
@@ -48,6 +77,67 @@
return R.data(pageList);
}
+ @GetMapping("/select")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "code", value = "区划编号", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "name", value = "区划名称", paramType = "query", dataType = "string")
+ })
+ @ApiOperation(value = "加载树列表", notes = "传入code")
+ public R<List<AttAdBaseVO>> select(String parentCode, @ApiIgnore @RequestParam Map<String, Object> obj) {
+ String code = obj.get("code").toString();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,4));
+ }
+ List<AttAdBaseVO> list = attAdBaseService.lazyTree(parentCode, obj);
+ return R.data(listNodeLazyVO(list));
+ }
+
+ @GetMapping("/selectAll")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "code", value = "区划编号", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "name", value = "区划名称", paramType = "query", dataType = "string")
+ })
+ @ApiOperation(value = "加载树列表", notes = "传入code")
+ public R<List<AttAdBaseVO>> selectAll(String parentCode, @ApiIgnore @RequestParam Map<String, Object> obj) {
+ if (ObjectUtil.isNotEmpty(obj.get("code"))){
+ String code = obj.get("code").toString();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,4));
+ } else if (code.substring(0,8).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,6));
+ }
+ }
+ List<AttAdBaseVO> list = attAdBaseService.lazyTreeAll(parentCode, obj);
+ return R.data(listNodeLazyVO(list));
+ }
+
+ /**
+ * 查询区域菜单树-带层级
+ * @param parentCode
+ * @param obj
+ * @return
+ */
+ @GetMapping("/selectAttAdBaseTree")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "code", value = "区划编号", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "name", value = "区划名称", paramType = "query", dataType = "string")
+ })
+ @ApiOperation(value = "加载树列表", notes = "传入code")
+ public R selectAttAdBaseTree(String parentCode, @ApiIgnore @RequestParam Map<String, Object> obj) {
+ String code = obj.get("code").toString();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,4));
+ }
+ // 查询并返回
+ return R.data(attAdBaseService.selectAttAdBaseTree(parentCode, obj));
+ }
+
/**
* 懒加载列表 懒加载待优化
*/
--
Gitblit v1.9.3