Skip to content

C
chinafrica
提交 024d5074 authored 作者: zgy's avatar zgy
浏览文件
操作

完成社区：文章管理功能

上级 033b04b5
隐藏空白字符变更
内嵌 并排
正在显示 包含 294 行增加 和 193 行删除
platform-admin/src/main/java/com/platform/controller/TbCfStationItemController.java
浏览文件 @ 024d5074
...@@ -64,7 +64,9 @@ public class TbCfStationItemController extends ApiBaseAction { ...@@ -64,7 +64,9 @@ public class TbCfStationItemController extends ApiBaseAction {
@RequiresPermissions("tbcfstationitem:list") @RequiresPermissions("tbcfstationitem:list")
@ResponseBody @ResponseBody
public R list(@RequestParam Map<String, Object> params) { public R list(@RequestParam Map<String, Object> params) {
if (!Constant.SUPER_ADMIN.equals(ShiroUtils.getUserId())) { if (!Constant.SUPER_ADMIN.equals(ShiroUtils.getUserId()) &&
!Constant.SUPER_ITEM.equals(ShiroUtils.getUserId()) &&
!Constant.SUPER_USER.equals(ShiroUtils.getUserId())) {
params.put("creator", ShiroUtils.getUserId()); params.put("creator", ShiroUtils.getUserId());
} }
String userId = ShiroUtils.getUserId(); String userId = ShiroUtils.getUserId();
......
platform-admin/src/main/java/com/platform/controller/TbCfUserInfoController.java
浏览文件 @ 024d5074
...@@ -105,7 +105,7 @@ public class TbCfUserInfoController { ...@@ -105,7 +105,7 @@ public class TbCfUserInfoController {
@ResponseBody @ResponseBody
@GetMapping("/queryByAccount") @GetMapping("/queryByAccount")
public R queryByAccount(@RequestParam("account") String account) { public R queryByAccount(@RequestParam("account") String account) {
String userId = tbCfUserInfoService.queryById(account);
return R.ok(); return R.ok().put("userId", userId);
} }
} }
platform-admin/src/main/java/com/platform/entity/TbCfArticleEntity.java
浏览文件 @ 024d5074
...@@ -58,6 +58,16 @@ public class TbCfArticleEntity implements Serializable { ...@@ -58,6 +58,16 @@ public class TbCfArticleEntity implements Serializable {
*/ */
private Date updatetime; private Date updatetime;
private String account;
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
/** /**
* 设置：文章ID * 设置：文章ID
*/ */
......
platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java
浏览文件 @ 024d5074
...@@ -73,5 +73,5 @@ public interface TbCfUserInfoService { ...@@ -73,5 +73,5 @@ public interface TbCfUserInfoService {
long queryUserTotal(); long queryUserTotal();
boolean queryByAccount(String account); String queryByAccount(String account);
} }
platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java
浏览文件 @ 024d5074
...@@ -68,8 +68,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService { ...@@ -68,8 +68,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
} }
@Override @Override
public boolean queryByAccount(String account) { public String queryByAccount(String account) {
return tbCfUserInfoDao.queryById(account) == null ? true : false; return tbCfUserInfoDao.queryById(account) ;
} }
} }
platform-admin/src/main/resources/com/platform/dao/TbCfArticleDao.xml
浏览文件 @ 024d5074
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<result property="updatetime" column="updateTime"/> <result property="updatetime" column="updateTime"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfArticleEntity"> <select id="queryObject" resultType="com.platform.entity.TbCfArticleEntity">
select select
`id`, `id`,
`title`, `title`,
...@@ -34,46 +34,48 @@ ...@@ -34,46 +34,48 @@
where id = #{id} where id = #{id}
</select> </select>
<select id="queryList" resultType="com.platform.entity.TbCfArticleEntity"> <select id="queryList" resultType="com.platform.entity.TbCfArticleEntity">
select select
`id`, `id`,
`title`, `title`,
`content`, `content`,
`picture`, `picture`,
`author_type`, `author_type`,
`author`, `author`,
`like_num`, `like_num`,
`del_flag`, `del_flag`,
`top`, `top`,
`createTime`, `createTime`,
`updateTime` `updateTime`,
from tb_cf_article u.account account
WHERE 1=1 from tb_cf_article a left join tb_cf_user_info u
<if test="name != null and name.trim() != ''"> on a.author=u.user_id
AND name LIKE concat('%',#{name},'%') WHERE 1=1
</if> <if test="name != null and name.trim() != ''">
AND title LIKE concat('%',#{name},'%')
</if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by id desc order by createTime desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_article
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.platform.entity.TbCfArticleEntity"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_article
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND title LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.platform.entity.TbCfArticleEntity">
insert into tb_cf_article( insert into tb_cf_article(
`id`, `id`,
`title`, `title`,
...@@ -99,33 +101,33 @@ ...@@ -99,33 +101,33 @@
#{createtime}, #{createtime},
#{updatetime}) #{updatetime})
</insert> </insert>
<update id="update" parameterType="com.platform.entity.TbCfArticleEntity"> <update id="update" parameterType="com.platform.entity.TbCfArticleEntity">
update tb_cf_article update tb_cf_article
<set> <set>
<if test="title != null">`title` = #{title}, </if> <if test="title != null">`title` = #{title},</if>
<if test="content != null">`content` = #{content}, </if> <if test="content != null">`content` = #{content},</if>
<if test="picture != null">`picture` = #{picture}, </if> <if test="picture != null">`picture` = #{picture},</if>
<if test="authorType != null">`author_type` = #{authorType}, </if> <if test="authorType != null">`author_type` = #{authorType},</if>
<if test="author != null">`author` = #{author}, </if> <if test="author != null">`author` = #{author},</if>
<if test="likeNum != null">`like_num` = #{likeNum}, </if> <if test="likeNum != null">`like_num` = #{likeNum},</if>
<if test="delFlag != null">`del_flag` = #{delFlag}, </if> <if test="delFlag != null">`del_flag` = #{delFlag},</if>
<if test="top != null">`top` = #{top}, </if> <if test="top != null">`top` = #{top},</if>
<if test="createtime != null">`createTime` = #{createtime}, </if> <if test="createtime != null">`createTime` = #{createtime},</if>
<if test="updatetime != null">`updateTime` = #{updatetime}</if> <if test="updatetime != null">`updateTime` = #{updatetime}</if>
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
<delete id="delete"> <delete id="delete">
delete from tb_cf_article where id = #{value} delete from tb_cf_article where id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_article where id in delete from tb_cf_article where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>
\ No newline at end of file
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfarticle.html
浏览文件 @ 024d5074
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
</head> </head>
<body> <body>
<div id="rrapp" v-cloak style="height: calc(100% - 15px);"> <div id="rrapp" v-cloak style="height: calc(100% - 15px);">
<div v-show="showList" style="height: 100%;"> <div v-show="showList" style="height: 100%;">
<Row :gutter="16"> <Row :gutter="16">
<div class="search-group"> <div class="search-group">
<i-col span="4"> <i-col span="4">
<i-input v-model="q.name" @on-enter="query" placeholder="名称"/> <i-input v-model="q.name" @on-enter="query" placeholder="文章标题"/>
</i-col> </i-col>
<i-button @click="query">查询</i-button> <i-button @click="query">查询</i-button>
<i-button @click="reloadSearch">重置</i-button> <i-button @click="reloadSearch">重置</i-button>
...@@ -27,18 +27,35 @@ ...@@ -27,18 +27,35 @@
#end #end
</div> </div>
</Row> </Row>
<table id="jqGrid"></table> <table id="jqGrid"></table>
</div> </div>
<Card v-show="!showList"> <Card v-show="!showList">
<p slot="title">{{title}}</p> <p slot="title">{{title}}</p>
<i-form ref="formValidate" :model="tbCfArticle" :rules="ruleValidate" :label-width="80"> <i-form ref="formValidate" :model="tbCfArticle" :rules="ruleValidate" :label-width="80">
<Form-item label="文章标题" prop="title"> <Form-item label="文章标题" prop="title" style="width: 800px">
<i-input v-model="tbCfArticle.title" placeholder="文章标题"/> <i-input v-model="tbCfArticle.title" placeholder="文章标题"/>
</Form-item> </Form-item>
<!--<Form-item label="图片" prop="picture"> <!--<Form-item label="图片" prop="picture">
<i-input v-model="tbCfArticle.picture" placeholder="图片"/> <i-input v-model="tbCfArticle.picture" placeholder="图片"/>
</Form-item>--> </Form-item>-->
<!-- <Form-item label="用户类型" prop="authorType" style="width: 800px">-->
<!-- <i-select v-model="tbCfArticle.authorType" style="width:200px" @on-change="changeType" :disabled="disabled">-->
<!-- <i-option v-for="item in typeList" :value="item.value">{{ item.label }}</i-option>-->
<!-- </i-select>-->
<!-- </Form-item>-->
<Form-item label="用户类型" prop="authorType" style="width: 800px">
<i-select placeholder="请选择" v-model="tbCfArticle.authorType" :disabled="disabled"
@on-change="changeType">
<i-option v-for="(el,i) in typeList" :key='i'
:value="el.value">{{el.label}}
</i-option>
</i-select>
</Form-item>
<Form-item label="app账户" prop="author" style="width: 800px" v-show="!account">
<i-input v-model="tbCfArticle.author" placeholder="260977204970 or ctehillah@gmail.com"
@on-blur="queryAccount"/>
</Form-item>
<Form-item label="图片" prop="picture"> <Form-item label="图片" prop="picture">
<!-- <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> --> <!-- <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> -->
<upload <upload
...@@ -67,11 +84,12 @@ ...@@ -67,11 +84,12 @@
<Form-item> <Form-item>
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button> <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
<i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button> <i-button type="warning" @click="reload" style="margin-left: 8px"/>
返回</i-button>
<i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button> <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
</Form-item> </Form-item>
</i-form> </i-form>
</Card> </Card>
</div> </div>
<script src="${rc.contextPath}/statics/libs/iview.js"></script> <script src="${rc.contextPath}/statics/libs/iview.js"></script>
<script src="${rc.contextPath}/js/sys/tbcfarticle.js?_${date.systemTime}"></script> <script src="${rc.contextPath}/js/sys/tbcfarticle.js?_${date.systemTime}"></script>
......
platform-admin/src/main/webapp/js/common.js
浏览文件 @ 024d5074
...@@ -465,13 +465,22 @@ imageFormat = function (cellvalue, options, rowObject) { ...@@ -465,13 +465,22 @@ imageFormat = function (cellvalue, options, rowObject) {
if (cellvalue.indexOf(';')) { if (cellvalue.indexOf(';')) {
let split = cellvalue.split(';'); let split = cellvalue.split(';');
cellvalue = '<img src="' + split[0] + '" style="width:30px;height:30px;" />'; cellvalue = '<img src="' + split[0] + '" style="width:30px;height:30px;" />';
} else if (cellvalue.indexOf(',')) {
let split = cellvalue.split(',');
cellvalue = '<img src="' + split[0] + '" style="width:30px;height:30px;" />';
} else { } else {
cellvalue = '<img src="' + cellvalue + '" style="width:30px;height:30px;" />'; cellvalue = '<img src="' + cellvalue + '" style="width:30px;height:30px;" />';
} }
} }
return cellvalue; return cellvalue;
}; };
accountFormat = function (cellvalue, options, rowObject) {
if (cellvalue == '' || cellvalue == null) {
cellvalue = '系统用户';
}
return cellvalue;
}
/** /**
* 跳转翻译 * 跳转翻译
* @param cellvalue * @param cellvalue
......
platform-admin/src/main/webapp/js/sys/tbcfarticle.js
浏览文件 @ 024d5074
...@@ -2,115 +2,166 @@ $(function () { ...@@ -2,115 +2,166 @@ $(function () {
$("#jqGrid").Grid({ $("#jqGrid").Grid({
url: '../tbcfarticle/list', url: '../tbcfarticle/list',
colModel: [ colModel: [
{label: 'id', name: 'id', index: 'id', key: true, hidden: true}, {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
{label: '文章标题', name: 'title', index: 'title', width: 80}, {label: '文章标题', name: 'title', index: 'title', width: 80},
{label: '图片', name: 'picture', index: 'picture', width: 80}, {label: '图片', name: 'picture', index: 'picture', width: 80, formatter: imageFormat},
{label: '作者', name: 'author', index: 'author', width: 80}, {label: '作者', name: 'account', index: 'account', width: 80, formatter: accountFormat},
{label: '创建时间', name: 'createtime', index: 'createTime', width: 80} {label: '创建时间', name: 'createtime', index: 'createTime', width: 80}
] ]
}); });
}); });
let vm = new Vue({ let vm = new Vue({
el: '#rrapp', el: '#rrapp',
data: { data: {
showList: true, showList: true,
uploadList: [], account: true,
uploadList: [],
title: null, title: null,
tbCfArticle: {}, tbCfArticle: {},
ruleValidate: { typeList: [
name: [ {
{required: true, message: '名称不能为空', trigger: 'blur'} value: 0,
] label: '系统用户'
}, },
q: { {
name: '' value: 1,
} label: 'app用户'
}, }
methods: { ],
query: function () { ruleValidate: {
vm.reload(); name: [
}, {required: true, message: '名称不能为空', trigger: 'blur'}
add: function () { ]
vm.showList = false; },
vm.title = "新增"; q: {
vm.tbCfArticle = {}; name: ''
this.uploadList.length = 0; },
UE.getEditor('content').setContent(''); disabled: false,
}, flag: true
update: function (event) {
let id = getSelectedRow("#jqGrid");
if (id == null) {
return;
}
vm.showList = false;
vm.title = "修改";
vm.getInfo(id); },
}, methods: {
saveOrUpdate: function (event) { changeType: function () {
let url = vm.tbCfArticle.id == null ? "../tbcfarticle/save" : "../tbcfarticle/update"; let type = this.tbCfArticle.authorType;
vm.tbCfArticle.picture=this.uploadList.map(res=>res).join(','); if (type == '0') {
vm.tbCfArticle.content = encodeURI(UE.getEditor('content').getContent()); // 富文本取值 vm.account = true;
vm.tbCfArticle.content = vm.tbCfArticle.content.replace(/&nbsp;/g, " "); } else if (type == '1') {
vm.account = false;
}
},
queryAccount: function () {
let flag = vm.flag;
let url = '../tbcfuserinfo/queryByAccount?account=' + this.tbCfArticle.author;
Ajax.request({ Ajax.request({
url: url, url: url,
params: JSON.stringify(vm.tbCfArticle), type: "GET",
type: "POST", contentType: "application/json",
contentType: "application/json",
successCallback: function (r) { successCallback: function (r) {
alert('操作成功', function (index) { let userId = r.userId;
vm.reload(); if (userId == null || userId == '') {
}); flag = false
}
// alert('操作成功', function (index) {
// vm.reload();
// });
} }
}); });
}, return flag;
del: function (event) { },
query: function () {
vm.reload();
},
add: function () {
vm.disabled = false;
vm.showList = false;
vm.title = "新增";
vm.tbCfArticle = {};
this.uploadList.length = 0;
UE.getEditor('content').setContent('');
},
update: function (event) {
vm.disabled = true;
let id = getSelectedRow("#jqGrid");
if (id == null) {
return;
}
vm.showList = false;
vm.title = "修改";
vm.getInfo(id);
},
saveOrUpdate: function (event) {
let flag = this.queryAccount();
if (flag) {
let url = vm.tbCfArticle.id == null ? "../tbcfarticle/save" : "../tbcfarticle/update";
vm.tbCfArticle.picture = this.uploadList.map(res => res).join(',');
vm.tbCfArticle.content = encodeURI(UE.getEditor('content').getContent()); // 富文本取值
vm.tbCfArticle.content = vm.tbCfArticle.content.replace(/&nbsp;/g, " ");
Ajax.request({
url: url,
params: JSON.stringify(vm.tbCfArticle),
type: "POST",
contentType: "application/json",
successCallback: function (r) {
alert('操作成功', function (index) {
vm.reload();
});
}
});
} else {
alert('此用户不存在')
}
},
del: function (event) {
let ids = getSelectedRows("#jqGrid"); let ids = getSelectedRows("#jqGrid");
if (ids == null){ if (ids == null) {
return; return;
} }
confirm('确定要删除选中的记录？', function () { confirm('确定要删除选中的记录？', function () {
Ajax.request({ Ajax.request({
url: "../tbcfarticle/delete", url: "../tbcfarticle/delete",
params: JSON.stringify(ids), params: JSON.stringify(ids),
type: "POST", type: "POST",
contentType: "application/json", contentType: "application/json",
successCallback: function () { successCallback: function () {
alert('操作成功', function (index) { alert('操作成功', function (index) {
vm.reload(); vm.reload();
}); });
} }
}); });
}); });
}, },
getInfo: function(id){ getInfo: function (id) {
Ajax.request({ Ajax.request({
url: "../tbcfarticle/info/"+id, url: "../tbcfarticle/info/" + id,
async: true, async: true,
successCallback: function (r) { successCallback: function (r) {
vm.account = true;
vm.tbCfArticle = r.tbCfArticle; vm.tbCfArticle = r.tbCfArticle;
let content = vm.tbCfArticle.content; let content = vm.tbCfArticle.content;
vm.uploadList = vm.tbCfArticle.picture.split(','); vm.uploadList = vm.tbCfArticle.picture.split(',');
if(content!=null){ if (content != null) {
UE.getEditor('content').setContent(content); UE.getEditor('content').setContent(content);
}else { } else {
UE.getEditor('content').setContent(''); UE.getEditor('content').setContent('');
} }
} }
}); });
}, },
reload: function (event) { reload: function (event) {
vm.showList = true; vm.showList = true;
let page = $("#jqGrid").jqGrid('getGridParam', 'page'); let page = $("#jqGrid").jqGrid('getGridParam', 'page');
$("#jqGrid").jqGrid('setGridParam', { $("#jqGrid").jqGrid('setGridParam', {
postData: {'name': vm.q.name}, postData: {'name': vm.q.name},
page: page page: page
}).trigger("reloadGrid"); }).trigger("reloadGrid");
vm.handleReset('formValidate'); vm.handleReset('formValidate');
}, },
reloadSearch: function() { reloadSearch: function () {
vm.q = { vm.q = {
name: '' name: ''
}; };
...@@ -124,45 +175,45 @@ let vm = new Vue({ ...@@ -124,45 +175,45 @@ let vm = new Vue({
handleReset: function (name) { handleReset: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
}, },
handleBeforeUpload(file) { handleBeforeUpload(file) {
// 上传图片大小不超过5M // 上传图片大小不超过5M
if (file.size > 5 * 1024 * 1024) { if (file.size > 5 * 1024 * 1024) {
alert('请上传不超过5M的图片'); alert('请上传不超过5M的图片');
return false; return false;
} }
console.log(123456,this.uploadList) console.log(123456, this.uploadList)
const check = this.uploadList.length < 9; const check = this.uploadList.length < 9;
if (!check) { if (!check) {
this.$Notice.warning({ this.$Notice.warning({
title: '最多只能上传九张图片' title: '最多只能上传九张图片'
}); });
return false; return false;
} }
// 限制上传文件的宽高 // 限制上传文件的宽高
// return this.checkImageWH(file,750,320); // return this.checkImageWH(file,750,320);
}, },
handleSuccess(response, file, fileList) { handleSuccess(response, file, fileList) {
// "http://diaosaas-prod.oss-cn-shenzhen.aliyuncs.com/education/155728894307110106.jpg" // "http://diaosaas-prod.oss-cn-shenzhen.aliyuncs.com/education/155728894307110106.jpg"
vm.uploadList.push(response); vm.uploadList.push(response);
$("#itemImg").show(); $("#itemImg").show();
}, },
// 删除上传图片 // 删除上传图片
delImg1: function (url) { delImg1: function (url) {
if (vm.title != "详情") { if (vm.title != "详情") {
vm.uploadList.remove(url); vm.uploadList.remove(url);
console.log(url); console.log(url);
Ajax.request({ Ajax.request({
url: "../api/upload/delFile?url=" + url, url: "../api/upload/delFile?url=" + url,
async: false, async: false,
type: "POST", type: "POST",
contentType: "application/json", contentType: "application/json",
successCallback: function (resultData) { successCallback: function (resultData) {
// console.log(resultData); // console.log(resultData);
iview.Message.success(resultData.success); iview.Message.success(resultData.success);
} }
}); });
} }
} }
} }
}); });
\ No newline at end of file
platform-common/src/main/java/com/platform/utils/Constant.java
浏览文件 @ 024d5074
...@@ -10,6 +10,15 @@ public class Constant { ...@@ -10,6 +10,15 @@ public class Constant {
*/ */
public static final String SUPER_ADMIN = "1"; public static final String SUPER_ADMIN = "1";
/**
* 管理员
*/
public static final String SUPER_ITEM="2";
/**
* 管理员
*/
public static final String SUPER_USER="3";
/** /**
* 默认系统domainId 业务系统 * 默认系统domainId 业务系统
*/ */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论