clunt
/
playlet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clunt:bcdae44440ee6adde32f26f2afd4a11bf9fe1803
Branches Tags
clunt:master
...
compare: clunt:11a216ab39c5e66aecfd5fb56de0a4727d4e88dd
Branches Tags
clunt:master

2 Commits
bcdae44440 ... 11a216ab39

Author SHA1 Message Date
kuang.yife 11a216ab39 fix 2024-08-15 15:34:15 +08:00
kuang.yife aa6e49fbb7 1.文案调整(完成) 
归属人员 这个称呼改为 公众号负责人
作者花名: 这个成为改为 文章默认作者名

2.在创建文章的时候,没有填作者名,则将公众号作者名带入 (完成)

3.文章标签修改时增加默认示例,示例内容为:微信/淘系/视频号,且文本框调整为3行 (完成)

4.文章标签抽出来单独一个菜单 (完成)

5.用户阅读文章时，需要将文章标签存储到用户表 playlet_public_user
 2024-08-15 14:49:38 +08:00
14 changed files with 169 additions and 128 deletions
Show Stats Expand all files Collapse all files

13
playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicAccountController.java
View File

@ -5,6 +5,7 @@ import java.util.stream.Collectors;
import com.playlet.common.core.domain.entity.SysDept;
import com.playlet.common.core.domain.entity.SysUser;
import com.playlet.common.utils.StringUtils;
import com.playlet.system.domain.PlayletPublicDetail;
import com.playlet.system.service.ISysDeptService;
import com.playlet.system.service.ISysUserService;
@ -149,7 +150,17 @@ public class PlayletPublicAccountController extends BaseController
{
PlayletPublicAccount playletPublicAccount = playletPublicAccountService.selectPlayletPublicAccountById(id);
mmap.put("playletPublicAccount", playletPublicAccount);
mmap.put("users",sysUserService.selectUserList(new SysUser()));
List<SysUser> users = sysUserService.selectUserList(new SysUser());
if(StringUtils.isNotEmpty(playletPublicAccount.getManagerIds())){
for (String ids : playletPublicAccount.getManagerIds().split(",")) {
users.forEach(model->{
if(String.valueOf(model.getUserId()).equals(ids)){
model.setFlag(true);
}
});
}
}
mmap.put("users", users);
return prefix + "/edit";
}

7
playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicDetailController.java
View File

@ -218,6 +218,13 @@ public class PlayletPublicDetailController extends BaseController
for (String str : arr) {
PublicDetailTag tag = new PublicDetailTag();
tag.setTag(str);
if(StringUtils.isNotEmpty(playletPublicDetail.getDetailTag())){
for (String tagName : playletPublicDetail.getDetailTag().split(",")) {
if(str.equals(tagName)){
tag.setFlag(true);
}
}
}
tags.add(tag);
}
mmap.put("tags", tags);

2
playlet-admin/src/main/java/com/playlet/web/req/PublicDetailTag.java
View File

@ -10,4 +10,6 @@ public class PublicDetailTag {
private String tag;
private Boolean flag;
}

12
playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicDetailShareAppServiceImpl.java
View File

