WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
gaosong
2022-07-26 17:47:45 +08:00
parent cdf767aeb1 5d0bdcc042
commit 35000d2dbc
22 changed files with 932 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java
+26 -7
View File
@@ -4,13 +4,12 @@ import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.docTranslation.entity.DocTranslationEO;
import com.jero.modules.docTranslation.service.IDocTranslationEOService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: 文档翻译表
* @Author: jero-boot
@@ -53,9 +51,7 @@ public class DocTranslationEOController extends JeroController<DocTranslationEO,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut", defaultValue="cn") String cut,
HttpServletRequest req) {
QueryWrapper<DocTranslationEO> queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap());
Page<DocTranslationEO> page = new Page<DocTranslationEO>(pageNo, pageSize);
IPage<DocTranslationEO> pageList = docTranslationEOService.page(page, queryWrapper);
IPage<DocTranslationEO> pageList = docTranslationEOService.queryPageList(docTranslationEO,pageNo,pageSize,cut,req);
return Result.OK(cut,pageList);
}
@@ -168,4 +164,27 @@ public class DocTranslationEOController extends JeroController<DocTranslationEO,
return super.importExcel(request, response, DocTranslationEO.class);
}
/**
* 批量更新文档翻译表发布情况
* @param json
* @return
*/
@AutoLog(value = "文档翻译表-批量更新发布情况")
@ApiOperation(value="文档翻译表-批量更新发布情况", notes="文档翻译表-批量更新发布情况")
@PostMapping(value = "/updateRleaseConditionBatch")
public Result<?> updateRleaseConditionBatch(@RequestBody JSONObject json) {
return this.docTranslationEOService.updateRleaseConditionBatch(json);
}
/**
* 批量更新文档翻译表状态
* @return
*/
@AutoLog(value = "文档翻译表-查询文本状态下拉选项")
@ApiOperation(value="文档翻译表-查询文本状态下拉选项", notes="文档翻译表-查询文本状态下拉选项")
@GetMapping(value = "/queryTextStatusVal")
public Result<?> queryTextStatusVal() {
return this.docTranslationEOService.queryTextStatusVal();
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java
+4 -1
View File
@@ -2,6 +2,7 @@ package com.jero.modules.docTranslation.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -73,10 +74,12 @@ public class DocTranslationEO implements Serializable {
private String title;
/**文本状态*/
@Dict(dicCode = "state")
//@Dict(dicCode = "state")
@Excel(name = "文本状态", width = 15)
@ApiModelProperty(value = "文本状态")
private java.lang.String textStatus;
@TableField(exist = false)
private String textStatus_dictText;
/**文件名称*/
@Excel(name = "文件名称", width = 15)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java
+29
View File
@@ -1,7 +1,12 @@
package com.jero.modules.docTranslation.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.modules.docTranslation.entity.DocTranslationEO;
import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -58,4 +63,28 @@ public interface IDocTranslationEOService extends IService<DocTranslationEO> {
* @return
*/
List<DocTranslationEO> queryList();
/**
* 分页查询
* @param docTranslationEO
* @param pageNo
* @param pageSize
* @param cut
* @param req
* @return
*/
IPage<DocTranslationEO> queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req);
/**
* 批量更新发布情况
* @param json
* @return
*/
Result<?> updateRleaseConditionBatch(JSONObject json);
/**
* 查询文本状态下拉选项（文档库中，文件类型字段）
* @return
*/
Result<?> queryTextStatusVal();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java
+98
View File
@@ -1,20 +1,40 @@
package com.jero.modules.docTranslation.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.ModuleEnum;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.docTranslation.entity.DocTranslationEO;
import com.jero.modules.docTranslation.enums.ReleaseConditionEnum;
import com.jero.modules.docTranslation.enums.TranslationResultEnum;
import com.jero.modules.docTranslation.mapper.DocTranslationEOMapper;
import com.jero.modules.docTranslation.service.IDocTranslationEOService;
import com.jero.modules.docTranslation.utils.TranslationDocumentUtils;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.oss.entity.OSSFile;
import me.zhyd.oauth.utils.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
/**
* @Description: 文档翻译表
* @Author: jero-boot
@@ -25,6 +45,8 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class DocTranslationEOServiceImpl extends ServiceImpl<DocTranslationEOMapper, DocTranslationEO> implements IDocTranslationEOService {
@Autowired
private OnlCgformFieldServiceImpl onlCgformFieldService;
/**
* 保存
*
@@ -103,4 +125,80 @@ public class DocTranslationEOServiceImpl extends ServiceImpl<DocTranslationEOMap
public List<DocTranslationEO> queryList() {
return list();
}
@Override
public IPage<DocTranslationEO> queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req) {
Page<DocTranslationEO> page = new Page<DocTranslationEO>(pageNo, pageSize);
QueryWrapper<DocTranslationEO> queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap());
// 获取当前登录人
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
/**
* 数据权限：自己创建的、或发布情况为“已发布”的数据
*/
queryWrapper.lambda().and(query -> {
query.eq(DocTranslationEO::getCreateBy,currentUser.getUsername());
query.or(o -> {
o.eq(DocTranslationEO::getReleaseCondition,ReleaseConditionEnum.PUBLISHED.getValue());
});
});
IPage<DocTranslationEO> result = this.page(page, queryWrapper);
disposeData(result.getRecords(),cut);
return result;
}
/**
* 处理数据
* @param datas
* @param cut
*/
public void disposeData(List<DocTranslationEO> datas,String cut){
if(CollectionUtils.isNotEmpty(datas)){
for (DocTranslationEO data : datas) {
String textStatus_dictText = "";
OnlCgformField fileTypeField = this.onlCgformFieldService.queryById(data.getTextStatus());
if (ObjectUtil.isNotEmpty(fileTypeField)) {
if (CutEnum.CN.getValue().equals(cut)) {
textStatus_dictText = fileTypeField.getDbFieldTxt();
} else {
textStatus_dictText = fileTypeField.getDbFieldEnName();
}
}
data.setTextStatus_dictText(textStatus_dictText);
}
}
}
@Override
public Result<?> updateRleaseConditionBatch(JSONObject json) {
String ids = json.getString("ids");
// 值对应枚举类 ReleaseConditionEnum 发布published 或撤回draft
String releaseCondition = json.getString("releaseCondition");
if (StringUtils.isNotEmpty(ids)) {
List<DocTranslationEO> docTranslationEOList = new ArrayList<>();
List<String> idList = Arrays.asList(ids.split(","));
idList.forEach(id -> {
DocTranslationEO docTranslationEO = new DocTranslationEO();
docTranslationEO.setId(id);
docTranslationEO.setReleaseCondition(releaseCondition);
docTranslationEOList.add(docTranslationEO);
});
this.updateBatchById(docTranslationEOList);
}
return new Result<>().success("操作成功！");
}
@Override
public Result<?> queryTextStatusVal() {
List<OnlCgformField> fieldList = this.onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
List<OnlCgformField> result = fieldList.stream().filter(field -> {
boolean flag = false;
if(org.apache.commons.lang3.StringUtils.equals(field.getFieldShowType(), FieldTypeEnum.FILE.getValue())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
return Result.OK(result);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+1 -1
View File
@@ -3189,7 +3189,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//您订阅的XXX已被修改
content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
String msgTitle = serialNumber + " you subsribed to has been updated";
String msgTitle = serialNumber + " you subscribed to has been updated";
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
sysAnnouncementService.saveAnnouncement(sysAnnouncement);