init

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AreaCodeController.java

@@ -2,19 +2,14 @@ package com.ruoyi.xq.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.AreaCode;
 import com.ruoyi.xq.dto.admin.areacode.AreaCodeAdminTree;
-import com.ruoyi.xq.dto.app.areacode.AreaCodeTree;
 import com.ruoyi.xq.service.AreaCodeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -44,9 +39,9 @@ public class AreaCodeController extends BaseController {
      */
     @SaCheckPermission("xq:areaCode:list")
     @GetMapping("/list")
-    public TableDataInfo<AreaCode> list(AreaCode bo, PageQuery pageQuery) {
+    public R<List<AreaCode>> list(AreaCode bo) {
-        Page<AreaCode> page = areaCodeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        List<AreaCode> list = areaCodeService.list(Wrappers.lambdaQuery(bo).select(AreaCode::getCode, AreaCode::getName,AreaCode::getPcode));
-        return TableDataInfo.build(page);
+        return R.ok(list);
     }
 
     /**
@@ -56,8 +51,7 @@ public class AreaCodeController extends BaseController {
      */
     @SaCheckPermission("xq:areaCode:query")
     @GetMapping("/{code}")
-    public R<AreaCode> getInfo(@NotNull(message = "主键不能为空")
+    public R<AreaCode> getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer code) {
-                                     @PathVariable Integer code) {
         return R.ok(areaCodeService.getById(code));
     }
 
@@ -67,17 +61,6 @@ public class AreaCodeController extends BaseController {
         return R.ok(node);
     }
 
-    /**
-     * 新增行政区划
-     */
-    @SaCheckPermission("xq:areaCode:add")
-    @Log(title = "行政区划", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody AreaCode bo) {
-        return toAjax(areaCodeService.save(bo));
-    }
-
     /**
      * 修改行政区划
      */

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AreaCode.java

@@ -45,6 +45,7 @@ public class AreaCode implements Serializable {
      * 行政区划完整名字
      */
     private String fullname;
+    private Integer enableStatus;
     /**
      * 经度
      */