@ -38,17 +38,27 @@ public class PublicDetailShareAppServiceImpl implements PublicDetailShareAppServ
if(userOne != null){
publicDetailShare.setReaderOneName(userOne.getName());
// 增加1的阅读标签
if(!userOne.getRemark().contains(detail.getDetailTag())){
if(userOne.getRemark() == null || !userOne.getRemark().contains(detail.getDetailTag())){
if(userOne.getRemark() == null){
userOne.setRemark(detail.getDetailTag());
}else {
userOne.setRemark(userOne.getRemark()+"|" + detail.getDetailTag());
}
iPlayletPublicUserService.updateById(userOne);
}
}
if(userTwo != null){
publicDetailShare.setReaderTwoName(userTwo.getName());
// 增加用户2的阅读标签
if(userTwo.getRemark() == null || !userTwo.getRemark().contains(detail.getDetailTag())){
if(userTwo.getRemark() == null){
userTwo.setRemark(detail.getDetailTag());
}else {
userTwo.setRemark(userTwo.getRemark()+"|" + detail.getDetailTag());
}
iPlayletPublicUserService.updateById(userTwo);
}
}
// 查询是否二次记录
long readCount = iPublicDetailShareService.lambdaQuery()
.eq(PublicDetailShare::getReaderOneId, publicDetailShare.getReaderOneId())

6
playlet-admin/src/main/resources/templates/system/dept/add.html
View File

@ -34,12 +34,6 @@
<input class="form-control" type="text" name="publicAccountLimit">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文章自定义标签：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="detailTags">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">显示排序：</label>
<div class="col-sm-8">

5
playlet-admin/src/main/resources/templates/system/dept/dept.html
View File

@ -82,11 +82,6 @@
align: "left"
},
{
field: 'detailTags',
title: '文章标签',
align: "left"
},
{
field: 'orderNum',
title: '排序',
align: "left"

6
playlet-admin/src/main/resources/templates/system/dept/edit.html
View File

@ -35,12 +35,6 @@
<input class="form-control" type="text" name="publicAccountLimit" th:field="*{publicAccountLimit}" id="publicAccountLimit" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">文章标签：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="detailTags" th:field="*{detailTags}" id="detailTags" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">显示排序：</label>
<div class="col-sm-8">

2
playlet-admin/src/main/resources/templates/system/playlet/account/edit.html
View File

@ -61,7 +61,7 @@
<label class="col-sm-3 control-label">运营人员：</label>
<div class="col-sm-8">
<select id="managerIds" class="form-control select2-multiple" multiple>
<option th:each="user:${users}" th:value="${user.userId}" th:text="${user.userName}"></option>
<option th:each="user:${users}" th:value="${user.userId}" th:text="${user.userName}" th:selected="${user.flag}" ></option>
</select>
</div>
</div>

21
playlet-admin/src/main/resources/templates/system/playlet/detail/add.html
View File

@ -4,6 +4,7 @@
<head>
<meta name="referrer" content="same-origin">
<th:block th:include="include :: header('新增公众号文章详情')" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: summernote-css" />
<th:block th:include="include :: bootstrap-fileinput-css" />
</head>
@ -95,11 +96,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">文章标签：</label>
<div class="col-sm-10">
<select id="detailTag" name="detailTag" class="form-control m-b" required>
<option th:each="tag:${tags}" th:value="${tag.tag}"
th:text="${tag.tag}"></option>
<label class="col-xs-2 control-label">文章标签：</label>
<div class="col-xs-10">
<select id="detailTags" class="form-control select2-multiple" multiple>
<option th:each="tag:${tags}" th:value="${tag.tag}" th:text="${tag.tag}"></option>
</select>
</div>
</div>
@ -175,6 +175,7 @@
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: summernote-js" />
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: bootstrap-fileinput-js" />
<th:block th:include="include :: bootstrap-fileinput-js" />
<th:block th:include="include :: tingmce-min-js" />
@ -184,6 +185,13 @@
focusCleanup: true
});
$(function() {
$('#detailTags').select2({
placeholder: "请选择文章标签",
allowClear: true
});
})
// 详情页
$("#imgUrlFile").fileinput({
uploadUrl: ctx + 'tool/oss/uploadFromPlaylet',
@ -245,7 +253,8 @@
function submitHandler() {
if ($.validate.form()) {
var content = tinymce.get('mytextarea').getContent();
$.operate.save(prefix + "/add", $('#form-detail-add').serialize() + encodeURIComponent(content));
var detailTag = $.form.selectSelects("detailTags");
$.operate.save(prefix + "/add", $('#form-detail-add').serialize() + encodeURIComponent(content) + "&detailTag=" + detailTag);
}
}

19
playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html
View File

@ -4,6 +4,7 @@
<head>
<meta name="referrer" content="same-origin">
<th:block th:include="include :: header('修改公众号文章详情')" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: summernote-css" />
<th:block th:include="include :: bootstrap-fileinput-css" />
</head>
@ -84,11 +85,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">文章标签：</label>
<label class="col-sm-2 control-label">运营人员：</label>
<div class="col-sm-10">
<select id="detailTag" name="detailTag" class="form-control m-b" required>
<option th:each="tag:${tags}" th:value="${tag.tag}"
th:text="${tag.tag}" th:field="*{detailTag}"></option>
<select id="detailTags" class="form-control select2-multiple" multiple>
<option th:each="tag:${tags}" th:value="${tag.tag}" th:text="${tag.tag}" th:selected="${tag.flag}"></option>
</select>
</div>
</div>
@ -104,6 +104,7 @@
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: summernote-js" />
<th:block th:include="include :: bootstrap-fileinput-js" />
<th:block th:include="include :: tingmce-min-js" />
@ -113,10 +114,18 @@
focusCleanup: true
});
$(function() {
$('#detailTags').select2({
placeholder: "请选择文章标签",
allowClear: true
});
})
function submitHandler() {
if ($.validate.form()) {
var content = tinymce.get('mytextarea').getContent();
$.operate.save(prefix + "/edit", $('#form-detail-edit').serialize() + encodeURIComponent(content));
var detailTag = $.form.selectSelects("detailTags");
$.operate.save(prefix + "/edit", $('#form-detail-edit').serialize() + encodeURIComponent(content) + "&detailTag=" + detailTag);
}
}

