hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
wanglei 2 years ago
parent d6da6f9a6d ac164b3bab
commit 596d4f31ed
5 changed files with 60 additions and 54 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/resources/application-hs.yml
Unescape View File

@ -6,6 +6,10 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
#内网数据库
#url: jdbc:mysql://172.16.9.9:3306/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: root
#password: ruanfa
url: jdbc:mysql://localhost:3307/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3307/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: hs123456 password: hs123456

1
ruoyi-admin/src/main/resources/application-test.yml
Unescape View File

@ -6,6 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
#内网jenkins启动连接内网数据库szxc
url: jdbc:mysql://localhost:3306/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: ceshi username: ceshi
password: ruanfa password: ruanfa

78
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcNews.java
Unescape View File

@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 公告资讯对象 szxc_news * 公告资讯对象 szxc_news
* *
* @author hs * @author hs
* @date 2024-03-16 * @date 2024-04-03
*/ */
public class SzxcNews extends BaseEntity public class SzxcNews extends BaseEntity
{ {
@ -22,8 +22,8 @@ public class SzxcNews extends BaseEntity
@Excel(name = "标题") @Excel(name = "标题")
private String title; private String title;
/** 类型(公告/咨询) */ /** 类型(字典) */
@Excel(name = "类型(公告/咨询)") @Excel(name = "类型(字典)")
private String type; private String type;
/** 图片 */ /** 图片 */
@ -36,7 +36,7 @@ public class SzxcNews extends BaseEntity
/** 级别(县/乡/村) */ /** 级别(县/乡/村) */
@Excel(name = "级别(县/乡/村)") @Excel(name = "级别(县/乡/村)")
private String leave; private String sort;
/** 部门id */ /** 部门id */
@Excel(name = "部门id") @Excel(name = "部门id")
@ -50,84 +50,84 @@ public class SzxcNews extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setTitle(String title) public void setTitle(String title)
{ {
this.title = title; this.title = title;
} }
public String getTitle() public String getTitle()
{ {
return title; return title;
} }
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
public String getType() public String getType()
{ {
return type; return type;
} }
public void setPicture(String picture) public void setPicture(String picture)
{ {
this.picture = picture; this.picture = picture;
} }
public String getPicture() public String getPicture()
{ {
return picture; return picture;
} }
public void setContent(String content) public void setContent(String content)
{ {
this.content = content; this.content = content;
} }
public String getContent() public String getContent()
{ {
return content; return content;
} }
public void setLeave(String leave) public void setSort(String sort)
{ {
this.leave = leave; this.sort = sort;
} }
public String getLeave() public String getSort()
{ {
return leave; return sort;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId)
{ {
this.deptId = deptId; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName)
{ {
this.deptName = deptName; this.deptName = deptName;
} }
public String getDeptName() public String getDeptName()
{ {
return deptName; return deptName;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
@ -135,19 +135,19 @@ public class SzxcNews extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("title", getTitle()) .append("title", getTitle())
.append("type", getType()) .append("type", getType())
.append("picture", getPicture()) .append("picture", getPicture())
.append("content", getContent()) .append("content", getContent())
.append("leave", getLeave()) .append("sort", getSort())
.append("createBy", getCreateBy()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.append("deptId", getDeptId()) .append("deptId", getDeptId())
.append("deptName", getDeptName()) .append("deptName", getDeptName())
.append("userId", getUserId()) .append("userId", getUserId())
.toString(); .toString();
} }
} }

30
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcNewsMapper.xml
Unescape View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
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.szxc.mapper.SzxcNewsMapper"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcNewsMapper">
<resultMap type="SzxcNews" id="SzxcNewsResult"> <resultMap type="SzxcNews" id="SzxcNewsResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="title" column="title" /> <result property="title" column="title" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="picture" column="picture" /> <result property="picture" column="picture" />
<result property="content" column="content" /> <result property="content" column="content" />
<result property="leave" column="leave" /> <result property="sort" column="sort" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
@ -21,28 +21,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcNewsVo"> <sql id="selectSzxcNewsVo">
select id, title, type, picture, content, leave, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_news select id, title, type, picture, content, sort, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_news
</sql> </sql>
<select id="selectSzxcNewsList" parameterType="SzxcNews" resultMap="SzxcNewsResult"> <select id="selectSzxcNewsList" parameterType="SzxcNews" resultMap="SzxcNewsResult">
<include refid="selectSzxcNewsVo"/> <include refid="selectSzxcNewsVo"/>
<where> <where>
<if test="title != null and title != ''"> and title = #{title}</if> <if test="title != null and title != ''"> and title = #{title}</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="picture != null and picture != ''"> and picture = #{picture}</if> <if test="picture != null and picture != ''"> and picture = #{picture}</if>
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="leave != null and leave != ''"> and leave = #{leave}</if> <if test="sort != null and sort != ''"> and sort = #{sort}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if> <if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSzxcNewsById" parameterType="Long" resultMap="SzxcNewsResult"> <select id="selectSzxcNewsById" parameterType="Long" resultMap="SzxcNewsResult">
<include refid="selectSzxcNewsVo"/> <include refid="selectSzxcNewsVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSzxcNews" parameterType="SzxcNews" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcNews" parameterType="SzxcNews" useGeneratedKeys="true" keyProperty="id">
insert into szxc_news insert into szxc_news
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="picture != null">picture,</if> <if test="picture != null">picture,</if>
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="leave != null">leave,</if> <if test="sort != null">sort,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
@ -58,13 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if> <if test="deptName != null">dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="title != null and title != ''">#{title},</if> <if test="title != null and title != ''">#{title},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="picture != null">#{picture},</if> <if test="picture != null">#{picture},</if>
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="leave != null">#{leave},</if> <if test="sort != null">#{sort},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if> <if test="deptName != null">#{deptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcNews" parameterType="SzxcNews"> <update id="updateSzxcNews" parameterType="SzxcNews">
@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="picture != null">picture = #{picture},</if> <if test="picture != null">picture = #{picture},</if>
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="leave != null">leave = #{leave},</if> <if test="sort != null">sort = #{sort},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSzxcNewsByIds" parameterType="String"> <delete id="deleteSzxcNewsByIds" parameterType="String">
delete from szxc_news where id in delete from szxc_news where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

1
ruoyi-ui/vue.config.js
Unescape View File

@ -36,6 +36,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8090`, target: `http://localhost:8090`,
//target: `http://172.16.9.9:8090`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save