11
Jinquan_Ou
2023-03-19 25daafc859bc6042c3b50ce2ebae49f8d7294888
11
2个文件已修改
5个文件已添加
2 文件已重命名
186 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/ZDict.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/mapper/ZDictMapper.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZDictService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZDictServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
        {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java
New file
@@ -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();
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
File was renamed from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/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 {
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
File was renamed from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/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;
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -58,6 +58,8 @@
        }
    }
    /**
     * 返回成功消息
     * 
zhang-content/src/main/java/com/ruoyi/domain/ZDict.java
New file
@@ -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 +
        "}";
    }
}
zhang-content/src/main/java/com/ruoyi/mapper/ZDictMapper.java
New file
@@ -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> {
}
zhang-content/src/main/java/com/ruoyi/service/ZDictService.java
New file
@@ -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();
}
zhang-content/src/main/java/com/ruoyi/service/impl/ZDictServiceImpl.java
New file
@@ -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);
    }
}