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:
wangzhijiang
2022-08-08 11:27:19 +08:00
parent 310b32c5d6 daf58eb9d5
commit cff37c00ff
10 changed files with 191 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java
+1 -1
View File
@@ -28,7 +28,7 @@ import com.jero.common.util.oConvertUtils;
public class JwtUtil {
// Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
public static final long EXPIRE_TIME = 30 * 60 * 1000;
public static final long EXPIRE_TIME = 240 * 60 * 1000;
/**
* 校验token是否正确
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java
+14
View File
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.compare.entity.SarFileCompareResComVO;
import com.jero.modules.compare.entity.SarFileCompareResComment;
import com.jero.modules.compare.service.ISarFileCompareResCommentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -167,4 +168,17 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
return super.importExcel(request, response, SarFileCompareResComment.class);
}
/**
* 根据infoId查询列表
*
* @return
*/
@AutoLog(value = "文档对比信息结果评论表-根据infoId查询列表")
@ApiOperation(value="文档对比信息结果评论表-根据infoId查询列表", notes="文档对比信息结果评论表-根据infoId查询列表")
@GetMapping(value = "/queryListByInfoId")
public Result<List<SarFileCompareResComVO>> queryListByInfoId(@RequestParam(name="id",required=true) String id) {
List<SarFileCompareResComVO> list = sarFileCompareResCommentService.queryListByInfoId(id);
return Result.OK(list);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java
+59
View File
@@ -0,0 +1,59 @@
package com.jero.modules.compare.entity;
import java.util.ArrayList;
import java.util.List;
public class SarFileCompareResComVO {
private String id;
private String name;
private String createTime;
private String content;
private List<SarFileCompareResComVO> resComVoList;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public List<SarFileCompareResComVO> getResComVoList() {
return resComVoList;
}
public void setResComVoList(List<SarFileCompareResComVO> resComVoList) {
this.resComVoList = resComVoList;
}
public void addResComVo(SarFileCompareResComVO resComVo) {
if (null == this.resComVoList) {
this.resComVoList = new ArrayList<>();
}
this.resComVoList.add(resComVo);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java
+9
View File
@@ -11,6 +11,7 @@ public class SarFileCompareResultVO {
private String serialNumberRight;
private String fileNameRight;
private List<SarFileCompareItemComVO> resList;
private String comments;
public SarFileCompareResultVO() {
}
@@ -69,4 +70,12 @@ public class SarFileCompareResultVO {
}
this.resList.add(item);
}
public String getComments() {
return comments;
}
public void setComments(String comments) {
this.comments = comments;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java
+3
View File
@@ -1,5 +1,6 @@
package com.jero.modules.compare.service;
import com.jero.modules.compare.entity.SarFileCompareResComVO;
import com.jero.modules.compare.entity.SarFileCompareResComment;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
@@ -58,4 +59,6 @@ public interface ISarFileCompareResCommentService extends IService<SarFileCompar
* @return
*/
List<SarFileCompareResComment> queryList();
List<SarFileCompareResComVO> queryListByInfoId(String id);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+5 -3
View File
@@ -67,9 +67,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
*/
@Override
public void editById(SarFileCompareItemComment sarFileCompareItemComment) {
SarFileCompareItemComment ic = queryById(sarFileCompareItemComment.getId());
Date now = new Date();
sarFileCompareItemComment.setUpdateTime(now);
saveOrUpdate(sarFileCompareItemComment);
ic.setUpdateTime(now);
ic.setComment(sarFileCompareItemComment.getComment());
saveOrUpdate(ic);
}
/**
@@ -124,7 +126,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
resultVO.setFileNameLeft(sfcInfo.getFileNameLeft());
resultVO.setSerialNumberRight(sfcInfo.getSerialNumberRight());
resultVO.setFileNameRight(sfcInfo.getFileNameRight());
resultVO.setComments(sfcInfo.getComments());
List<SarFileCompareItemComment> list = queryListByInfoId(infoId);
Map<String, SarFileCompareItem> sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java
+85 -45
View File
@@ -1,29 +1,37 @@
package com.jero.modules.compare.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.compare.entity.SarFileCompareResComVO;
import com.jero.modules.compare.entity.SarFileCompareResComment;
import com.jero.modules.compare.mapper.SarFileCompareResCommentMapper;
import com.jero.modules.compare.service.ISarFileCompareResCommentService;
import com.jero.modules.system.util.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
/**
* @Description: 文档对比信息结果评论表
* @Author: jero-boot
* @Date: 2022-08-05
* @Date: 2022-08-05
* @Version: V1.0
*/
@Service
public class SarFileCompareResCommentServiceImpl extends ServiceImpl<SarFileCompareResCommentMapper, SarFileCompareResComment> implements ISarFileCompareResCommentService {
/**
* 保存
*
* @param sarFileCompareResComment
* @return
*/
@Override
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 保存
*
* @param sarFileCompareResComment
* @return
*/
@Override
public void add(SarFileCompareResComment sarFileCompareResComment) {
Date now = new Date();
sarFileCompareResComment.setCreateTime(now);
@@ -31,59 +39,91 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl<SarFileComp
save(sarFileCompareResComment);
}
/**
* 更新
*
* @param sarFileCompareResComment
* @return
*/
@Override
/**
* 更新
*
* @param sarFileCompareResComment
* @return
*/
@Override
public void editById(SarFileCompareResComment sarFileCompareResComment) {
Date now = new Date();
Date now = new Date();
sarFileCompareResComment.setUpdateTime(now);
saveOrUpdate(sarFileCompareResComment);
saveOrUpdate(sarFileCompareResComment);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public SarFileCompareResComment queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
* 列表查询
*
* @return
*/
@Override
public List<SarFileCompareResComment> queryList() {
return list();
}
@Override
public List<SarFileCompareResComVO> queryListByInfoId(String id) {
LambdaQueryWrapper<SarFileCompareResComment> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SarFileCompareResComment::getInfoId, id);
queryWrapper.orderBy(true, true, SarFileCompareResComment::getCreateTime);
List<SarFileCompareResComVO> resList = new ArrayList<>();
List<SarFileCompareResComment> list = this.list(queryWrapper);
for (SarFileCompareResComment rc : list) {
if (StringUtils.isEmpty(rc.getParentId())) {
SarFileCompareResComVO resComVO = wrapperSarFileCompareResComVO(rc);
for (SarFileCompareResComment rc1 : list) {
if (!StringUtils.isEmpty(rc.getParentId()) && rc.getParentId().equals(resComVO.getId())) {
resComVO.addResComVo(wrapperSarFileCompareResComVO(rc1));
}
}
resList.add(resComVO);
}
}
return resList;
}
private SarFileCompareResComVO wrapperSarFileCompareResComVO(SarFileCompareResComment rc) {
SarFileCompareResComVO resComVO = new SarFileCompareResComVO();
resComVO.setId(rc.getId());
resComVO.setName(rc.getCreateBy());
resComVO.setCreateTime(sdf.format(rc.getCreateTime()));
resComVO.setContent(rc.getComment());
return resComVO;
}
}
jero-web/src/common/lang/en-us.js
+12 -12
View File
@@ -13,7 +13,7 @@ module.exports = {
userStatues: 'User Status',
normal: 'Normal',
frozen: 'Frozen',
reset: 'Reset',
reset: 'Clear',
putAway: 'Put Away',
open: 'More',
addUser: 'Add User',
@@ -89,7 +89,7 @@ module.exports = {
VersionNotSupported: 'Version Not Supported',
SaveQueryCriteria: 'Save Search Conditions',
roleName: 'Role Name',
newRole: 'New Role',
newRole: 'Create New Role',
RoleManagement: 'Role Management',
toGrantAuthorization: 'Authorized',
newUser: 'New User',
@@ -355,7 +355,7 @@ module.exports = {
templateDownload: 'Download Template',
textInformation: 'Document Files',
relatedInformation: 'Relevant Information',
RetrieveFiles: 'Select Stored File',
RetrieveFiles: 'Retrieve Library File',
SplitText: 'Split Library File',
ImportResults: 'Import Split Results',
copy: 'Copy',
@@ -368,7 +368,7 @@ module.exports = {
clickUpload: 'Click To Upload',
viewUploadedFiles: 'View Uploaded Files',
standardSelection: 'Standard Selection',
Collection: 'Add To Collection',
Collection: 'Collect',
CancelCollection: 'Delete Collection',
deleteLib: 'Delete',
subscribe: 'Subscribe',
@@ -404,7 +404,7 @@ module.exports = {
LabelContentManagement: 'Tag Content Management',
InputBoxType: 'Input Box Type',
DropDownType: 'Drop Down Type',
ExhibitionAreaManagement: 'Display Area Management',
ExhibitionAreaManagement: 'Display Management',
NewLabelItem: 'Newly Added Tag Item',
editLabelItem: 'Edit Tag Item',
NodeQuickLookup: 'Node Quick Lookup',
@@ -471,11 +471,11 @@ module.exports = {
charactersLength1to300: '1 - 300 characters in length',
OnlyOneSelected: 'Only one piece of data can be selected',
OnlyPDF: 'Only PDF files can be imported',
open: 'More',
away: 'Less',
open: 'Expand',
away: 'Collapse',
toDoProcess: 'To Do',
processDone: 'Completed',
sentProcess: 'Initiated',
sentProcess: 'Create',
monitoringProcess: 'Monitor',
ConfirmDeployment: 'Confirm Deployment?',
terminationProcess: 'Termination Process',
@@ -501,10 +501,10 @@ module.exports = {
ProcessType: 'Process Type',
AddProcess: 'Add Process',
RelatedItems: 'Relevant Project',
Sponsor: 'Initiator',
Sponsor: 'Creator',
CurrentProcessor: 'Current Processor',
LastProcessor: 'Last Processor',
ProcessingTime: 'Operation Time',
ProcessingTime: 'Complete Date',
cutoffTime: 'Due Date',
ProcessStatus: 'Process Status',
CompletionTime: 'Completion Time',
@@ -821,8 +821,8 @@ module.exports = {
selectInquiry: 'Select Inquiry',
sendBack: 'Send Back',
taskConfirmationProcess: 'Task confirmation process',
notFinished: 'To be completed',
Finished: 'Completed',
notFinished: 'Assigned',
Finished: 'Complete',
theRequirementst: 'The engineering interface person confirms the compliance requirements',
dataLoading: 'Data loading...',
Submitting: 'Submitting',
jero-web/src/components/tableCollection/index1.vue
+2 -2
View File
@@ -281,13 +281,13 @@
},
pageOnChange(page, pageSize) {
this.pageNo = page
this.$emit('handlePreservation')
// this.$emit('handlePreservation')
this.getTableList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.$emit('handlePreservation')
// this.$emit('handlePreservation')
this.getTableList()
},
hideModal(){
jero-web/src/views/parameter/parameterexport/index.vue
+1 -1
View File
@@ -44,7 +44,7 @@
:columns="columns"
>
<span slot="projectName" slot-scope="text,record" :title="text">
{{ text && text.length > 60 ? text.slice(0, 59) + '...' : text }}
{{ text && text.length > 40 ? text.slice(0, 39) + '...' : text }}
</span>
<span slot="templateName" slot-scope="text,record" :title="text">
{{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }}