From 8937e30b2f2c54e6315dd370f8bbc0197d0b0c11 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 8 Aug 2022 09:29:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E7=9C=81=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/parameterexport/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index f99f92e7e..f2b9db630 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -44,7 +44,7 @@ :columns="columns" > - {{ text && text.length > 60 ? text.slice(0, 59) + '...' : text }} + {{ text && text.length > 40 ? text.slice(0, 39) + '...' : text }} {{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }} From 2eee4696ad3e0bff324b9516fca530bcf8171e41 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 8 Aug 2022 10:53:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E6=B7=BB=E5=8A=A0=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=85=A8=E6=96=87=E8=AF=84=E8=AE=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareResCommentController.java | 14 ++ .../entity/SarFileCompareResComVO.java | 59 ++++++++ .../entity/SarFileCompareResultVO.java | 9 ++ .../ISarFileCompareResCommentService.java | 3 + .../SarFileCompareItemCommentServiceImpl.java | 8 +- .../SarFileCompareResCommentServiceImpl.java | 130 ++++++++++++------ 6 files changed, 175 insertions(+), 48 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java index 025f671f7..892eda70c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java @@ -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> queryListByInfoId(@RequestParam(name="id",required=true) String id) { + List list = sarFileCompareResCommentService.queryListByInfoId(id); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java new file mode 100644 index 000000000..f46fb8cc7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java @@ -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 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 getResComVoList() { + return resComVoList; + } + + public void setResComVoList(List resComVoList) { + this.resComVoList = resComVoList; + } + + public void addResComVo(SarFileCompareResComVO resComVo) { + if (null == this.resComVoList) { + this.resComVoList = new ArrayList<>(); + } + this.resComVoList.add(resComVo); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java index 71e34086a..9236eebf8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java @@ -11,6 +11,7 @@ public class SarFileCompareResultVO { private String serialNumberRight; private String fileNameRight; private List 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; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java index ad53c87c8..445eb8771 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java @@ -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 queryList(); + + List queryListByInfoId(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index 71b4dec8d..60ecb484c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -67,9 +67,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl list = queryListByInfoId(infoId); Map sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java index c77ce0609..fc69ae105 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java @@ -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 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 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 queryList() { return list(); } + + @Override + public List queryListByInfoId(String id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarFileCompareResComment::getInfoId, id); + queryWrapper.orderBy(true, true, SarFileCompareResComment::getCreateTime); + List resList = new ArrayList<>(); + List 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; + } + + } From 10f0de88bcda44f90f7763e15581c77b5d320bcb Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 8 Aug 2022 11:08:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 24 +++++++++---------- .../src/components/tableCollection/index1.vue | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4497b2d83..54b9257fd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -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', diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index ffd25c5b7..fcb9059c1 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -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(){ From 486d4ed35034ec2c35b28b796cb4a4509d575b89 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 8 Aug 2022 11:10:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E6=B7=BB=E5=8A=A0=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=85=A8=E6=96=87=E8=AF=84=E8=AE=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compare/controller/SarFileCompareResCommentController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java index 892eda70c..64932f363 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java @@ -175,7 +175,7 @@ public class SarFileCompareResCommentController extends JeroController> queryListByInfoId(@RequestParam(name="id",required=true) String id) { List list = sarFileCompareResCommentService.queryListByInfoId(id); return Result.OK(list); From 730b5014db9fd78dc40fcbcb77720aad0260c35f Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Mon, 8 Aug 2022 11:11:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=94=9A=E6=9D=A5=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E5=8A=A0=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/system/util/JwtUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java index 56c2952d6..54db7a793 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java @@ -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是否正确 From b9b647fa76664900319b8b0d333687ead23dbaff Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 8 Aug 2022 11:13:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E6=B7=BB=E5=8A=A0=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=85=A8=E6=96=87=E8=AF=84=E8=AE=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarFileCompareResCommentController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java index 64932f363..560768a2b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java @@ -169,12 +169,12 @@ public class SarFileCompareResCommentController extends JeroController> queryListByInfoId(@RequestParam(name="id",required=true) String id) { List list = sarFileCompareResCommentService.queryListByInfoId(id);