dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8.14

Browse Source
This commit is contained in:
xvv 2024-08-19 18:02:03 +08:00
parent c93be562ea
commit bdc6e97379
8 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/cms/core/NewTreeSelect.java
View File

@ -27,6 +27,8 @@ public class NewTreeSelect{
/** 栏目模板 */ /** 栏目模板 */
private String temp; private String temp;
/** 图标 */
private String iconUrl;
/** 子节点 */ /** 子节点 */
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
@ -43,6 +45,7 @@ public class NewTreeSelect{
this.label = category.getCategoryName(); this.label = category.getCategoryName();
this.jumpUrl = category.getCategoryUrl(); this.jumpUrl = category.getCategoryUrl();
this.temp = category.getTemp(); this.temp = category.getTemp();
this.iconUrl = category.getIconUrl();
this.children = category.getChildren().stream().map(NewTreeSelect::new).collect(Collectors.toList()); this.children = category.getChildren().stream().map(NewTreeSelect::new).collect(Collectors.toList());
} }
} }

5
ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java
View File

@ -14,7 +14,7 @@ import java.util.List;
/** /**
* 栏目对象 cms_category * 栏目对象 cms_category
* *
* @author 点亮信息 * @author 点亮信息
* @date 2024-07-18 * @date 2024-07-18
*/ */
@ -49,6 +49,9 @@ public class CmsCategory extends BaseEntity
/** 是否显示(0：显示，1：不显示，默认0) */ /** 是否显示(0：显示，1：不显示，默认0) */
@Excel(name = "是否显示(0：显示，1：不显示，默认0)") @Excel(name = "是否显示(0：显示，1：不显示，默认0)")
private String isDisable; private String isDisable;
/** 栏目名称 */
@Excel(name = "图标")
private String iconUrl;
/** 逻辑删除0未删除1真删除 */ /** 逻辑删除0未删除1真删除 */
private Integer delFlag; private Integer delFlag;

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 8080 port: 8089
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /

16
ruoyi-admin/src/main/resources/mapper/cms/CmsCategoryMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cms.mapper.CmsCategoryMapper"> <mapper namespace="com.ruoyi.cms.mapper.CmsCategoryMapper">
<resultMap type="CmsCategory" id="CmsCategoryResult"> <resultMap type="CmsCategory" id="CmsCategoryResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="categoryName" column="category_name" /> <result property="categoryName" column="category_name" />
@ -18,15 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="iconUrl" column="icon_url" />
</resultMap> </resultMap>
<sql id="selectCmsCategoryVo"> <sql id="selectCmsCategoryVo">
select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by from cms_category select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by, icon_url from cms_category
</sql> </sql>
<select id="selectCmsCategoryList" parameterType="CmsCategory" resultMap="CmsCategoryResult"> <select id="selectCmsCategoryList" parameterType="CmsCategory" resultMap="CmsCategoryResult">
<include refid="selectCmsCategoryVo"/> <include refid="selectCmsCategoryVo"/>
<where> <where>
<if test="categoryName != null and categoryName != ''"> and category_name like concat('%', #{categoryName}, '%')</if> <if test="categoryName != null and categoryName != ''"> and category_name like concat('%', #{categoryName}, '%')</if>
<if test="categorySort != null "> and category_sort = #{categorySort}</if> <if test="categorySort != null "> and category_sort = #{categorySort}</if>
<if test="categoryUrl != null and categoryUrl != ''"> and category_url = #{categoryUrl}</if> <if test="categoryUrl != null and categoryUrl != ''"> and category_url = #{categoryUrl}</if>
@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
order by parent_id, category_sort order by parent_id, category_sort
</select> </select>
<select id="selectCmsCategoryById" parameterType="Long" resultMap="CmsCategoryResult"> <select id="selectCmsCategoryById" parameterType="Long" resultMap="CmsCategoryResult">
<include refid="selectCmsCategoryVo"/> <include refid="selectCmsCategoryVo"/>
where id = #{id} where id = #{id}
@ -59,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="iconUrl != null">icon_url,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="iconUrl != null">#{iconUrl},</if>
</trim> </trim>
</insert> </insert>
@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="iconUrl != null">icon_url = #{iconUrl},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
@ -108,4 +114,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="hasChildByCategoryId" resultType="Integer"> <select id="hasChildByCategoryId" resultType="Integer">
select count(1) from cms_category where parent_id = #{id} select count(1) from cms_category where parent_id = #{id}
</select> </select>
</mapper> </mapper>

6
ruoyi-admin/target/classes/application.yml
View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 8080 port: 8089
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -95,7 +95,9 @@ token:
# 令牌密钥 # 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟） # 令牌有效期（默认30分钟）
expireTime: 30 expireTime: 999999999
## MyBatis配置 ## MyBatis配置
#mybatis: #mybatis:

16
ruoyi-admin/target/classes/mapper/cms/CmsCategoryMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cms.mapper.CmsCategoryMapper"> <mapper namespace="com.ruoyi.cms.mapper.CmsCategoryMapper">
<resultMap type="CmsCategory" id="CmsCategoryResult"> <resultMap type="CmsCategory" id="CmsCategoryResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="categoryName" column="category_name" /> <result property="categoryName" column="category_name" />
@ -18,15 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="iconUrl" column="icon_url" />
</resultMap> </resultMap>
<sql id="selectCmsCategoryVo"> <sql id="selectCmsCategoryVo">
select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by from cms_category select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by, icon_url from cms_category
</sql> </sql>
<select id="selectCmsCategoryList" parameterType="CmsCategory" resultMap="CmsCategoryResult"> <select id="selectCmsCategoryList" parameterType="CmsCategory" resultMap="CmsCategoryResult">
<include refid="selectCmsCategoryVo"/> <include refid="selectCmsCategoryVo"/>
<where> <where>
<if test="categoryName != null and categoryName != ''"> and category_name like concat('%', #{categoryName}, '%')</if> <if test="categoryName != null and categoryName != ''"> and category_name like concat('%', #{categoryName}, '%')</if>
<if test="categorySort != null "> and category_sort = #{categorySort}</if> <if test="categorySort != null "> and category_sort = #{categorySort}</if>
<if test="categoryUrl != null and categoryUrl != ''"> and category_url = #{categoryUrl}</if> <if test="categoryUrl != null and categoryUrl != ''"> and category_url = #{categoryUrl}</if>
@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
order by parent_id, category_sort order by parent_id, category_sort
</select> </select>
<select id="selectCmsCategoryById" parameterType="Long" resultMap="CmsCategoryResult"> <select id="selectCmsCategoryById" parameterType="Long" resultMap="CmsCategoryResult">
<include refid="selectCmsCategoryVo"/> <include refid="selectCmsCategoryVo"/>
where id = #{id} where id = #{id}
@ -59,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="iconUrl != null">icon_url,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="iconUrl != null">#{iconUrl},</if>
</trim> </trim>
</insert> </insert>
@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="iconUrl != null">icon_url = #{iconUrl},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
@ -108,4 +114,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="hasChildByCategoryId" resultType="Integer"> <select id="hasChildByCategoryId" resultType="Integer">
select count(1) from cms_category where parent_id = #{id} select count(1) from cms_category where parent_id = #{id}
</select> </select>
</mapper> </mapper>

6
ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
View File

@ -17,6 +17,7 @@
<result property="author" column="author"/> <result property="author" column="author"/>
<result property="editor" column="editor"/> <result property="editor" column="editor"/>
<result property="summary" column="summary"/> <result property="summary" column="summary"/>
<result property="tagName" column="tag_name"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="publishDate" column="publish_date"/> <result property="publishDate" column="publish_date"/>
<result property="offlineDate" column="offline_date"/> <result property="offlineDate" column="offline_date"/>
@ -53,6 +54,7 @@
author, author,
editor, editor,
summary, summary,
tag_name,
status, status,
publish_date, publish_date,
offline_date, offline_date,
@ -111,6 +113,7 @@
content_img, content_img,
source, source,
source_url, source_url,
tag_name,
original, original,
author, author,
editor, editor,
@ -170,6 +173,7 @@
<if test="original != null and original != ''">original,</if> <if test="original != null and original != ''">original,</if>
<if test="author != null and author != ''">author,</if> <if test="author != null and author != ''">author,</if>
<if test="editor != null and editor != ''">editor,</if> <if test="editor != null and editor != ''">editor,</if>
<if test="tagName != null and tagName != ''">tag_name,</if>
<if test="summary != null and summary != ''">summary,</if> <if test="summary != null and summary != ''">summary,</if>
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="publishDate != null">publish_date,</if> <if test="publishDate != null">publish_date,</if>
@ -199,6 +203,7 @@
<if test="original != null and original != ''">#{original},</if> <if test="original != null and original != ''">#{original},</if>
<if test="author != null and author != ''">#{author},</if> <if test="author != null and author != ''">#{author},</if>
<if test="editor != null and editor != ''">#{editor},</if> <if test="editor != null and editor != ''">#{editor},</if>
<if test="tagName != null and tagName != ''">#{tagName},</if>
<if test="summary != null and summary != ''">#{summary},</if> <if test="summary != null and summary != ''">#{summary},</if>
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="publishDate != null">#{publishDate},</if> <if test="publishDate != null">#{publishDate},</if>
@ -236,6 +241,7 @@
source_url = #{sourceUrl}, source_url = #{sourceUrl},
original = #{original}, original = #{original},
author = #{author}, author = #{author},
tag_name = #{tagName},
editor = #{editor}, editor = #{editor},
summary = #{summary}, summary = #{summary},
status = #{status}, status = #{status},

2
ruoyi-ui/.env.development
View File

@ -4,6 +4,6 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = 'https://f382b38516.zicp.fun' VUE_APP_BASE_API = 'http://192.168.31.72:8089'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true