新增项目四库储备项目库

ruoyi-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>ruoyi-job</module>
         <module>ruoyi-system</module>
         <module>ruoyi-workflow</module>
+        <module>ruoyi-subject</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/controller/subject/SubjectController.java

@@ -0,0 +1,35 @@
+package org.dromara.subject.controller.subject;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.subject.domain.bo.SubjectBo;
+import org.dromara.subject.domain.vo.SubjectVo;
+import org.dromara.subject.service.ISubjectService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/subject/subject")
+public class SubjectController extends BaseController {
+
+    private final ISubjectService subjectService;
+
+    /**
+     * 获取参数配置列表
+     */
+/*    @SaCheckPermission("subject:subject:list")*/
+    @GetMapping("/list")
+    public TableDataInfo<SubjectVo> list(SubjectBo subject, PageQuery pageQuery) {
+        return subjectService.selectPageConfigList(subject, pageQuery);
+    }
+
+}

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/domain/Subject.java

@@ -0,0 +1,58 @@
+package org.dromara.subject.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sub_info")
+public class Subject {
+    private String id;
+    private String sub_id;
+    private String unit_id;
+    private String unit_desc;
+    private String sub_code;
+    private String sub_name;
+    private String indus_kind;
+    private Double amt_total;
+    private String abc;
+    private String subject_id;
+    private Date begin_date;
+    private Date end_date;
+    private Date rt_date;
+    private String content;
+    private String progress;
+    private String cb_status;
+    private Date qy_date;
+    private Date xj_date;
+    private Date zj_date;
+    private Date tc_date;
+    private int cb_num;
+    private int xj_num;
+    private int zj_num;
+    private String remark;
+    private String name_zrr;
+    private String tel;
+    private String name_lead;
+    private String tel_lead;
+    private String status;
+    private String is_rg;
+    private String rg_date;
+    private String create_user_id;
+    private String create_user_name;
+    private Date create_time;
+    private String last_update_user_id;
+    private String last_update_user_name;
+    private Date last_update_time;
+    private int logic_delete_flag;
+    private String status_lamp;
+}

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/domain/bo/SubjectBo.java

@@ -0,0 +1,63 @@
+package org.dromara.subject.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.subject.domain.Subject;
+
+
+import java.util.Date;
+
+/**
+ * 参数配置业务对象 sys_config
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Subject.class, reverseConvertGenerate = false)
+public class SubjectBo extends BaseEntity {
+    private String id;
+    private String sub_id;
+    private String unit_id;
+    private String unit_desc;
+    private String sub_code;
+    private String sub_name;
+    private String indus_kind;
+    private Double amt_total;
+    private String abc;
+    private String subject_id;
+    private Date begin_date;
+    private Date end_date;
+    private Date rt_date;
+    private String content;
+    private String progress;
+    private String cb_status;
+    private Date qy_date;
+    private Date xj_date;
+    private Date zj_date;
+    private Date tc_date;
+    private int cb_num;
+    private int xj_num;
+    private int zj_num;
+    private String remark;
+    private String name_zrr;
+    private String tel;
+    private String name_lead;
+    private String tel_lead;
+    private String status;
+    private String is_rg;
+    private String rg_date;
+    private String create_user_id;
+    private String create_user_name;
+    private Date create_time;
+    private String last_update_user_id;
+    private String last_update_user_name;
+    private Date last_update_time;
+    private int logic_delete_flag;
+    private String status_lamp;
+
+
+}

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/domain/vo/SubjectVo.java

@@ -0,0 +1,59 @@
+package org.dromara.subject.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.subject.domain.Subject;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 参数配置视图对象 sys_config
+ *
+ * @author Michelle.Chung
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = Subject.class)
+public class SubjectVo implements Serializable {
+    private String id;
+    private String sub_id;
+    private String unit_id;
+    private String unit_desc;
+    private String sub_code;
+    private String sub_name;
+    private String indus_kind;
+    private Double amt_total;
+    private String abc;
+    private String subject_id;
+    private Date begin_date;
+    private Date end_date;
+    private Date rt_date;
+    private String content;
+    private String progress;
+    private String cb_status;
+    private Date qy_date;
+    private Date xj_date;
+    private Date zj_date;
+    private Date tc_date;
+    private int cb_num;
+    private int xj_num;
+    private int zj_num;
+    private String remark;
+    private String name_zrr;
+    private String tel;
+    private String name_lead;
+    private String tel_lead;
+    private String status;
+    private String is_rg;
+    private String rg_date;
+    private String create_user_id;
+    private String create_user_name;
+    private Date create_time;
+    private String last_update_user_id;
+    private String last_update_user_name;
+    private Date last_update_time;
+    private int logic_delete_flag;
+    private String status_lamp;
+}

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/mapper/SubjectMapper.java

@@ -0,0 +1,14 @@
+package org.dromara.subject.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.subject.domain.Subject;
+import org.dromara.subject.domain.vo.SubjectVo;
+
+/**
+ * 参数配置 数据层
+ *
+ * @author Lion Li
+ */
+public interface SubjectMapper extends BaseMapperPlus<Subject, SubjectVo> {
+
+}

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/service/ISubjectService.java

@@ -0,0 +1,19 @@
+package org.dromara.subject.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.subject.domain.bo.SubjectBo;
+import org.dromara.subject.domain.vo.SubjectVo;
+
+import java.util.List;
+
+/**
+ * 参数配置 服务层
+ *
+ * @author Lion Li
+ */
+public interface ISubjectService {
+
+    TableDataInfo<SubjectVo> selectPageConfigList(SubjectBo config, PageQuery pageQuery);
+
+}

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/service/impl/SubjectServiceImpl.java

@@ -0,0 +1,64 @@
+package org.dromara.subject.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.ConfigService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.subject.domain.Subject;
+import org.dromara.subject.domain.bo.SubjectBo;
+import org.dromara.subject.domain.vo.SubjectVo;
+import org.dromara.subject.mapper.SubjectMapper;
+import org.dromara.subject.service.ISubjectService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 参数配置 服务层实现
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Service
+public class SubjectServiceImpl implements ISubjectService {
+
+    private final SubjectMapper baseMapper;
+
+    @Override
+    public TableDataInfo<SubjectVo> selectPageConfigList(SubjectBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<Subject> lqw = buildQueryWrapper(bo);
+        Page<SubjectVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+
+    private LambdaQueryWrapper<Subject> buildQueryWrapper(SubjectBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<Subject> lqw = Wrappers.lambdaQuery();
+/*        lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysConfig::getConfigName, bo.getConfigName());
+        lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysConfig::getConfigType, bo.getConfigType());
+        lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysConfig::getConfigKey, bo.getConfigKey());*/
+/*        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+            SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));*/
+        lqw.orderByAsc(Subject::getId);
+        return lqw;
+    }
+
+
+}

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysNoticeMapper.xml → ruoyi-modules/ruoyi-subject/src/main/resources/mapper/subject/SubjectMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysNoticeMapper">
+<mapper namespace="org.dromara.system.mapper.SysConfigMapper">
 
 </mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysClientMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysClientMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysConfigMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysDeptMapper">
-
-    <resultMap type="org.dromara.subject.domain.vo.SysDeptVo" id="SysDeptResult">
-    </resultMap>
-
-    <select id="selectDeptList" resultMap="SysDeptResult">
-        select
-        <if test="ew.getSqlSelect != null">
-            ${ew.getSqlSelect}
-        </if>
-        <if test="ew.getSqlSelect == null">
-            *
-        </if>
-        from sys_dept ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="countDeptById" resultType="Long">
-        select count(*) from sys_dept where del_flag = '0' and dept_id = #{deptId}
-    </select>
-
-    <select id="selectDeptListByRoleId" resultType="Long">
-        select d.dept_id
-        from sys_dept d
-            left join sys_role_dept rd on d.dept_id = rd.dept_id
-        where rd.role_id = #{roleId}
-            <if test="deptCheckStrictly">
-                and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
-            </if>
-        order by d.parent_id, d.order_num
-    </select>
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysDictDataMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysDictTypeMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysLogininforMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysMenuMapper">
-
-    <resultMap type="org.dromara.subject.domain.SysMenu" id="SysMenuResult">
-    </resultMap>
-
-    <select id="selectMenuListByUserId" resultMap="SysMenuResult">
-        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query_param, m.visible, m.status,
-        m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-        from sys_menu m
-            left join sys_role_menu rm on m.menu_id = rm.menu_id
-            left join sys_role r on rm.role_id = r.role_id
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-        select distinct m.menu_id,
-                        m.parent_id,
-                        m.menu_name,
-                        m.path,
-                        m.component,
-                        m.query_param,
-                        m.visible,
-                        m.status,
-                        m.perms,
-                        m.is_frame,
-                        m.is_cache,
-                        m.menu_type,
-                        m.icon,
-                        m.order_num,
-                        m.create_time
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-                 left join sys_role r on rm.role_id = r.role_id and r.status = '0'
-        where m.menu_type in ('M', 'C')
-          and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
-        order by m.parent_id, m.order_num
-    </select>
-
-    <select id="selectMenuListByRoleId" resultType="Long">
-        select m.menu_id
-        from sys_menu m
-        left join sys_role_menu rm on m.menu_id = rm.menu_id
-        where rm.role_id = #{roleId}
-        <if test="menuCheckStrictly">
-            and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id =
-            rm.menu_id and rm.role_id = #{roleId})
-        </if>
-        order by m.parent_id, m.order_num
-    </select>
-
-    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
-        select distinct m.perms
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-                 left join sys_role r on r.role_id = rm.role_id and r.status = '0'
-        where r.role_id in (select role_id from sys_user_role where user_id = #{userId})
-    </select>
-
-    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
-        select distinct m.perms
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-        where m.status = '0' and rm.role_id = #{roleId}
-    </select>
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysOperLogMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysOssConfigMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysOssConfigMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysOssMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysOssMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysPostMapper.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysPostMapper">
-
-    <resultMap type="org.dromara.subject.domain.vo.SysPostVo" id="SysPostResult">
-    </resultMap>
-
-    <select id="selectPagePostList" resultMap="SysPostResult">
-        select
-        <if test="ew.getSqlSelect != null">
-            ${ew.getSqlSelect}
-        </if>
-        <if test="ew.getSqlSelect == null">
-            *
-        </if>
-        from sys_post ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectPostsByUserId" parameterType="Long" resultMap="SysPostResult">
-        select p.post_id, p.dept_id, p.post_name, p.post_code, p.post_category
-        from sys_post p
-                 left join sys_user_post up on up.post_id = p.post_id
-                 left join sys_user u on u.user_id = up.user_id
-        where u.user_id = #{userId}
-    </select>
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysRoleDeptMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysRoleMapper">
-
-    <resultMap type="org.dromara.subject.domain.vo.SysRoleVo" id="SysRoleResult">
-    </resultMap>
-
-    <sql id="selectRoleVo">
-        select distinct r.role_id,
-                        r.role_name,
-                        r.role_key,
-                        r.role_sort,
-                        r.data_scope,
-                        r.menu_check_strictly,
-                        r.dept_check_strictly,
-                        r.status,
-                        r.del_flag,
-                        r.create_time,
-                        r.remark
-        from sys_role r
-                 left join sys_user_role sur on sur.role_id = r.role_id
-                 left join sys_user u on u.user_id = sur.user_id
-                 left join sys_dept d on u.dept_id = d.dept_id
-    </sql>
-
-    <select id="selectPageRoleList" resultMap="SysRoleResult">
-        <include refid="selectRoleVo"/>
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectRoleList" resultMap="SysRoleResult">
-        <include refid="selectRoleVo"/>
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
-        <include refid="selectRoleVo"/>
-        WHERE r.del_flag = '0' and sur.user_id = #{userId}
-    </select>
-
-    <select id="selectRolesByUserId" parameterType="Long" resultMap="SysRoleResult">
-        select r.role_id,
-               r.role_name,
-               r.role_key,
-               r.role_sort,
-               r.data_scope,
-               r.status
-        from sys_role r
-        WHERE r.del_flag = '0' and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
-    </select>
-
-    <select id="selectRoleById" resultMap="SysRoleResult">
-        <include refid="selectRoleVo"/>
-        WHERE r.del_flag = '0' and r.role_id = #{roleId}
-    </select>
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysRoleMenuMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysSocialMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysSocialMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysTenantMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysTenantPackageMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysTenantPackageMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysUserMapper">
-
-    <resultMap type="org.dromara.subject.domain.vo.SysUserVo" id="SysUserResult">
-        <id property="userId" column="user_id"/>
-    </resultMap>
-    <resultMap type="org.dromara.subject.domain.vo.SysUserExportVo" id="SysUserExportResult">
-        <id property="userId" column="user_id"/>
-    </resultMap>
-
-    <select id="selectPageUserList" resultMap="SysUserResult">
-        select
-        <if test="ew.getSqlSelect != null">
-            ${ew.getSqlSelect}
-        </if>
-        <if test="ew.getSqlSelect == null">
-            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
-        </if>
-        from sys_user u
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectUserList" resultMap="SysUserResult">
-        select
-        <if test="ew.getSqlSelect != null">
-            ${ew.getSqlSelect}
-        </if>
-        <if test="ew.getSqlSelect == null">
-            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
-        </if>
-        from sys_user u
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectUserExportList" resultMap="SysUserExportResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-            d.dept_name, d.leader, u1.user_name as leaderName
-        from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user u1 on u1.user_id = d.leader
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="countUserById" resultType="Long">
-        select count(*) from sys_user where del_flag = '0' and user_id = #{userId}
-    </select>
-
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysUserPostMapper">
-
-</mapper>

ruoyi-modules/ruoyi-subject/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.subject.mapper.SysUserRoleMapper">
-
-    <select id="selectUserIdsByRoleId" resultType="Long">
-        select u.user_id from sys_user u
-        inner join sys_user_role sur
-            on u.user_id = sur.user_id and sur.role_id = #{roleId}
-    </select>
-
-</mapper>

ruoyi-ui/apps/web-antd/src/api/subject/stock/reserve/index.ts

@@ -0,0 +1,55 @@
+import type { Config } from './model';
+
+import type { ID, IDS, PageQuery, PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+enum Api {
+  configExport = '/subject/config/export',
+  configInfoByKey = '/subject/config/configKey',
+  pageList = '/subject/subject/list',
+  configRefreshCache = '/subject/config/refreshCache',
+  root = '/system/config',
+}
+
+export function subjectList(params?: PageQuery) {
+  return requestClient.get<PageResult<Config>>(Api.pageList, { params });
+}
+
+export function configInfo(configId: ID) {
+  return requestClient.get<Config>(`${Api.root}/${configId}`);
+}
+
+export function configExport(data: any) {
+  return commonExport(Api.configExport, data);
+}
+
+/**
+ * 刷新缓存
+ * @returns void
+ */
+export function configRefreshCache() {
+  return requestClient.deleteWithMsg<void>(Api.configRefreshCache);
+}
+
+export function configUpdate(data: any) {
+  return requestClient.putWithMsg<void>(Api.root, data);
+}
+
+export function configAdd(data: any) {
+  return requestClient.postWithMsg<void>(Api.root, data);
+}
+
+export function configRemove(configIds: IDS) {
+  return requestClient.deleteWithMsg<void>(`${Api.root}/${configIds}`);
+}
+
+/**
+ * 获取配置信息
+ * @param configKey configKey
+ * @returns value
+ */
+export function configInfoByKey(configKey: string) {
+  return requestClient.get<string>(`${Api.configInfoByKey}/${configKey}`);
+}

ruoyi-ui/apps/web-antd/src/views/subject/stock/reserve/data.ts

@@ -1,11 +1,11 @@
-import type { VxeGridProps } from '#/adapter/vxe-table';
+import type {VxeGridProps} from '#/adapter/vxe-table';
 
-import { DictEnum } from '@vben/constants';
-import { getPopupContainer } from '@vben/utils';
+import {DictEnum} from '@vben/constants';
+import {getPopupContainer} from '@vben/utils';
 
-import { type FormSchemaGetter } from '#/adapter/form';
-import { getDictOptions } from '#/utils/dict';
-import { renderDict } from '#/utils/render';
+import {type FormSchemaGetter} from '#/adapter/form';
+import {getDictOptions} from '#/utils/dict';
+import {renderDict} from '#/utils/render';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -35,10 +35,11 @@ export const querySchema: FormSchemaGetter = () => [
 ];
 
 export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
+  {type: 'checkbox', width: 60},
   {
     title: '序号',
-    field: 'configName',
+    type: 'seq',
+    width: 50,
   },
   {
     title: '项目名称',
@@ -48,9 +49,9 @@ export const columns: VxeGridProps['columns'] = [
     title: '项目所在地',
     field: 'configValue',
     slots: {
-      default: ({ row }) => {
-          return row.configValue;
-/*        return renderDict(row.configType, DictEnum.SYS_YES_NO);*/
+      default: ({row}) => {
+        return row.configValue;
+        /*        return renderDict(row.configType, DictEnum.SYS_YES_NO);*/
       },
     },
   },
@@ -59,23 +60,24 @@ export const columns: VxeGridProps['columns'] = [
     field: 'configValue',
   },
   {
-    title: '计划总投资/n(亿元)',
+    title: '计划总投资(亿元)',
+    width: 100,
     field: 'configValue',
   },
   {
     title: '进展情况',
     field: 'configValue',
   },
-/*  {
-    title: '系统内置',
-    field: 'configType',
-    width: 120,
-    slots: {
-      default: ({ row }) => {
-        return renderDict(row.configType, DictEnum.SYS_YES_NO);
+  /*  {
+      title: '系统内置',
+      field: 'configType',
+      width: 120,
+      slots: {
+        default: ({ row }) => {
+          return renderDict(row.configType, DictEnum.SYS_YES_NO);
+        },
       },
-    },
-  },*/
+    },*/
   {
     title: '备注',
     field: 'remark',
@@ -87,7 +89,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     field: 'action',
     fixed: 'right',
-    slots: { default: 'action' },
+    slots: {default: 'action'},
     title: '操作',
     width: 180,
   },

ruoyi-ui/apps/web-antd/src/views/subject/stock/reserve/index.vue

@@ -15,10 +15,10 @@ import {
 } from '#/adapter/vxe-table';
 import {
   configExport,
-  configList,
+  subjectList,
   configRefreshCache,
   configRemove,
-} from '#/api/system/config';
+} from '#/api/subject/stock/reserve';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import configModal from './config-modal.vue';
@@ -57,7 +57,7 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        return await configList({
+        return await subjectList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,