Skip to content

C
chnmuseum-party
Commit 4e1ccb17 authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent 031176d4
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 102 deletions
src/main/java/cn/wisenergy/chnmuseum/party/common/enums/LanguageEnum.java
View file @ 4e1ccb17
......@@ -2,11 +2,11 @@ package cn.wisenergy.chnmuseum.party.common.enums;
public enum LanguageEnum {
zh("Chinese", "汉语"),
mn("Mongolian", "蒙语"),
bo("Tibetan", "藏语"),
uyg("Uyghur", "维吾尔语"),
en("English", "英语");
ZH("Chinese", "汉语"),
MN("Mongolian", "蒙语"),
BO("Tibetan", "藏语"),
UYG("Uyghur", "维吾尔语"),
EN("English", "英语");
// 错误编码
private String code;
......
src/main/java/cn/wisenergy/chnmuseum/party/mapper/AuditMapper.java
View file @ 4e1ccb17
package cn.wisenergy.chnmuseum.party.mapper;
import cn.wisenergy.chnmuseum.party.model.Audit;
import cn.wisenergy.chnmuseum.party.model.TUser;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.wisenergy.chnmuseum.party.model.Audit;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.data.querydsl.QPageRequest;
import java.util.List;
......@@ -25,13 +23,13 @@ public interface AuditMapper extends BaseMapper<Audit> {
List<Audit> getUserList(Page<Audit> page, @Param("user") TUser user);
/**
* 视频审核分页
* 视频内容审核分页
*
* @param page
* @param wrapper
* @return
*/
Page<Audit> getAssetPage(Page<Audit> page, @Param(Constants.WRAPPER) Wrapper<Audit> wrapper);
Page<Audit> getVideoContentPage(Page<Audit> page, @Param(Constants.WRAPPER) Wrapper<Audit> wrapper);
/**
* 展板审核分页
......@@ -51,5 +49,4 @@ public interface AuditMapper extends BaseMapper<Audit> {
*/
Page<Audit> getLearningContentPage(Page<Audit> page, @Param(Constants.WRAPPER) Wrapper<Audit> wrapper);
}
src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java
View file @ 4e1ccb17
......@@ -96,7 +96,7 @@ public class ExhibitionBoard implements Serializable {
@ApiModelProperty("是否已删除")
@TableField("is_deleted")
private Boolean isDeleted;
private Boolean deleted;
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
......
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContent.java
View file @ 4e1ccb17
......@@ -69,11 +69,11 @@ public class LearningContent implements Serializable {
@ApiModelProperty("是否上架")
@TableField("is_published")
private Boolean isPublished;
private Boolean published;
@ApiModelProperty("是否已删除")
@TableField("is_deleted")
private Boolean isDeleted;
private Boolean deleted;
@ApiModelProperty("排序顺序")
@TableField("sortorder")
......
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @ 4e1ccb17
......@@ -6,10 +6,10 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
import cn.wisenergy.chnmuseum.party.mapper.AuditMapper;
import cn.wisenergy.chnmuseum.party.model.*;
import cn.wisenergy.chnmuseum.party.service.AssetService;
import cn.wisenergy.chnmuseum.party.service.AuditService;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
import cn.wisenergy.chnmuseum.party.service.LearningContentService;
import cn.wisenergy.chnmuseum.party.service.VideoContentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -38,25 +37,23 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
@Resource
private AuditMapper auditMapper;
@Autowired
@Resource
private TUserServiceImpl userService;
@Autowired
AssetService assetService;
@Autowired
ExhibitionBoardService exhibitionBoardService;
@Resource
private VideoContentService videoContentService;
@Autowired
LearningContentService learningContentService;
@Resource
private ExhibitionBoardService exhibitionBoardService;
@Resource
private LearningContentService learningContentService;
@Override
public Page<Audit> getUserList(Page<Audit> page, TUser user) {
return page.setRecords(auditMapper.getUserList(page, user));
}
/**
* 分页查询
*
......@@ -85,7 +82,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
return pageList;
}
/**
* 分别查询
*
......@@ -110,7 +106,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
case ACCOUNT:
break;
case VIDEO_CONTENT:
selectPage = auditMapper.getAssetPage(auditPage, ew);
selectPage = auditMapper.getVideoContentPage(auditPage, ew);
default:
}
//
......@@ -177,7 +173,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
return update >= 1;
}
/**
* 复审级别的修改情况
*
......@@ -213,18 +208,18 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
//
boolean update;
switch (auditTypeEnum) {
case ASSET:
Asset asset = fillAssetByAudit(audit);
update = assetService.updateById(asset);
case VIDEO_CONTENT:
VideoContent videoContent = fillVideoContentByAudit(audit);
update = videoContentService.updateById(videoContent);
break;
// case ACCOUNT:
// break;
case EXHIBITION_BOARD:
ExhibitionBoard exhibitionBoard = fillAssetByExhibitionBoard(audit);
ExhibitionBoard exhibitionBoard = fillVideoContentByExhibitionBoard(audit);
update = exhibitionBoardService.updateById(exhibitionBoard);
break;
case LEARNING_CONTENT:
LearningContent learningContent = fillAssetByLearningContent(audit);
LearningContent learningContent = fillVideoContentByLearningContent(audit);
update = learningContentService.updateById(learningContent);
break;
default:
......@@ -235,35 +230,39 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
/**
* 根据审核操作 填充Asset属性用于更改
* 根据审核操作 填充VideoContent属性用于更改
*
* @param audit
* @return
*/
public Asset fillAssetByAudit(Audit audit) {
Asset asset = new Asset();
asset.setId(audit.getRefItemId());
asset.setAuditStatus(audit.getStatus());
public VideoContent fillVideoContentByAudit(Audit audit) {
VideoContent videoContent = new VideoContent();
videoContent.setId(audit.getRefItemId());
videoContent.setAuditStatus(audit.getStatus());
//
String operation = audit.getOperation();
AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
switch (auditOperationEnum) {
case ADD:
asset.setIsDeleted(false);
videoContent.setPublished(true);
break;
case ENABLE:
videoContent.setPublished(true);
videoContent.setDeleted(false);
break;
case EDIT:
videoContent.setPublished(true);
break;
case DISABLE:
asset.setIsDeleted(true);
videoContent.setPublished(false);
break;
case REMOVE:
asset.setPublished(false);
videoContent.setPublished(false);
videoContent.setDeleted(true);
break;
default:
}
return asset;
return videoContent;
}
/**
......@@ -272,7 +271,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
* @param audit
* @return
*/
public ExhibitionBoard fillAssetByExhibitionBoard(Audit audit) {
public ExhibitionBoard fillVideoContentByExhibitionBoard(Audit audit) {
ExhibitionBoard exhibitionBoard = new ExhibitionBoard();
exhibitionBoard.setId(audit.getRefItemId());
exhibitionBoard.setAuditStatus(audit.getStatus());
......@@ -281,16 +280,21 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
switch (auditOperationEnum) {
case ADD:
exhibitionBoard.setIsDeleted(false);
exhibitionBoard.setPublished(true);
break;
case ENABLE:
exhibitionBoard.setPublished(true);
exhibitionBoard.setDeleted(false);
break;
case EDIT:
exhibitionBoard.setPublished(true);
break;
case DISABLE:
exhibitionBoard.setIsDeleted(true);
exhibitionBoard.setPublished(false);
break;
case REMOVE:
exhibitionBoard.setPublished(false);
exhibitionBoard.setDeleted(true);
break;
default:
}
......@@ -303,7 +307,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
* @param audit
* @return
*/
public LearningContent fillAssetByLearningContent(Audit audit) {
public LearningContent fillVideoContentByLearningContent(Audit audit) {
LearningContent learningContent = new LearningContent();
learningContent.setAuditStatus(audit.getStatus());
learningContent.setId(audit.getRefItemId());
......@@ -312,24 +316,27 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
switch (auditOperationEnum) {
case ADD:
learningContent.setIsDeleted(false);
learningContent.setPublished(true);
break;
case ENABLE:
learningContent.setPublished(true);
learningContent.setDeleted(false);
break;
case EDIT:
learningContent.setPublished(true);
break;
case DISABLE:
learningContent.setIsDeleted(true);
learningContent.setPublished(false);
break;
case REMOVE:
learningContent.setIsPublished(false);
learningContent.setPublished(false);
learningContent.setDeleted(true);
break;
default:
}
return learningContent;
}
/**
* 根据审核项数据插入审核记录
*
......@@ -340,11 +347,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
* @return
*/
@Override
public boolean saveByRefItemInfo(String refItemId, String content,
AuditTypeEnum typeEnum,
AuditOperationEnum operationEnum) {
public boolean saveByRefItemInfo(String refItemId, String content, AuditTypeEnum typeEnum, AuditOperationEnum operationEnum) {
Audit audit = new Audit();
//
audit.setRefItemId(refItemId);
......@@ -369,4 +372,5 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
int insert = auditMapper.insert(audit);
return insert >= 1;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @ 4e1ccb17
......@@ -5,7 +5,6 @@ import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
import cn.wisenergy.chnmuseum.party.common.enums.FileCatEnum;
import cn.wisenergy.chnmuseum.party.common.enums.FileTypeEnum;
import cn.wisenergy.chnmuseum.party.common.enums.LanguageEnum;
import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
......@@ -509,7 +508,7 @@ public class ChinaMobileRestApiController extends BaseController {
for (LearningProject learningProject : page.getRecords()) {
LambdaQueryWrapper<LearningContent> lambdaQueryWrapper = Wrappers.<LearningContent>lambdaQuery()
.eq(LearningContent::getLearningProjectId, learningProject.getId())
.eq(LearningContent::getIsPublished, true);
.eq(LearningContent::getPublished, true);
lambdaQueryWrapper.select(LearningContent::getName);
List<LearningContent> learningContentList = this.learningContentService.list(lambdaQueryWrapper);
String learningContentNames = learningContentList.stream().map(LearningContent::getName).collect(Collectors.joining("、"));
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java
View file @ 4e1ccb17
......@@ -259,20 +259,20 @@ public class FileUploadController extends BaseController {
metaDataSet.add(new MetaData("fileName", originalFilename));
metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name()));
if (originalFilename.contains("汉语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.CHINESE.name()));
language = LanguageEnum.CHINESE.name();
metaDataSet.add(new MetaData("language", LanguageEnum.ZH.name()));
language = LanguageEnum.ZH.name();
} else if (originalFilename.contains("英语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.ENGLISH.name()));
language = LanguageEnum.ENGLISH.name();
metaDataSet.add(new MetaData("language", LanguageEnum.EN.name()));
language = LanguageEnum.EN.name();
} else if (originalFilename.contains("蒙语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.MONGOLIAN.name()));
language = LanguageEnum.MONGOLIAN.name();
metaDataSet.add(new MetaData("language", LanguageEnum.MN.name()));
language = LanguageEnum.MN.name();
} else if (originalFilename.contains("藏语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.TIBETAN.name()));
language = LanguageEnum.TIBETAN.name();
metaDataSet.add(new MetaData("language", LanguageEnum.BO.name()));
language = LanguageEnum.BO.name();
} else if (originalFilename.contains("维吾尔语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.UYGHUR.name()));
language = LanguageEnum.UYGHUR.name();
metaDataSet.add(new MetaData("language", LanguageEnum.UYG.name()));
language = LanguageEnum.UYG.name();
}
String fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
......@@ -361,20 +361,20 @@ public class FileUploadController extends BaseController {
metaDataSet.add(new MetaData("fileName", originalFilename));
metaDataSet.add(new MetaData("fileType", FileTypeEnum.VIDEO.name()));
if (originalFilename.contains("汉语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.CHINESE.name()));
language = LanguageEnum.CHINESE.name();
metaDataSet.add(new MetaData("language", LanguageEnum.ZH.name()));
language = LanguageEnum.ZH.name();
} else if (originalFilename.contains("英语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.ENGLISH.name()));
language = LanguageEnum.ENGLISH.name();
metaDataSet.add(new MetaData("language", LanguageEnum.EN.name()));
language = LanguageEnum.EN.name();
} else if (originalFilename.contains("蒙语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.MONGOLIAN.name()));
language = LanguageEnum.MONGOLIAN.name();
metaDataSet.add(new MetaData("language", LanguageEnum.MN.name()));
language = LanguageEnum.MN.name();
} else if (originalFilename.contains("藏语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.TIBETAN.name()));
language = LanguageEnum.TIBETAN.name();
metaDataSet.add(new MetaData("language", LanguageEnum.BO.name()));
language = LanguageEnum.BO.name();
} else if (originalFilename.contains("维吾尔语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.UYGHUR.name()));
language = LanguageEnum.UYGHUR.name();
metaDataSet.add(new MetaData("language", LanguageEnum.UYG.name()));
language = LanguageEnum.UYG.name();
}
String fileUrl = FastDFSUtils.uploadVideo(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @ 4e1ccb17
......@@ -78,7 +78,7 @@ public class LearningContentController extends BaseController {
learningContent.setOrganCode(tUser.getOrgCode());
}
learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
learningContent.setIsPublished(false);
learningContent.setPublished(false);
QueryWrapper<LearningContent> queryWrapper = new QueryWrapper<>();
queryWrapper.select("max(sortorder) as sortorder");
LearningContent content = this.learningContentService.getOne(queryWrapper);
......@@ -138,7 +138,7 @@ public class LearningContentController extends BaseController {
@ApiOperation(value = "修改学习内容信息", notes = "修改学习内容信息")
public Map<String, Object> updateLearningContent(@Validated(value = {Update.class}) LearningContent learningContent) {
learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
learningContent.setIsPublished(false);
learningContent.setPublished(false);
// 保存业务节点信息
final String learningContentId = learningContent.getId();
......@@ -242,7 +242,7 @@ public class LearningContentController extends BaseController {
}
// 根据创建时间区间检索
if (genericPageParam.getIsPublished() != null) {
queryWrapper.eq(LearningContent::getIsPublished, genericPageParam.getIsPublished());
queryWrapper.eq(LearningContent::getPublished, genericPageParam.getIsPublished());
}
// 对名称或编码模糊查询
if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
......@@ -260,7 +260,7 @@ public class LearningContentController extends BaseController {
LearningContent::getId,
LearningContent::getName,
LearningContent::getAuditStatus,
LearningContent::getIsPublished,
LearningContent::getPublished,
LearningContent::getCreateTime,
LearningContent::getUpdateTime);
Page<LearningContent> page = this.learningContentService.page(getPage(), queryWrapper);
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningProjectController.java
View file @ 4e1ccb17
......@@ -123,7 +123,7 @@ public class LearningProjectController extends BaseController {
for (LearningProject learningProject : page.getRecords()) {
LambdaQueryWrapper<LearningContent> lambdaQueryWrapper = Wrappers.<LearningContent>lambdaQuery()
.eq(LearningContent::getLearningProjectId, learningProject.getId())
.eq(LearningContent::getIsPublished, true);
.eq(LearningContent::getPublished, true);
lambdaQueryWrapper.select(LearningContent::getName);
List<LearningContent> learningContentList = this.learningContentService.list(lambdaQueryWrapper);
String learningContentNames = learningContentList.stream().map(LearningContent::getName).collect(Collectors.joining("、"));
......
src/main/resources/mapper/AuditMapper.xml
View file @ 4e1ccb17
......@@ -21,8 +21,6 @@
<result column="level" property="level"/>
</resultMap>
<select id="getUserList" resultMap="BaseResultMap">
select a.*,o.name org_name,u.user_name user_name
from t_audit a
......@@ -48,38 +46,34 @@
order by a.create_time desc
</select>
<select id="getAssetPage" resultType="cn.wisenergy.chnmuseum.party.model.Audit">
<select id="getVideoContentPage" resultType="cn.wisenergy.chnmuseum.party.model.Audit">
SELECT
a.*,b.`name`,c.user_name AS userName
a.*, b.`name`, c.user_name AS userName
FROM
t_audit a
LEFT JOIN videoContent b ON a.ref_item_id = b.id
LEFT JOIN t_user c ON a.user_id = c.id
LEFT JOIN video_content b ON a.ref_item_id = b.id
LEFT JOIN t_user c ON a.user_id = c.id
${ew.customSqlSegment}
</select>
<select id="getExhibitionBoardPage" resultType="cn.wisenergy.chnmuseum.party.model.Audit">
SELECT
a.*,b.`name`,c.user_name AS userName
a.*,b.`name`,c.user_name AS userName
FROM
t_audit a
LEFT JOIN exhibition_board b ON a.ref_item_id=b.id
LEFT JOIN t_user c ON a.user_id = c.id
t_audit a
LEFT JOIN exhibition_board b ON a.ref_item_id=b.id
LEFT JOIN t_user c ON a.user_id = c.id
${ew.customSqlSegment}
</select>
<select id="getLearningContentPage" resultType="cn.wisenergy.chnmuseum.party.model.Audit">
SELECT
a.*,b.`name`,c.user_name AS userName
a.*,b.`name`,c.user_name AS userName
FROM
t_audit a
LEFT JOIN learning_content b ON a.ref_item_id=b.id
LEFT JOIN t_user c ON a.user_id = c.id
t_audit a
LEFT JOIN learning_content b ON a.ref_item_id=b.id
LEFT JOIN t_user c ON a.user_id = c.id
${ew.customSqlSegment}
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment