From 25daafc859bc6042c3b50ce2ebae49f8d7294888 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期日, 19 三月 2023 11:50:18 +0800
Subject: [PATCH] 11
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZDictServiceImpl.java | 29 +++++++
zhang-content/src/main/java/com/ruoyi/service/ZDictService.java | 18 ++++
zhang-content/src/main/java/com/ruoyi/mapper/ZDictMapper.java | 19 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 10 ++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java | 2
zhang-content/src/main/java/com/ruoyi/domain/ZDict.java | 67 ++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java | 37 +++++++++
9 files changed, 183 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index f630899..6569b5d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -73,7 +73,7 @@
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
@PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file) throws Exception
+ public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file) throws Exception
{
try
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java
new file mode 100644
index 0000000..0c7daf0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java
@@ -0,0 +1,37 @@
+package com.ruoyi.web.controller.zhang;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZDict;
+import com.ruoyi.service.ZDictService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.naming.ldap.PagedResultsControl;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀛楀吀琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@RestController
+@RequestMapping("/zDict")
+public class ZDictController {
+
+ @Resource
+ private ZDictService zDictService;
+
+ @GetMapping("/all")
+ public AjaxResult getAllDict(){
+ return zDictService.listAllDict();
+ }
+
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
similarity index 61%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 484550c..c83c026 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -1,8 +1,12 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.zhang;
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,5 +21,9 @@
public class ZInfoUserController {
+
+
+
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
similarity index 98%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
index 73754b0..de7d918 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.zhang;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
index 42fbd9c..5dafbb8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -58,6 +58,8 @@
}
}
+
+
/**
* 杩斿洖鎴愬姛娑堟伅
*
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZDict.java b/zhang-content/src/main/java/com/ruoyi/domain/ZDict.java
new file mode 100644
index 0000000..d3944a6
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZDict.java
@@ -0,0 +1,67 @@
+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 瀛楀吀琛�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@TableName("z_dict")
+public class ZDict implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍒嗙被鐨勫悕绉�
+ */
+ private String name;
+
+ /**
+ * 鎵�鏈夌被鍒褰�
+ */
+ private String itemValues;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getItemValues() {
+ return itemValues;
+ }
+
+ public void setItemValues(String itemValues) {
+ this.itemValues = itemValues;
+ }
+
+ @Override
+ public String toString() {
+ return "ZDict{" +
+ "id=" + id +
+ ", name=" + name +
+ ", itemValues=" + itemValues +
+ "}";
+ }
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZDictMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZDictMapper.java
new file mode 100644
index 0000000..b7afc7f
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZDictMapper.java
@@ -0,0 +1,19 @@
+package com.ruoyi.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.ZDict;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 瀛楀吀琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@Mapper
+public interface ZDictMapper extends BaseMapper<ZDict> {
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZDictService.java b/zhang-content/src/main/java/com/ruoyi/service/ZDictService.java
new file mode 100644
index 0000000..54efb1d
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZDictService.java
@@ -0,0 +1,18 @@
+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZDict;
+
+/**
+ * <p>
+ * 瀛楀吀琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+public interface ZDictService extends IService<ZDict> {
+
+ AjaxResult listAllDict();
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZDictServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZDictServiceImpl.java
new file mode 100644
index 0000000..0fe5571
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZDictServiceImpl.java
@@ -0,0 +1,29 @@
+package com.ruoyi.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZDict;
+import com.ruoyi.mapper.ZDictMapper;
+import com.ruoyi.service.ZDictService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀛楀吀琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@Service
+public class ZDictServiceImpl extends ServiceImpl<ZDictMapper, ZDict> implements ZDictService {
+
+ @Override
+ public AjaxResult listAllDict() {
+ List<ZDict> list = list();
+ return AjaxResult.success(list);
+ }
+}
--
Gitblit v1.9.1