88
playlet-admin/src/main/resources/templates/system/user/add.html
View File

@ -12,25 +12,37 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">用户名称：</label>
<label class="col-sm-4 control-label is-required">登录账号名：</label>
<div class="col-sm-8">
<input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" required>
<input id="loginName" name="loginName" placeholder="请输入登录账号名" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">归属部门：</label>
<label class="col-sm-4 control-label">用户性别：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="deptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
<select name="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">登录密码：</label>
<div class="col-sm-8">
<div class="input-group">
<input id="password" name="password" placeholder="请输入登录密码" class="form-control" type="password" th:value="${@config.getKey('sys.user.initPassword')}" required>
<span class="input-group-addon" title="登录密码,鼠标按下显示密码"
onmousedown="$('#password').attr('type','text')"
onmouseup="$('#password').attr('type','password')"><i class="fa fa-key"></i></span>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">手机号码：</label>
@ -42,6 +54,16 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">用户昵称：</label>
<div class="col-sm-8">
<input name="userName" placeholder="请输入用户昵称" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">邮箱：</label>
@ -57,34 +79,11 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">登录账号：</label>
<div class="col-sm-8">
<input id="loginName" name="loginName" placeholder="请输入登录账号" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">登录密码：</label>
<div class="col-sm-8">
<div class="input-group">
<input id="password" name="password" placeholder="请输入登录密码" class="form-control" type="password" th:value="${@config.getKey('sys.user.initPassword')}" required>
<span class="input-group-addon" title="登录密码,鼠标按下显示密码"
onmousedown="$('#password').attr('type','text')"
onmouseup="$('#password').attr('type','password')"><i class="fa fa-key"></i></span>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">用户性别：</label>
<div class="col-sm-8">
<select name="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<label class="col-xs-4 control-label">角色：</label>
<div class="col-xs-8">
<label th:each="role:${roles}" class="check-box">
<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}">
</label>
</div>
</div>
</div>
@ -101,10 +100,10 @@
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="col-sm-6">
<div class="form-group">
<label class="col-xs-2 control-label">岗位：</label>
<div class="col-xs-4">
<label class="col-xs-4 control-label is-required">岗位：</label>
<div class="col-xs-8">
<select id="post" class="form-control select2-multiple" multiple>
<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:disabled="${post.status == '1'}"></option>
</select>
@ -113,13 +112,14 @@
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="col-sm-6">
<div class="form-group">
<label class="col-xs-2 control-label">角色：</label>
<div class="col-xs-10">
<label th:each="role:${roles}" class="check-box">
<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}">
</label>
<label class="col-sm-4 control-label is-required">归属部门：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="deptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>

