From b1aa2db9a07d3ef819751931b24f6d754634468b Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Thu, 20 Aug 2020 14:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=81=E4=B9=A0=E6=95=99=E5=B8=88=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SchoolCommonController.java | 20 + .../controller/jxjs/TsbzJdxController.java | 17 +- ruoyi-ui/src/api/jxjs/jdx.js | 53 +++ ruoyi-ui/src/views/jxjs/jdx/index.vue | 383 ++++++++++++++++++ 4 files changed, 467 insertions(+), 6 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java create mode 100644 ruoyi-ui/src/api/jxjs/jdx.js create mode 100644 ruoyi-ui/src/views/jxjs/jdx/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java new file mode 100644 index 000000000..115f3253d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java @@ -0,0 +1,20 @@ +package com.ruoyi.web.controller.common; + +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@RestController +public class SchoolCommonController { + public boolean isStringEmpty(String str) { + if (str == null || "".equals(str)) { + return true; + } + return false; + } + + // 生成UUID + public String getUuid() { + return UUID.randomUUID().toString().replace("-", ""); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java index fe0585075..322e4c7b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.jxjs; import java.util.List; + +import com.ruoyi.web.controller.common.SchoolCommonController; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,11 +34,13 @@ public class TsbzJdxController extends BaseController { @Autowired private ITsbzJdxService tsbzJdxService; + @Autowired + private SchoolCommonController schoolCommonController; /** * 查询基地校列表 */ - @PreAuthorize("@ss.hasPermi('system:jdx:list')") + @PreAuthorize("@ss.hasPermi('jxjs:jdx:list')") @GetMapping("/list") public TableDataInfo list(TsbzJdx tsbzJdx) { @@ -48,7 +52,7 @@ public class TsbzJdxController extends BaseController /** * 导出基地校列表 */ - @PreAuthorize("@ss.hasPermi('system:jdx:export')") + @PreAuthorize("@ss.hasPermi('jxjs:jdx:export')") @Log(title = "基地校", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(TsbzJdx tsbzJdx) @@ -61,7 +65,7 @@ public class TsbzJdxController extends BaseController /** * 获取基地校详细信息 */ - @PreAuthorize("@ss.hasPermi('system:jdx:query')") + @PreAuthorize("@ss.hasPermi('jxjs:jdx:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { @@ -71,18 +75,19 @@ public class TsbzJdxController extends BaseController /** * 新增基地校 */ - @PreAuthorize("@ss.hasPermi('system:jdx:add')") + @PreAuthorize("@ss.hasPermi('jxjs:jdx:add')") @Log(title = "基地校", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TsbzJdx tsbzJdx) { + tsbzJdx.setId(schoolCommonController.getUuid()); return toAjax(tsbzJdxService.insertTsbzJdx(tsbzJdx)); } /** * 修改基地校 */ - @PreAuthorize("@ss.hasPermi('system:jdx:edit')") + @PreAuthorize("@ss.hasPermi('jxjs:jdx:edit')") @Log(title = "基地校", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TsbzJdx tsbzJdx) @@ -93,7 +98,7 @@ public class TsbzJdxController extends BaseController /** * 删除基地校 */ - @PreAuthorize("@ss.hasPermi('system:jdx:remove')") + @PreAuthorize("@ss.hasPermi('jxjs:jdx:remove')") @Log(title = "基地校", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) diff --git a/ruoyi-ui/src/api/jxjs/jdx.js b/ruoyi-ui/src/api/jxjs/jdx.js new file mode 100644 index 000000000..f9dcf3e93 --- /dev/null +++ b/ruoyi-ui/src/api/jxjs/jdx.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询基地校列表 +export function listJdx(query) { + return request({ + url: '/jxjs/jdx/list', + method: 'get', + params: query + }) +} + +// 查询基地校详细 +export function getJdx(id) { + return request({ + url: '/jxjs/jdx/' + id, + method: 'get' + }) +} + +// 新增基地校 +export function addJdx(data) { + return request({ + url: '/jxjs/jdx', + method: 'post', + data: data + }) +} + +// 修改基地校 +export function updateJdx(data) { + return request({ + url: '/jxjs/jdx', + method: 'put', + data: data + }) +} + +// 删除基地校 +export function delJdx(id) { + return request({ + url: '/jxjs/jdx/' + id, + method: 'delete' + }) +} + +// 导出基地校 +export function exportJdx(query) { + return request({ + url: '/jxjs/jdx/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/jxjs/jdx/index.vue b/ruoyi-ui/src/views/jxjs/jdx/index.vue new file mode 100644 index 000000000..5b3904ce7 --- /dev/null +++ b/ruoyi-ui/src/views/jxjs/jdx/index.vue @@ -0,0 +1,383 @@ + + +