68
playlet-admin/src/main/resources/templates/system/user/edit.html
View File

@ -13,25 +13,32 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">用户名称：</label>
<label class="col-sm-4 control-label is-required">登录账号名：</label>
<div class="col-sm-8">
<input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
<input class="form-control" type="text" readonly="true" th:field="*{loginName}"/>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">归属部门：</label>
<label class="col-sm-4 control-label">用户性别：</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
<select name="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{sex}"></option>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">用户昵称：</label>
<div class="col-sm-8">
<input name="userName" placeholder="请输入用户昵称" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">手机号码：</label>
@ -43,6 +50,18 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-xs-4 control-label">角色：</label>
<div class="col-xs-8">
<label th:each="role:${roles}" class="check-box">
<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
</label>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">邮箱：</label>
@ -58,9 +77,11 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">登录账号：</label>
<label class="col-sm-4 control-label is-required">岗位：</label>
<div class="col-sm-8">
<input class="form-control" type="text" readonly="true" th:field="*{loginName}"/>
<select id="post" class="form-control select2-multiple" multiple>
<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
</select>
</div>
</div>
</div>
@ -79,35 +100,14 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">岗位：</label>
<label class="col-sm-4 control-label is-required">归属部门：</label>
<div class="col-sm-8">
<select id="post" class="form-control select2-multiple" multiple>
<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
</select>
<div class="input-group">
<input class="form-control" type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">用户性别：</label>
<div class="col-sm-8">
<select name="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{sex}"></option>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">角色：</label>
<div class="col-xs-10">
<label th:each="role:${roles}" class="check-box">
<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
</label>
</div>
</div>
</div>
</div>
<h4 class="form-header h4">其他信息</h4>

10
playlet-common/src/main/java/com/playlet/common/core/domain/entity/SysUser.java
View File

@ -75,6 +75,8 @@ public class SysUser extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
private boolean flag;
/** 最后登录IP */
@Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp;
@ -106,6 +108,14 @@ public class SysUser extends BaseEntity
}
public boolean isFlag() {
return flag;
}
public void setFlag(boolean flag) {
this.flag = flag;
}
public SysUser(Long userId)
{
this.userId = userId;

18
playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml
View File

@ -96,15 +96,15 @@
update playlet_public_account
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="publicType != null">public_type = #{publicType},</if>
<if test="detailType != null">detail_type = #{detailType},</if>
<if test="detailTags != null">detail_tags = #{detailTags},</if>
<if test="introduction != null">introduction = #{introduction},</if>
<if test="authorAlias != null">author_alias = #{authorAlias},</if>
<if test="managerId != null">manager_id = #{managerId},</if>
<if test="managerIds != null">manager_ids = #{managerIds},</if>
<if test="logoUrl != null">logo_url = #{logoUrl},</if>
<if test="address != null">address = #{address},</if>
<if test="publicType != null and publicType != ''">public_type = #{publicType},</if>
<if test="detailType != null and detailType != ''">detail_type = #{detailType},</if>
<if test="detailTags != null and detailTags != ''">detail_tags = #{detailTags},</if>
<if test="introduction != null and introduction != ''">introduction = #{introduction},</if>
<if test="authorAlias != null and authorAlias != ''">author_alias = #{authorAlias},</if>
<if test="managerId != null and managerId != ''">manager_id = #{managerId},</if>
<if test="managerIds != null and managerIds != ''">manager_ids = #{managerIds},</if>
<if test="logoUrl != null and logoUrl != ''">logo_url = #{logoUrl},</if>
<if test="address != null and address != ''">address = #{address},</if>
<if test="originalContentCount != null">original_content_count = #{originalContentCount},</if>
<if test="followersCount != null">followers_count = #{followersCount},</if>
<if test="createBy != null">create_by = #{createBy},</if>