From a71c033e78085667d3b045bb50887a261f4573b7 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sun, 31 Jul 2022 10:56:06 +0800 Subject: [PATCH 01/53] =?UTF-8?q?space=E5=90=8C=E6=AD=A5=E7=9A=84=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=A5=E5=BF=97=E6=94=B9=E4=B8=BAinfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/space/job/SpaceJobHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java index 33560fecf..967b2f388 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java @@ -136,7 +136,7 @@ public class SpaceJobHandler implements Job { } } projectYearNameInfoEOService.saveBatch(diffYearNameList); - log.error("从Space获取项目名称相关数据,成功保存"); + log.info("从Space获取项目名称相关数据,成功保存"); } } } From a21d139770b06868275151f665cadf5d813cfc8f Mon Sep 17 00:00:00 2001 From: zer0Black Date: Mon, 1 Aug 2022 09:53:28 +0800 Subject: [PATCH 02/53] =?UTF-8?q?=E5=8E=BB=E9=99=A4NumberInfo=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/NumberInfo/NumberInfo.vue | 54 ------------------ jero-web/src/components/NumberInfo/index.js | 3 - jero-web/src/components/NumberInfo/index.less | 55 ------------------- jero-web/src/views/Home.vue | 13 ----- 4 files changed, 125 deletions(-) delete mode 100644 jero-web/src/components/NumberInfo/NumberInfo.vue delete mode 100644 jero-web/src/components/NumberInfo/index.js delete mode 100644 jero-web/src/components/NumberInfo/index.less diff --git a/jero-web/src/components/NumberInfo/NumberInfo.vue b/jero-web/src/components/NumberInfo/NumberInfo.vue deleted file mode 100644 index 81508780b..000000000 --- a/jero-web/src/components/NumberInfo/NumberInfo.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/components/NumberInfo/index.js b/jero-web/src/components/NumberInfo/index.js deleted file mode 100644 index a471501ab..000000000 --- a/jero-web/src/components/NumberInfo/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import NumberInfo from './NumberInfo' - -export default NumberInfo \ No newline at end of file diff --git a/jero-web/src/components/NumberInfo/index.less b/jero-web/src/components/NumberInfo/index.less deleted file mode 100644 index 719113da9..000000000 --- a/jero-web/src/components/NumberInfo/index.less +++ /dev/null @@ -1,55 +0,0 @@ -@import "../index"; - -@numberInfo-prefix-cls: ~"@{ant-pro-prefix}-number-info"; - -.@{numberInfo-prefix-cls} { - - .ant-pro-number-info-subtitle { - color: @text-color-secondary; - font-size: @font-size-base; - height: 22px; - line-height: 22px; - overflow: hidden; - text-overflow: ellipsis; - word-break: break-all; - white-space: nowrap; - } - - .number-info-value { - margin-top: 4px; - font-size: 0; - overflow: hidden; - text-overflow: ellipsis; - word-break: break-all; - white-space: nowrap; - - & > span { - color: @heading-color; - display: inline-block; - line-height: 32px; - height: 32px; - font-size: 24px; - margin-right: 32px; - } - - .sub-total { - color: @text-color-secondary; - font-size: @font-size-lg; - vertical-align: top; - margin-right: 0; - i { - font-size: 12px; - transform: scale(0.82); - margin-left: 4px; - } - :global { - .anticon-caret-up { - color: @red-6; - } - .anticon-caret-down { - color: @green-6; - } - } - } - } -} \ No newline at end of file diff --git a/jero-web/src/views/Home.vue b/jero-web/src/views/Home.vue index c9cab99cc..185c587fd 100644 --- a/jero-web/src/views/Home.vue +++ b/jero-web/src/views/Home.vue @@ -95,17 +95,6 @@ fourth incident in September, according to the safety recall report. After meeting with US regulators in October, the firm decided to issue a voluntary recall. - -

# NumberInfo 组件

- - NumberInfo - - - @@ -116,14 +105,12 @@ import AvatarList from '@/components/AvatarList' import CountDown from '@/components/CountDown/CountDown' import Ellipsis from '@/components/Ellipsis' - import NumberInfo from '@/components/NumberInfo' const AvatarListItem = AvatarList.AvatarItem export default { name: 'Home', components: { - NumberInfo, Ellipsis, CountDown, Trend, From b1d213267260b5b35aca7ed791e26036bf0deca6 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 1 Aug 2022 10:42:45 +0800 Subject: [PATCH 03/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoDataController.java | 18 ++++++++---------- .../controller/ExtRepoFolderController.java | 18 ++++++++---------- .../modules/extRepo/entity/ExtRepoData.java | 4 ++++ .../modules/extRepo/entity/ExtRepoFolder.java | 4 ++++ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index a6f651b3d..d35590f6f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -114,18 +114,17 @@ public class ExtRepoDataController extends JeroController add(@Validated @RequestBody ExtRepoData extRepoData, - @RequestParam("cut") String cut) { + public Result add(@Validated @RequestBody ExtRepoData extRepoData) { if (extRepoFolderService.haveManageAuth(extRepoData.getSupFolder())) { log.info("对外报告数据表收到文件添加请求，开始处理文件:【" + sdf.format(new Date()) + "】"); int res = extRepoDataService.add(extRepoData); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.OK("添加成功:" + res + "条数据！"); } else { return Result.OK("success:" + res + "data！"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.error("没有权限！"); } else { return Result.error("No Permission！"); @@ -143,20 +142,19 @@ public class ExtRepoDataController extends JeroController edit(@Validated @RequestBody ExtRepoData extRepoData, - @RequestParam("cut") String cut) { + public Result edit(@Validated @RequestBody ExtRepoData extRepoData) { ExtRepoData erd = extRepoDataService.queryById(extRepoData.getId()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) { extRepoData.setSupFolder(erd.getSupFolder()); extRepoDataService.editById(extRepoData); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.OK("添加成功！"); } else { return Result.OK("success！"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { return Result.error("没有权限！"); } else { return Result.error("No Permission！"); @@ -174,7 +172,7 @@ public class ExtRepoDataController extends JeroController delete(@RequestParam("id") String id, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -207,7 +205,7 @@ public class ExtRepoDataController extends JeroController deleteBatch(@RequestParam("ids") String ids, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List idsList = Arrays.asList(ids.split(",")); for (String id : idsList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java index 8c0caae2c..556a139a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java @@ -53,17 +53,16 @@ public class ExtRepoFolderController extends JeroController add(@Validated @RequestBody ExtRepoFolder extRepoFolder, - @RequestParam("cut") String cut) { + public Result add(@Validated @RequestBody ExtRepoFolder extRepoFolder) { if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) { extRepoFolderService.add(extRepoFolder); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.OK("添加成功！"); } else { return Result.OK("success！"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.error("没有权限！"); } else { return Result.error("No Permission！"); @@ -80,17 +79,16 @@ public class ExtRepoFolderController extends JeroController edit(@Validated @RequestBody ExtRepoFolder extRepoFolder, - @RequestParam("cut") String cut) { + public Result edit(@Validated @RequestBody ExtRepoFolder extRepoFolder) { if (extRepoFolderService.haveManageAuth(extRepoFolder.getId())) { extRepoFolderService.editById(extRepoFolder); - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.OK("编辑成功!"); } else { return Result.OK("success！"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { + if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { return Result.error("没有权限！"); } else { return Result.error("No Permission！"); @@ -108,7 +106,7 @@ public class ExtRepoFolderController extends JeroController delete(@RequestParam(name = "id", required = true) String id, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { if (extRepoFolderService.haveManageAuth(id)) { List resList = extRepoFolderService.getListBySupFolder(id); if (resList.isEmpty()) { @@ -144,7 +142,7 @@ public class ExtRepoFolderController extends JeroController queryById(@RequestParam(name = "id", required = true) String id, - @RequestParam("cut") String cut) { + @RequestParam(name = "cut", defaultValue = "cn") String cut) { ExtRepoFolder extRepoFolder = extRepoFolderService.queryById(id); if (extRepoFolder == null) { if (CutEnum.CN.getValue().equals(cut)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java index 60b13fee3..d83dc65a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java @@ -1,6 +1,7 @@ package com.jero.modules.extRepo.entity; 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 com.fasterxml.jackson.annotation.JsonFormat; @@ -78,4 +79,7 @@ public class ExtRepoData implements Serializable { @ApiModelProperty(value = "所属文件夹") private java.lang.String supFolder; + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java index 972a8010d..c34293c87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java @@ -1,6 +1,7 @@ package com.jero.modules.extRepo.entity; 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 com.fasterxml.jackson.annotation.JsonFormat; @@ -92,4 +93,7 @@ public class ExtRepoFolder implements Serializable { @Excel(name = "管理权限人员id", width = 15) @ApiModelProperty(value = "管理权限人员id") private String authManageIds; + + @TableField(exist = false) + private String cut; } From 3ebbee7b59d0b4c1be7ec764ec9ef7b0f58812fd Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 1 Aug 2022 11:09:32 +0800 Subject: [PATCH 04/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=88=A0=E9=99=A4=E5=90=8C=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4cos=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extRepo/controller/ExtRepoDataController.java | 6 ++++++ .../controller/ExtRepoFolderController.java | 9 +++++++++ .../extRepo/service/IExtRepoDataService.java | 8 ++++++++ .../service/impl/ExtRepoDataServiceImpl.java | 14 ++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index d35590f6f..4172cf5a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoDataPage; import com.jero.modules.extRepo.service.IExtRepoDataService; @@ -178,6 +179,7 @@ public class ExtRepoDataController extends JeroController resList = extRepoFolderService.getListBySupFolder(id); if (resList.isEmpty()) { + List erdList = extRepoDataService.queryByFolder(id); + for (ExtRepoData erd:erdList){ + extRepoDataService.deleteById(erd.getId()); + } extRepoFolderService.deleteById(id); } else { if (CutEnum.CN.getValue().equals(cut)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java index cb141bd4e..b53f62527 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java @@ -59,4 +59,12 @@ public interface IExtRepoDataService extends IService { * @return */ List queryList(); + + /** + * 根据文件夹查询 + * + * @param folserId + * @return + */ + List queryByFolder(String folserId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java index 58bbf73cb..a50adc802 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.extRepo.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.mapper.ExtRepoDataMapper; @@ -125,4 +126,17 @@ public class ExtRepoDataServiceImpl extends ServiceImpl queryList() { return list(); } + + /** + * 列表查询 + * + * @param folserId + * @return + */ + public List queryByFolder(String folserId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExtRepoData::getSupFolder, folserId); + List list = this.list(queryWrapper); + return list; + } } From ad433b5e8086826ec5e9004272708735302d045d Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 1 Aug 2022 11:17:56 +0800 Subject: [PATCH 05/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=88=A0=E9=99=A4=E5=90=8C=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4cos=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/extRepo/controller/ExtRepoDataController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 4172cf5a9..ff476d228 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -220,10 +220,12 @@ public class ExtRepoDataController extends JeroController Date: Mon, 1 Aug 2022 11:27:14 +0800 Subject: [PATCH 06/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E7=9A=84=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/commentList.vue | 393 ++++++++++++++++++ .../components/comparisonResults.vue | 234 ++++++++--- .../components/documentDataComparison.vue | 106 ++++- .../documentComparison/index.vue | 6 +- 4 files changed, 678 insertions(+), 61 deletions(-) create mode 100644 jero-web/src/views/documentTools/documentComparison/components/commentList.vue diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue new file mode 100644 index 000000000..1dc268765 --- /dev/null +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -0,0 +1,393 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 9c73a544e..81de1c7e2 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -11,7 +11,7 @@
- + {{$t('exportComparisonReport')}}
- +
所选标准：GB 23456-2020 机动车标准 FMVSS 114 中文.word @@ -37,10 +38,53 @@
- +
+
+
+
+
+ 第10条 + 光反射器 +
+
+ 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板 + sdf kdsf kljsfkldsfdsfdsf +
+
+
+
+ 第10条 + 光反射器 +
+
+ 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板收到反是馈就但是罚款决定书发的科技示范 +
+
+
+
+ + {{$t('comparisonDifferenceComment')}}: +
+
+ 差异是各单位在结构上的差别程度成员在时间横轴上的位置的差别程经理与其他的差别程度 横轴上的位置的差别程经理与其他的差别程度差异 +
+
+
+
+ + {{$t('edit')}} + {{$t('delete')}} + +
+
+
+
+ +
@@ -81,49 +125,7 @@
- - -
-
-
-
- 第10条 - 光反射器 -
-
- 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板 - sdf kdsf kljsfkldsfdsfdsf -
-
-
-
- 第10条 - 光反射器 -
-
- 12. 附加光反射器，可以是贴纸，具有以下规格： a) 正面左右两侧呈白色或淡黄色； b) 背面左右两侧呈红色； c) 防护板收到反是馈就但是罚款决定书发的科技示范 -
-
-
-
- - {{$t('comparisonDifferenceComment')}}: -
-
- 差异是各单位在结构上的差别程度成员在时间横轴上的位置的差别程经理与其他的差别程度 横轴上的位置的差别程经理与其他的差别程度差异 -
-
-
-
- - {{$t('edit')}} - {{$t('delete')}} - -
-
-
-
- +
@@ -166,7 +168,7 @@
- +
@@ -190,8 +192,8 @@
- {{$t('edit')}} - {{$t('delete')}} + {{$t('edit')}} +
@@ -199,16 +201,70 @@
+ + + +
+
+ {{$t('fullTextComments')}} +
+ + + +
+
+
+ {{$t('comparativeComments')}} +
+ + + +
+ + {{$t('dataLoading')}} +
+ + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index d35c3e299..9f8673932 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -125,6 +125,9 @@ + + + @@ -140,6 +143,7 @@ import settingList from './settingList' import currentStatusOfTheProjectEcharts from './currentStatusOfTheProjectEcharts' import deliverableStatusEchart from './deliverableStatusEchart' + import ParameterCollectionEchart from './ParameterCollectionEchart' import certificationProgressEchart from './certificationProgressEchart' import { mapGetters } from 'vuex' @@ -147,6 +151,7 @@ name: 'ProjectDetails', components: { listOfRelevantPersonnel, + ParameterCollectionEchart, addModel, settingList, currentStatusOfTheProjectEcharts, From 589e1eec3f838c84f6c6a0ce71bae73f20d2266f Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 1 Aug 2022 14:19:56 +0800 Subject: [PATCH 09/53] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsManifestEOServiceImpl.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 3a58e3598..99df45140 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -679,10 +679,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); // 组装数据 返回前端 List> data = new LinkedList<>(); - getData(data, cut, notStartNumber, notStartPercent); - getData(data, cut, collectingNumber, collectingPercent); - getData(data, cut, submitNumber, submitPercent); - getData(data, cut, syncReportNumber, syncReportPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.NOT_START, notStartNumber, notStartPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.COLLECTING, collectingNumber, collectingPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.SUBMIT, submitNumber, submitPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.SYNC_REPORT, syncReportNumber, syncReportPercent); if (CutEnum.EN.getValue().equals(cut)) { map.put(item.getTextEn(), data); @@ -698,20 +698,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> data, String cut, double quantity, String percentage) { + private void getData(List> data, String cut, CollectManifestStatisticsStateEnum statisticsStateEnum, double quantity, String percentage) { Map notStartMap = new HashMap<>(); if (CutEnum.EN.getValue().equals(cut)) { - notStartMap.put("name", CollectManifestStatisticsStateEnum.NOT_START.getEnName()); + notStartMap.put("name", statisticsStateEnum.getEnName()); } else { - notStartMap.put("name", CollectManifestStatisticsStateEnum.NOT_START.getName()); + notStartMap.put("name", statisticsStateEnum.getName()); } - notStartMap.put("type", CollectManifestStatisticsStateEnum.NOT_START.getValue()); + notStartMap.put("type", statisticsStateEnum.getValue()); notStartMap.put("quantity", quantity); notStartMap.put("percentage", percentage); data.add(notStartMap); } + /** + * 计算百分比 + * @param d1 + * @param d2 + * @return + */ private String getRatio(Double d1, Double d2) { if (d1 == null || d2 == null || d2 <= 0) { return "0%"; From 049fbb353401e4489b0320f2c0e89eb22d42ec57 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 1 Aug 2022 14:29:32 +0800 Subject: [PATCH 10/53] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 0eddd3337..a27b4ca68 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -127,8 +127,8 @@ \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java index b53290e5c..c4bdbb34a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java @@ -42,10 +42,10 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 11:34:49 +0800 Subject: [PATCH 18/53] =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterCollectionEchart.vue | 184 +++++++++--------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 97d2c7c23..77439939d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -50,7 +50,8 @@ data() { return { queryParam:{ - value:1 + value:1, + ctype:'' }, options:[], collecting:[], @@ -89,33 +90,6 @@ this.submit = res.result.submit ? res.result.submit : [] this.syncReport = res.result.syncReport ? res.result.syncReport : [] this.dutyTerritory = res.result.dutyTerritory ? res.result.dutyTerritory : [] - this.collecting.forEach((item,index) => { - this.collectingpercentage.push(item.percentage) - this.collectingquantity.push(item.quantity) - }) - this.notStart.forEach((item,index) => { - this.notStartpercentage.push(item.percentage) - this.notStartquantity.push(item.quantity) - }) - this.submit.forEach((item,index) => { - this.submitpercentage.push(item.percentage) - this.submitquantity.push(item.quantity) - }) - this.syncReport.forEach((item,index) => { - this.syncReportpercentage.push(item.percentage) - this.syncReportquantity.push(item.quantity) - }) - if(this.queryParam.value = 1){ - this.collectingdata = this.collectingpercentage - this.notStartdata = this.notStartpercentage - this.submitdata = this.submitpercentage - this.syncReportdata = this.syncReportpercentage - }else{ - this.collectingdata = this.collectingquantity - this.notStartdata = this.notStartquantity - this.submitdata = this.submitquantity - this.syncReportdata = this.syncReportquantity - } setTimeout(() => { this.getEcharts() },1000) @@ -136,24 +110,67 @@ }) }, getonChange(value){ + this.collectingpercentage = [] + this.collectingquantity = [] + this.notStartpercentage = [] + this.notStartquantity = [] + this.submitpercentage = [] + this.submitquantity = [] + this.syncReportpercentage = [] + this.syncReportquantity = [] this.getData(value) }, - onChange(){ + onChange(value){ + this.collectingpercentage = [] + this.collectingquantity = [] + this.notStartpercentage = [] + this.notStartquantity = [] + this.submitpercentage = [] + this.submitquantity = [] + this.syncReportpercentage = [] + this.syncReportquantity = [] + this.getEcharts() }, getEcharts(chart, title, color, data, num) { + this.collecting.forEach((item,index) => { + this.collectingpercentage.push(item.percentage) + this.collectingquantity.push(item.quantity) + }) + this.notStart.forEach((item,index) => { + this.notStartpercentage.push(item.percentage) + this.notStartquantity.push(item.quantity) + }) + this.submit.forEach((item,index) => { + this.submitpercentage.push(item.percentage) + this.submitquantity.push(item.quantity) + }) + this.syncReport.forEach((item,index) => { + this.syncReportpercentage.push(item.percentage) + this.syncReportquantity.push(item.quantity) + }) + if(this.queryParam.value == 1){ + this.collectingdata = this.collectingpercentage + this.notStartdata = this.notStartpercentage + this.submitdata = this.submitpercentage + this.syncReportdata = this.syncReportpercentage + }else if(this.queryParam.value == 2){ + this.collectingdata = this.collectingquantity + this.notStartdata = this.notStartquantity + this.submitdata = this.submitquantity + this.syncReportdata = this.syncReportquantity + } var chartDom = document.getElementById('main-left'); var myChart = echarts.init(chartDom); var option; + var option1; let xAxisData = []; // let data1 = []; // let data2 = []; // let data3 = []; // let data4 = []; - this.dutyTerritory.forEach((item,index) => { - xAxisData.push(item); - }) + xAxisData = this.dutyTerritory // data1.push(+(Math.random() * 2).toFixed(2)); // data2.push(+(Math.random() * 100).toFixed(2)); // data3.push(+(Math.random() + 0.3).toFixed(2)); @@ -173,24 +190,47 @@ // dataView: {} // } }, - tooltip: {}, + tooltip: { + trigger:'axis', + axisPointer: { // 坐标轴指示器，坐标轴触发有效 + type: 'line'// 默认为直线，可选为：'line' | 'shadow' + }, + formatter: '{b}
{a0}: {c0}%
{a1}: {c1}%' + }, xAxis: { data: xAxisData, // name: 'X Axis', - axisLine: { onZero: true }, - splitLine: { show: false }, - splitArea: { show: false } + axisLabel: { + interval: 0, + // formatter: function(value) { + // return value.split("").join("\n"); + // } + }, + // axisLine: { onZero: true }, + // splitLine: { show: false }, + // splitArea: { show: false } }, - yAxis: {}, + yAxis: [ + { + type: 'value', + axisLabel: { + show: true, + interval: 'auto', + formatter: '{value} %' + }, + }, + + ], grid: { - bottom: 100 + left: '10%', + bottom: '15%' }, series: [ { name: this.$t('Notatthe'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#707486", @@ -201,7 +241,7 @@ name: this.$t('Inthecollection'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#00B3BE", @@ -212,7 +252,7 @@ name: this.$t('Submitted'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#26BD4B", @@ -223,7 +263,7 @@ name: this.$t('SynchronizedLibrary'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#E83030", @@ -234,60 +274,20 @@ dataZoom:[ { - - type: 'slider', - - show: false, - - start:0,//默认为0 - - end: 100,//默认为100 - + type: 'slider',//给x轴设置滚动条 + show: true, //flase直接隐藏图形 xAxisIndex: [0], - - handleSize: 0,//滑动条的 左右2个滑动条的大小 - - height: 5,//组件高度 - - bottom: 0,//右边的距离 - - borderColor: "#e3e3e3", - - fillerColor: '#51B7F9', - - borderRadius:10, - - backgroundColor: '#e3e3e3',//两边未选中的滑动条区域的颜色 - - showDataShadow: false,//是否显示数据阴影 默认auto - - showDetail: false,//即拖拽时候是否显示详细数值信息 默认true - - realtime:true, //是否实时更新 - - filterMode: 'filter', - - zlevel:-10, - - }, - //以下重点： 让鼠标滚动从缩放变成移动 - { - - type: 'inside', - - xAxisIndex: [0], - - zoomOnMouseWheel:false, //滚轮不触发缩放 - - moveOnMouseMove:true, //鼠标移动触发平移 - - moveOnMouseWheel:true, //鼠标滚轮触发平移 - - }, + bottom: 0, + height: 20, + showDetail: false, + startValue: 0,//滚动条的起始位置 + endValue: 9 //滚动条的截止位置（按比例分割你的柱状图x轴长度） + } ], }; - option && myChart.setOption(option); + option && myChart.setOption(option); + }, mainLeftEcharts(data, color) { this.getEcharts('main-left', this.$t('Parametercollection'), color, data, 1) From 5ff017b263a0189a0967b0eae5228042dd07a34a Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 2 Aug 2022 11:54:37 +0800 Subject: [PATCH 19/53] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/package.json | 1 + jero-web/src/common/lang/en-us.js | 7 + jero-web/src/common/lang/zh-cn.js | 7 + jero-web/src/components/layouts/TabLayout.vue | 3 + jero-web/src/config/router.config.js | 15 + .../components/problemKnowledgeBaseAdd.vue | 408 ++++++++++++++++++ .../components/problemKnowledgeBaseList.vue | 22 +- .../problemKnowledgeBaseRelease.vue | 13 + .../components/problemKnowledgeBaseView.vue | 13 + 9 files changed, 484 insertions(+), 5 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue diff --git a/jero-web/package.json b/jero-web/package.json index 895530955..0a928ac24 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -43,6 +43,7 @@ "vue-ls": "^3.2.0", "vue-photo-preview": "^1.1.3", "vue-print-nb-jeecg": "^1.0.9", + "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.1", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e81246812..9cfe92ae3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1209,4 +1209,11 @@ module.exports = { financialReimbursement:'Financial Reimbursement', classificationMaintenance:'Classification Maintenance', managePublishing:'Manage Publishing', + displayPermission:'Display permission', + authorizedUser:'Authorized user', + problemClassification:'Problem classification', + market:'market', + documentNumber:'Document Number', + documentTitle:'Document Title', + bringInDocumentInformation:'Bring in document information', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 69b0d8324..715a564bf 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1312,4 +1312,11 @@ module.exports = { financialReimbursement:'财务报销', classificationMaintenance:'分类维护', managePublishing:'管理发布', + displayPermission:'展示权限', + authorizedUser:'权限用户', + problemClassification:'问题分类', + market:'市场', + documentNumber:'文档编号', + documentTitle:'文档标题', + bringInDocumentInformation:'带入文档信息', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 43d3b7322..eab0ee130 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -92,6 +92,9 @@ this.$route.path == '/virtualListDetails' || this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || + this.$route.path == '/problemKnowledgeBaseAdd' || + this.$route.path == '/problemKnowledgeBaseRelease' || + this.$route.path == '/problemKnowledgeBaseView' || this.$route.path == '/regulatoryInitiatingProcess' || this.$route.path == '/regulatoryProcessReview' || this.$route.path == '/handshakeProcess' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index b4a8ba6b4..0ddd91599 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -357,6 +357,21 @@ export const constantRouterMap = [ name: 'evaluationResultsClause', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsClause') }, + { + path: '/problemKnowledgeBaseAdd', + name: 'problemKnowledgeBaseAdd', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd') + }, + { + path: '/problemKnowledgeBaseRelease', + name: 'problemKnowledgeBaseRelease', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease') + }, + { + path: '/problemKnowledgeBaseView', + name: 'problemKnowledgeBaseView', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView') + }, // { // path: '/ParameterItemCollection', // name: 'ParameterItemCollection', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue new file mode 100644 index 000000000..2b654d9c4 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -0,0 +1,408 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 8cac6b2ef..a3631bcf8 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -27,11 +27,11 @@ {{$t('classificationMaintenance')}}
- + {{$t('managePublishing')}}
- + {{$t('newlyAdded')}}
@@ -125,13 +125,25 @@ }, classificationClick() { - + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseView', + query: {} + }) + window.open(newUrl.href, '_blank') }, managePublishingClick() { - + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseRelease', + query: {} + }) + window.open(newUrl.href, '_blank') }, newlyAddedClick() { - + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseAdd', + query: {} + }) + window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue new file mode 100644 index 000000000..d1059e89b --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue new file mode 100644 index 000000000..958c3f3a5 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From 1ccee53a0f590a1201b4c70a5c2e3e4a5fbec1e8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 2 Aug 2022 11:58:58 +0800 Subject: [PATCH 20/53] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterCollectionEchart.vue | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 77439939d..9c77c4b8e 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -176,7 +176,27 @@ // data3.push(+(Math.random() + 0.3).toFixed(2)); // data4.push(+Math.random().toFixed(2)); - + let yAxis=[]; + let tooltip= {}; + let _this = this + if(this.queryParam.value === 1){ + yAxis = [ + { + type: 'value', + axisLabel: { + show: true, + interval: 'auto', + formatter: '{value} %' + }, + }, + ] + }else{ + yAxis=[ + { + type: 'value', + }, + ]; + } option = { legend: { data: [this.$t('Notatthe'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')], @@ -195,7 +215,16 @@ axisPointer: { // 坐标轴指示器，坐标轴触发有效 type: 'line'// 默认为直线，可选为：'line' | 'shadow' }, - formatter: '{b}
{a0}: {c0}%
{a1}: {c1}%' + formatter: function (params) { + var html = params[0].name + "
"; + for (var i = 0; i < params.length; i++) { + html += params[i].marker + params[i].seriesName + ":" + params[i].value; + if (_this.queryParam.value == 1) { + html += "%"; + } + } + return html + "
"; + } }, xAxis: { data: xAxisData, @@ -210,17 +239,7 @@ // splitLine: { show: false }, // splitArea: { show: false } }, - yAxis: [ - { - type: 'value', - axisLabel: { - show: true, - interval: 'auto', - formatter: '{value} %' - }, - }, - - ], + yAxis: yAxis, grid: { left: '10%', bottom: '15%' @@ -286,7 +305,7 @@ ], }; - option && myChart.setOption(option); + option && myChart.setOption(option, true); }, mainLeftEcharts(data, color) { From fc92c5d2a5585834497be9439ef9dd25f560fe81 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 2 Aug 2022 13:44:38 +0800 Subject: [PATCH 21/53] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E5=AF=BC=E5=87=BA=E8=8B=B1=E6=96=87=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 57 +++++++++++++++---- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index cd176e7ac..7810e4dd3 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -499,9 +499,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); if (allRelevFileList != null && !allRelevFileList.isEmpty()) { allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); - downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + String exportFile = "导出文件"; + if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { + exportFile = "Export file"; + } + downLoadFileList(allRelevFileList,fileNowPath + File.separator + exportFile); } // 拿取模板 @@ -764,7 +785,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); if (allRelevFileList != null && !allRelevFileList.isEmpty()) { allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); - downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + String exportFile = "导出文件"; + if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { + exportFile = "Export file"; + } + downLoadFileList(allRelevFileList,fileNowPath + File.separator + exportFile); } // 拿取模板 @@ -881,7 +910,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 14:07:18 +0800 Subject: [PATCH 22/53] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E8=AE=A4=E8=AF=81=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=8F=96=E6=B6=88=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index fa55336d4..95420e13b 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -548,4 +548,9 @@ CREATE TABLE `ext_repo_data` ( `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明', `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- 参数项收集清单 认证类别取消列表显示 2022-08-02 +UPDATE `laws_weilai`.`onl_cgform_field` +SET `is_show_list` = 0, `update_by` = 'admin', `update_time` = '2022-08-02 09:36:09' +WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390'; From 654b2876e776868f61c7aac78e76c4f8ee8d754f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 2 Aug 2022 14:07:52 +0800 Subject: [PATCH 23/53] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../commponts/conventionalmodle.vue | 17 +++++++++++-- .../commponts/customexportmodle.vue | 6 +++++ .../parameter/managementdetails/index.vue | 24 +++++++++---------- .../components/ParameterCollectionEchart.vue | 14 +++++------ 6 files changed, 44 insertions(+), 21 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9cfe92ae3..8fb825c0e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1216,4 +1216,6 @@ module.exports = { documentNumber:'Document Number', documentTitle:'Document Title', bringInDocumentInformation:'Bring in document information', + sdt:'sdt', + dre:'dre', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 715a564bf..33dc196e6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1319,4 +1319,6 @@ module.exports = { documentNumber:'文档编号', documentTitle:'文档标题', bringInDocumentInformation:'带入文档信息', + sdt:'工程接口人', + dre:'填写人', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 56a23cacc..8875d7e86 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -242,13 +242,20 @@ export default { getAction('sys/dict/getDictItems/cert_category', { }).then((res) => { if (res.success) { let tt = '' + let tten = '' res.result.forEach((item) => { if(item.value == value){ tt=item.title + tten=item.textEn } }) - this.contentListStart = tt - console.log(this.contentListStart) + let long = localStorage.getItem('language') + this.cut = '' + if (long && long === 'zh-cn') { + this.contentListStart = tt + } else if (long && long === 'en-us') { + this.contentListStart = tten + } } }) console.log(value) @@ -268,6 +275,12 @@ export default { query.certCategoryName = this.contentListStart } query.paramsManifestId = this.$route.query.id + let long = localStorage.getItem('language') + if (long && long === 'zh-cn') { + query.exportName = '常规导出' + } else if (long && long === 'en-us') { + query.exportName = 'normal' + } this.confirmLoading = true downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) this.confirmLoading = false diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index c413fbf9e..a102af0ec 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -243,6 +243,12 @@ export default { // query.certCategoryName = this.contentListStart // } query.paramsManifestId = this.$route.query.id + let long = localStorage.getItem('language') + if (long && long === 'zh-cn') { + query.exportName = '自定义导出' + } else if (long && long === 'en-us') { + query.exportName = 'custom' + } this.confirmLoading = true downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) this.confirmLoading = false diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index ac2fd70f2..47bc18363 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -15,11 +15,11 @@
-
- {{$t('certificationCategory')}} +
+ {{$t('NcertificationCategory')}}
@@ -35,20 +35,20 @@
-
- {{$t('ParameterName')}} +
+ {{$t('NParameterName')}}
-
-
- {{$t('completedBy')}} +
+ {{$t('dre')}}
-
- {{$t('engineeringInterfacePerson')}} +
+ {{$t('sdt')}}
- + {{ d.label }} - + - + {{$t('Thepercentage')}} @@ -90,9 +90,7 @@ this.submit = res.result.submit ? res.result.submit : [] this.syncReport = res.result.syncReport ? res.result.syncReport : [] this.dutyTerritory = res.result.dutyTerritory ? res.result.dutyTerritory : [] - setTimeout(() => { this.getEcharts() - },1000) } @@ -220,10 +218,11 @@ for (var i = 0; i < params.length; i++) { html += params[i].marker + params[i].seriesName + ":" + params[i].value; if (_this.queryParam.value == 1) { - html += "%"; + html += "%" + "
"; } } - return html + "
"; + return html; + } }, xAxis: { @@ -231,6 +230,7 @@ // name: 'X Axis', axisLabel: { interval: 0, + rotate:25, // formatter: function(value) { // return value.split("").join("\n"); // } From 1e6f8c24601a6f1f5d7d9cdb304107c45773afbe Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 2 Aug 2022 15:32:17 +0800 Subject: [PATCH 24/53] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1-=E7=99=BE=E5=88=86=E6=AF=94?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsManifestEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index e62474aa9..18b513804 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -652,8 +652,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> listAll = paramsCollectManifestEOMapper.listInfoForExport(paramsCollectManifestEO); - double total = listAll.size(); - + // 循环责任领域，计算每个责任领域中的四种状态数据 dutyTerritoryDictList.forEach(item->{ if (CutEnum.EN.getValue().equals(cut)) { @@ -683,6 +682,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 15:49:43 +0800 Subject: [PATCH 25/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../problemKnowledgeBaseRelease.vue | 263 +++++++++++++++++- .../components/modules/defaultTemplate.vue | 9 +- .../components/modules/fillTable.vue | 4 + .../components/modules/fillTableAdd.vue | 46 ++- 6 files changed, 313 insertions(+), 11 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8fb825c0e..db7e44757 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1216,6 +1216,7 @@ module.exports = { documentNumber:'Document Number', documentTitle:'Document Title', bringInDocumentInformation:'Bring in document information', + thereWhichCannotDeleted:'There are sub headings under this title, which cannot be deleted', sdt:'sdt', dre:'dre', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 33dc196e6..13a03d29c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1319,6 +1319,7 @@ module.exports = { documentNumber:'文档编号', documentTitle:'文档标题', bringInDocumentInformation:'带入文档信息', + thereWhichCannotDeleted:'该标题下存在子标题无法进行删除', sdt:'工程接口人', dre:'填写人', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index d1059e89b..1cb6d2823 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -1,13 +1,270 @@ - \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 61e2611e2..f8b17a2ce 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -379,6 +379,8 @@ this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery)) if (this.formInline.technologyTerritory) { this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') + } else { + this.formInline.technologyTerritory = [] } this.formInline = { ...this.formInline } } else { @@ -396,6 +398,11 @@ this.formInline.titleCn = value.serial_number + ' ' + value.title this.formInline.titleEn = value.serial_number + ' ' + value.title_en this.formInline.technologyTerritory = value.technology_territory_dict + if (this.formInline.technologyTerritory) { + this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') + } else { + this.formInline.technologyTerritory = [] + } this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict this.formInline.state = value.state_dict @@ -406,7 +413,7 @@ var pos = curPath.indexOf(pathname) var localhostPath = curPath.substring(0, pos) this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 7d2abf4fb..a93e3f426 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -192,6 +192,10 @@ }) }, deleteLib(val) { + if (val.children && val.children.length > 0) { + this.$message.warning(this.$t('thereWhichCannotDeleted')) + return + } let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index d33391169..15940fc5e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -14,12 +14,13 @@
- {{$t('chineseTitle')}} + * + {{$t('chineseTitle')}}
- +
@@ -27,11 +28,12 @@
+ * {{$t('englishTitle')}}
- +
@@ -77,7 +79,32 @@ visible: false, confirmLoading: false, formInline: {}, - rules: {}, + rules: { + titleCn: [ + { + required: true, + message: this.$t('chineseTitle') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('chineseTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + titleEn: [ + { + required: true, + message: this.$t('englishTitle') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, ParentList: [], title: '', url: { @@ -240,4 +267,9 @@ .formAdd { margin-bottom: 40px; } + + .Required { + color: red; + margin-right: 4px; + } \ No newline at end of file From e4ef81b0411881b150e1c14bfc1e3363538ef25c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 2 Aug 2022 15:51:24 +0800 Subject: [PATCH 26/53] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../managementdetails/commponts/conventionalmodle.vue | 2 +- .../managementdetails/commponts/customexportmodle.vue | 2 +- .../parameter/parameterexport/components/addModel.vue | 4 ++-- .../components/ParameterCollectionEchart.vue | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 8875d7e86..ed60ad494 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -282,7 +282,7 @@ export default { query.exportName = 'normal' } this.confirmLoading = true - downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + downloadFile('report/detail/exportNormal', query.exportName+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index a102af0ec..466d06588 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -250,7 +250,7 @@ export default { query.exportName = 'custom' } this.confirmLoading = true - downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) + downloadFile('report/detail/exportCustom', query.exportName+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 4565b1a46..61e274d12 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -211,11 +211,11 @@ export default { Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(res.message) this.visible = false this.$emit('addModelList') } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } }) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index c2396d44b..57d5c035c 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -210,9 +210,9 @@ }, tooltip: { trigger:'axis', - axisPointer: { // 坐标轴指示器，坐标轴触发有效 - type: 'line'// 默认为直线，可选为：'line' | 'shadow' - }, + // axisPointer: { // 坐标轴指示器，坐标轴触发有效 + // type: 'line'// 默认为直线，可选为：'line' | 'shadow' + // }, formatter: function (params) { var html = params[0].name + "
"; for (var i = 0; i < params.length; i++) { @@ -254,7 +254,7 @@ itemStyle: { color: "#707486", }, - data: this.collectingdata + data: this.notStartdata }, { name: this.$t('Inthecollection'), @@ -265,7 +265,7 @@ itemStyle: { color: "#00B3BE", }, - data: this.notStartdata + data: this.collectingdata }, { name: this.$t('Submitted'), From e5526e9ec98cf7ae574ed123b0e571b8660d2f43 Mon Sep 17 00:00:00 2001 From: gaosong Date: Tue, 2 Aug 2022 15:57:44 +0800 Subject: [PATCH 27/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=8B=B1=E8=AF=AD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoDataController.java | 20 +++++++++---------- .../controller/ExtRepoFolderController.java | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index d659da082..8b3d7e4b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -130,9 +130,9 @@ public class ExtRepoDataController extends JeroController Date: Tue, 2 Aug 2022 16:08:48 +0800 Subject: [PATCH 28/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=8B=B1=E8=AF=AD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extRepo/controller/ExtRepoFolderController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java index 9b2831c83..abb0c0d96 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java @@ -125,6 +125,11 @@ public class ExtRepoFolderController extends JeroController Date: Tue, 2 Aug 2022 16:49:38 +0800 Subject: [PATCH 29/53] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/problemKnowledgeBaseAdd.vue | 46 +++-------- .../components/problemKnowledgeBaseList.vue | 18 +---- .../problemKnowledgeBaseRelease.vue | 62 ++++++++++----- .../components/problemKnowledgeBaseView.vue | 77 ++++++++++++++++++- 6 files changed, 133 insertions(+), 72 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index db7e44757..7ed400d42 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1219,4 +1219,5 @@ module.exports = { thereWhichCannotDeleted:'There are sub headings under this title, which cannot be deleted', sdt:'sdt', dre:'dre', + applicableInstructionsMarketList:'Applicable instructions of market list', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 13a03d29c..4611497fe 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1322,4 +1322,5 @@ module.exports = { thereWhichCannotDeleted:'该标题下存在子标题无法进行删除', sdt:'工程接口人', dre:'填写人', + applicableInstructionsMarketList:'市场清单适用说明', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 2b654d9c4..bb5cacdb6 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -69,34 +69,19 @@
* - {{$t('category')}} + {{$t('problemClassification')}}
- -
-
- {{$t('problemClassification')}} -
- - - -
- - -
@@ -113,34 +98,21 @@
+ +
- {{$t('documentNumber')}} + {{$t('standardNo')}}
+ :placeholder="$t('PleaseEnter')+$t('standardNo')"/>
- -
-
- {{$t('documentTitle')}} -
- - - -
- - -
@@ -405,4 +377,8 @@ border: 1px #00B3BE solid; color: #00B3BE; } + + .box-button { + height: 38px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index a3631bcf8..73fe2200f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -44,26 +44,10 @@ :class="{ 'null-input':item.checked }">
- - - - - - - -
@@ -296,7 +280,7 @@ font-weight: bold; color: #040B29; display: inline-block; - max-width: 180px; + max-width: calc(100% - 180px); text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 1cb6d2823..628bdec05 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -13,32 +13,16 @@
-
+
- - - - - - - -
@@ -49,6 +33,10 @@
+
+ {{$t('edit')}} + {{$t('delete')}} +
@@ -87,7 +75,8 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { - getInfoList: 'search/document/getFullTextInfoList' + getInfoList: 'search/document/getFullTextInfoList', + deleteBatch: '' } } }, @@ -128,6 +117,30 @@ } }) window.open(newUrl.href, '_blank') + }, + edit(val) { + this.$router.push({ + path: '/problemKnowledgeBaseAdd', + query: { + id: val.id + } + }) + }, + deleteData(val) { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + }) } } } @@ -210,10 +223,21 @@ .text-text-right { padding: 19px 0; + width: calc(100% - 180px); box-sizing: border-box; /*margin-left: 38px;*/ } + .text-text-right-text { + width: 180px; + height: 100%; + text-align: center; + position: absolute; + right: 0; + top: 50%; + transform: translate-Y(-50%); + } + .null-input { background-color: #F2F4F8; } @@ -231,7 +255,7 @@ font-weight: bold; color: #040B29; display: inline-block; - max-width: 180px; + max-width: calc(100% - 180px); text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 958c3f3a5..e00c3ad3e 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -1,5 +1,21 @@ - \ No newline at end of file From 1c2bea8bac0d370b0ee9643b304810c1ca11550c Mon Sep 17 00:00:00 2001 From: gaosong Date: Tue, 2 Aug 2022 16:59:44 +0800 Subject: [PATCH 30/53] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B=E5=92=8C?= =?UTF-8?q?=E5=85=A8=E6=96=87=E5=AF=B9=E6=AF=94=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/jero-boot-modules/pom.xml | 19 + .../SarFileCompareInfoController.java | 196 ++++++++++ .../SarFileCompareItemController.java | 170 +++++++++ .../compare/entity/SarFileCompareInfo.java | 129 +++++++ .../compare/entity/SarFileCompareItem.java | 109 ++++++ .../modules/compare/enums/ValidFlagEnum.java | 22 ++ .../mapper/SarFileCompareInfoMapper.java | 17 + .../mapper/SarFileCompareItemMapper.java | 17 + .../mapper/xml/SarFileCompareInfoMapper.xml | 25 ++ .../mapper/xml/SarFileCompareItemMapper.xml | 21 ++ .../service/ISarFileCompareInfoService.java | 73 ++++ .../service/ISarFileCompareItemService.java | 61 +++ .../impl/SarFileCompareInfoServiceImpl.java | 348 ++++++++++++++++++ .../impl/SarFileCompareItemServiceImpl.java | 89 +++++ .../modules/compare/utils/CompHanLPUtils.java | 266 +++++++++++++ .../utils/treeTool/OrdNamComparator.java | 21 ++ .../modules/compare/utils/treeTool/Tree.java | 174 +++++++++ .../compare/utils/treeTool/TreeNode.java | 202 ++++++++++ .../utils/treeTool/annotation/TreeNodeId.java | 12 + .../treeTool/annotation/TreeNodeLevel.java | 12 + .../treeTool/annotation/TreeNodeName.java | 12 + .../treeTool/annotation/TreeNodeOrder.java | 12 + .../treeTool/annotation/TreeNodeParentId.java | 12 + .../split/mapper/FileSplitItemsEOMapper.java | 3 + .../mapper/xml/FileSplitItemsEOMapper.xml | 17 + .../split/page/SarFileSplitItemsEOPage.java | 1 + .../service/IFileSplitItemsEOService.java | 2 + .../impl/FileSplitItemsEOServiceImpl.java | 11 + 28 files changed, 2053 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ValidFlagEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/OrdNamComparator.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/Tree.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/TreeNode.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeId.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeLevel.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeName.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeOrder.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeParentId.java diff --git a/jero-boot/jero-boot-modules/pom.xml b/jero-boot/jero-boot-modules/pom.xml index 5e22036fc..98a1510d4 100644 --- a/jero-boot/jero-boot-modules/pom.xml +++ b/jero-boot/jero-boot-modules/pom.xml @@ -201,6 +201,25 @@ + + + + com.janeluo + ikanalyzer + 2012_u6 + + + + org.jsoup + jsoup + 1.11.3 + + + + com.hankcs + hanlp + portable-1.7.5 + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java new file mode 100644 index 000000000..10e496bc2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -0,0 +1,196 @@ +package com.jero.modules.compare.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +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.SarFileCompareInfo; +import com.jero.modules.compare.service.ISarFileCompareInfoService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + +/** + * @Description: 文档对比信息表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Api(tags = "文档对比信息表") +@RestController +@RequestMapping("/compare/sarFileCompareInfo") +@Slf4j +public class SarFileCompareInfoController extends JeroController { + @Autowired + private ISarFileCompareInfoService sarFileCompareInfoService; + + /** + * 分页列表查询 + * + * @param sarFileCompareInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档对比信息表-分页列表查询") + @ApiOperation(value = "文档对比信息表-分页列表查询", notes = "文档对比信息表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(SarFileCompareInfo sarFileCompareInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档对比信息表-列表查询") + @ApiOperation(value = "文档对比信息表-列表查询", notes = "文档对比信息表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = sarFileCompareInfoService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param sarFileCompareInfo + * @return + */ + @AutoLog(value = "文档对比信息表-添加") + @ApiOperation(value = "文档对比信息表-添加", notes = "文档对比信息表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { + sarFileCompareInfoService.add(sarFileCompareInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param sarFileCompareInfo + * @return + */ + @AutoLog(value = "文档对比信息表-编辑") + @ApiOperation(value = "文档对比信息表-编辑", notes = "文档对比信息表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { + sarFileCompareInfoService.editById(sarFileCompareInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "文档对比信息表-通过id删除") + @ApiOperation(value = "文档对比信息表-通过id删除", notes = "文档对比信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + sarFileCompareInfoService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "文档对比信息表-批量删除") + @ApiOperation(value = "文档对比信息表-批量删除", notes = "文档对比信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.sarFileCompareInfoService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "文档对比信息表-通过id查询") + @ApiOperation(value = "文档对比信息表-通过id查询", notes = "文档对比信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + SarFileCompareInfo sarFileCompareInfo = sarFileCompareInfoService.queryById(id); + if (sarFileCompareInfo == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sarFileCompareInfo); + } + + /** + * 导出excel + * + * @param request + * @param sarFileCompareInfo + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SarFileCompareInfo sarFileCompareInfo) { + return super.exportXls(request, sarFileCompareInfo, SarFileCompareInfo.class, "文档对比信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SarFileCompareInfo.class); + } + + + /** + * 发起文档对比 + * + * @param leftStandard + * @param rightStandard + * @param remark + * @return + */ + @AutoLog(value = "发起文档对比") + @ApiOperation(value = "发起文档对比", notes = "发起文档对比") + @RequestMapping(value = "/fullTextComparison", method = RequestMethod.POST) + public Result fullTextComparison(@RequestParam(name = "leftStandard", required = true) String leftStandard, + @RequestParam(name = "rightStandard", required = true) String rightStandard, + @RequestParam(name = "remark", required = true) String remark) { + try { + Map resMap = sarFileCompareInfoService.fullTextComparison(leftStandard, rightStandard, remark); + return Result.OK(resMap); + } catch (Exception ex) { + log.error("发起文档对比失败：" + ex.getMessage()); + return Result.OK("发起文档对比失败!"); + } + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java new file mode 100644 index 000000000..9b0576cf6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java @@ -0,0 +1,170 @@ +package com.jero.modules.compare.controller; + +import java.util.Arrays; +import java.util.List; +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.SarFileCompareItem; +import com.jero.modules.compare.service.ISarFileCompareItemService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 文档对比信息条款表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Api(tags="文档对比信息条款表") +@RestController +@RequestMapping("/compare/sarFileCompareItem") +@Slf4j +public class SarFileCompareItemController extends JeroController { + @Autowired + private ISarFileCompareItemService sarFileCompareItemService; + + /** + * 分页列表查询 + * + * @param sarFileCompareItem + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档对比信息条款表-分页列表查询") + @ApiOperation(value="文档对比信息条款表-分页列表查询", notes="文档对比信息条款表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(SarFileCompareItem sarFileCompareItem, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareItem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sarFileCompareItemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档对比信息条款表-列表查询") + @ApiOperation(value="文档对比信息条款表-列表查询", notes="文档对比信息条款表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = sarFileCompareItemService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param sarFileCompareItem + * @return + */ + @AutoLog(value = "文档对比信息条款表-添加") + @ApiOperation(value="文档对比信息条款表-添加", notes="文档对比信息条款表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { + sarFileCompareItemService.add(sarFileCompareItem); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param sarFileCompareItem + * @return + */ + @AutoLog(value = "文档对比信息条款表-编辑") + @ApiOperation(value="文档对比信息条款表-编辑", notes="文档对比信息条款表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { + sarFileCompareItemService.editById(sarFileCompareItem); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "文档对比信息条款表-通过id删除") + @ApiOperation(value="文档对比信息条款表-通过id删除", notes="文档对比信息条款表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + sarFileCompareItemService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "文档对比信息条款表-批量删除") + @ApiOperation(value="文档对比信息条款表-批量删除", notes="文档对比信息条款表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.sarFileCompareItemService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "文档对比信息条款表-通过id查询") + @ApiOperation(value="文档对比信息条款表-通过id查询", notes="文档对比信息条款表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SarFileCompareItem sarFileCompareItem = sarFileCompareItemService.queryById(id); + if(sarFileCompareItem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sarFileCompareItem); + } + + /** + * 导出excel + * + * @param request + * @param sarFileCompareItem + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SarFileCompareItem sarFileCompareItem) { + return super.exportXls(request, sarFileCompareItem, SarFileCompareItem.class, "文档对比信息条款表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SarFileCompareItem.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java new file mode 100644 index 000000000..fec7f0f57 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java @@ -0,0 +1,129 @@ +package com.jero.modules.compare.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 文档对比信息表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Data +@TableName("sar_file_compare_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sar_file_compare_info对象", description="文档对比信息表") +public class SarFileCompareInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**文档1*/ + @Excel(name = "文档1", width = 15) + @ApiModelProperty(value = "文档1") + private String fileIdLeft; + + /**编号1*/ + @Excel(name = "编号1", width = 15) + @ApiModelProperty(value = "编号1") + private String serialNumberLeft; + + /**标题1*/ + @Excel(name = "标题1", width = 15) + @ApiModelProperty(value = "标题1") + private String titleLeft; + + /**文本状态1*/ + @Excel(name = "文本状态1", width = 15) + @ApiModelProperty(value = "文本状态1") + private String fileTypeLeft; + + /**文件名称1*/ + @Excel(name = "文件名称1", width = 15) + @ApiModelProperty(value = "文件名称1") + private String fileNameLeft; + + /**文档2*/ + @Excel(name = "文档2", width = 15) + @ApiModelProperty(value = "文档2") + private String fileIdRight; + + /**编号2*/ + @Excel(name = "编号2", width = 15) + @ApiModelProperty(value = "编号2") + private String serialNumberRight; + + /**标题2*/ + @Excel(name = "标题2", width = 15) + @ApiModelProperty(value = "标题2") + private String titleRight; + + /**文本状态2*/ + @Excel(name = "文本状态2", width = 15) + @ApiModelProperty(value = "文本状态2") + private String fileTypeRight; + + /**文件名称2*/ + @Excel(name = "文件名称2", width = 15) + @ApiModelProperty(value = "文件名称2") + private String fileNameRight; + + /**发布状态*/ + @Excel(name = "发布状态", width = 15) + @ApiModelProperty(value = "发布状态") + private String releaseState; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + + /**评论*/ + @Excel(name = "评论", width = 15) + @ApiModelProperty(value = "评论") + private String comments; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java new file mode 100644 index 000000000..10717e093 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItem.java @@ -0,0 +1,109 @@ +package com.jero.modules.compare.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 文档对比信息条款表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Data +@TableName("sar_file_compare_item") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sar_file_compare_item对象", description="文档对比信息条款表") +public class SarFileCompareItem implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**文档对比信息id*/ + @Excel(name = "文档对比信息id", width = 15) + @ApiModelProperty(value = "文档对比信息id") + private String infoId; + + /**条款id*/ + @Excel(name = "条款id", width = 15) + @ApiModelProperty(value = "条款id") + private String itemsId; + + /**条款名称*/ + @Excel(name = "条款名称", width = 15) + @ApiModelProperty(value = "条款名称") + private String itemsName; + + /**条款编号*/ + @Excel(name = "条款编号", width = 15) + @ApiModelProperty(value = "条款编号") + private String itemsNum; + + /**条款正文*/ + @Excel(name = "条款正文", width = 15) + @ApiModelProperty(value = "条款正文") + private String itemsText; + + /**条款展示编号*/ + @Excel(name = "条款展示编号", width = 15) + @ApiModelProperty(value = "条款展示编号") + private Integer itemsDisplayNum; + + /**目标位置*/ + @Excel(name = "目标位置", width = 15) + @ApiModelProperty(value = "目标位置") + private Integer targetStand; + + /**条款位置*/ + @Excel(name = "条款位置", width = 15) + @ApiModelProperty(value = "条款位置") + private String leftOrRight; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ValidFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ValidFlagEnum.java new file mode 100644 index 000000000..e807ead1a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ValidFlagEnum.java @@ -0,0 +1,22 @@ +package com.jero.modules.compare.enums; + +public enum ValidFlagEnum { + VALID_TRUE(0, "有效"), VALID_FALSE(1, "无效"); + + private int value; + private String lable; + + private ValidFlagEnum(int value, String lable) { + this.value = value; + this.lable = lable; + } + + public int getValue() { + return value; + } + + public String getLable() { + return lable; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java new file mode 100644 index 000000000..fa41936d1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareInfoMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.compare.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.compare.entity.SarFileCompareInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档对比信息表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface SarFileCompareInfoMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java new file mode 100644 index 000000000..2fabfcce3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/SarFileCompareItemMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.compare.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.compare.entity.SarFileCompareItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档对比信息条款表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface SarFileCompareItemMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml new file mode 100644 index 000000000..829a862dd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml new file mode 100644 index 000000000..fc42d5309 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarFileCompareItemMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java new file mode 100644 index 000000000..ba26736d9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java @@ -0,0 +1,73 @@ +package com.jero.modules.compare.service; + +import com.jero.modules.compare.entity.SarFileCompareInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 文档对比信息表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface ISarFileCompareInfoService extends IService { + + /** + * 保存 + * + * @param sarFileCompareInfo + * @return + */ + void add(SarFileCompareInfo sarFileCompareInfo); + + /** + * 更新 + * + * @param sarFileCompareInfo + * @return + */ + void editById(SarFileCompareInfo sarFileCompareInfo); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + SarFileCompareInfo queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 发起全文对比 + * + * @param leftStandard + * @param rightStandard + * @param remark + * @return + */ + Map fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java new file mode 100644 index 000000000..a925f9f33 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java @@ -0,0 +1,61 @@ +package com.jero.modules.compare.service; + +import com.jero.modules.compare.entity.SarFileCompareItem; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 文档对比信息条款表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface ISarFileCompareItemService extends IService { + + /** + * 保存 + * + * @param sarFileCompareItem + * @return + */ + void add(SarFileCompareItem sarFileCompareItem); + + /** + * 更新 + * + * @param sarFileCompareItem + * @return + */ + void editById(SarFileCompareItem sarFileCompareItem); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + SarFileCompareItem queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java new file mode 100644 index 000000000..a58c31da2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -0,0 +1,348 @@ +package com.jero.modules.compare.service.impl; + +import com.jero.modules.compare.entity.SarFileCompareInfo; +import com.jero.modules.compare.entity.SarFileCompareItem; +import com.jero.modules.compare.enums.ValidFlagEnum; +import com.jero.modules.compare.mapper.SarFileCompareInfoMapper; +import com.jero.modules.compare.service.ISarFileCompareInfoService; +import com.jero.modules.compare.service.ISarFileCompareItemService; +import com.jero.modules.compare.utils.CompHanLPUtils; +import com.jero.modules.compare.utils.treeTool.Tree; +import com.jero.modules.compare.utils.treeTool.TreeNode; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.entity.SarFileSplitMenuEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; +import com.jero.modules.split.service.IFileSplitItemsEOService; +import com.jero.modules.split.service.ISarFileSplitInfoService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; +import com.jero.modules.split.service.ISarFileSplitMenuEOService; +import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 文档对比信息表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Service +public class SarFileCompareInfoServiceImpl extends ServiceImpl implements ISarFileCompareInfoService { + + @Autowired + private ISarFileSplitMenuEOService sarFileSplitMenuEOService; + + @Autowired + private IFileSplitItemsEOService sarFileSplitItemsEOService; + + @Autowired + private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; + + + @Autowired + private ISarFileSplitInfoService sarFileSplitInfoEOService; + + @Autowired + private ISarFileCompareItemService sarFileCompareItemService; + + + /** + * 保存 + * + * @param sarFileCompareInfo + * @return + */ + @Override + public void add(SarFileCompareInfo sarFileCompareInfo) { + Date now = new Date(); + sarFileCompareInfo.setCreateTime(now); + sarFileCompareInfo.setUpdateTime(now); + save(sarFileCompareInfo); + } + + /** + * 更新 + * + * @param sarFileCompareInfo + * @return + */ + @Override + public void editById(SarFileCompareInfo sarFileCompareInfo) { + Date now = new Date(); + sarFileCompareInfo.setUpdateTime(now); + saveOrUpdate(sarFileCompareInfo); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public SarFileCompareInfo queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + + /** + * 全文对比 + * + * @param leftStandard + * @param rightStandard + * @return + * @throws Exception + */ + public Map fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception { + Map resultMap = new HashMap(); + List> leftMapList = fullTextComparePackageData(leftStandard); + List> rightMapList = fullTextComparePackageData(rightStandard); + List> resLeftMapList = null; + List> resRightMapList = null; + if (leftMapList != null && !leftMapList.isEmpty() && rightMapList != null && !rightMapList.isEmpty()) { + //双重循环找到相似度最高的条款做关联 + for (int i = 0; i < leftMapList.size(); i++) { + String leftTxt = leftMapList.get(i).get("itemsText").toString(); + //定义初始化的相似度 + double compareSimilarity = 0.0; + if (!leftTxt.isEmpty()) { + for (int j = 0; j < rightMapList.size(); j++) { + String rightTxt = rightMapList.get(j).get("itemsText").toString(); + double similarity = CompHanLPUtils.findSimilarity(leftTxt.trim(), rightTxt.trim()); + //如果相似度超过0.6 并且该相似度比之前的相似度还高，那么该条款目前相似度最高 + if (similarity >= 0.6 && compareSimilarity < similarity) { + compareSimilarity = similarity; + leftMapList.get(i).put("targetStand", j); + if (rightMapList.get(j).get("targetStand") == null) { + rightMapList.get(j).put("targetStand", i); + } + } + } + } + } + //循环对比结束，开始填充html代码 + resLeftMapList = writeResultHtml(leftMapList); + resultMap.put("resLeftMapList", resLeftMapList); + resRightMapList = writeResultHtml(rightMapList); + resultMap.put("resRightMapList", resRightMapList); + } + //往全文比对历史表中添加数据 + addStandCompareHis(leftStandard, rightStandard, remark, resLeftMapList, resRightMapList); + return resultMap; + } + + /** + * 组装条款数据 + * + * @param standardId + * @return + * @throws Exception + */ + public List> fullTextComparePackageData(String standardId) throws Exception { + List> mapList = new ArrayList>(); + //调用查询条款接口 + SarFileSplitItemsEOPage sarFileSplitItemsEOPage = new SarFileSplitItemsEOPage(); + sarFileSplitItemsEOPage.setInfoId(standardId); + sarFileSplitItemsEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue())); + sarFileSplitItemsEOPage.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + + if (StringUtils.isNotEmpty(sarFileSplitItemsEOPage.getMenuId())) { + List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + Tree tree = new Tree<>(sarFileSplitMenuEOList); + TreeNode treeNode = tree.getTreeNode(sarFileSplitItemsEOPage.getMenuId()); + + List menuIds = new ArrayList<>(); + menuIds.add(treeNode.getNodeId()); + for (TreeNode node : treeNode.getAllChildren()) { + menuIds.add(node.getNodeId()); + } + sarFileSplitItemsEOPage.setMenuIdList(menuIds); + } + + + List itemList = sarFileSplitItemsEOService.queryByList(sarFileSplitItemsEOPage); + if (itemList != null && !itemList.isEmpty()) { + for (SarFileSplitItemsEO sarFileSplitItemsEO : itemList) { + Map map = new HashMap(); + map.put("itemsNum", sarFileSplitItemsEO.getItemsNum()); + map.put("itemsName", sarFileSplitItemsEO.getItemsName()); + map.put("itemsId", sarFileSplitItemsEO.getId()); + //（内容1\n内容2\n格式） + String txt = ""; + //调用条款内容详情表查询条款内容 + SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage(); + sarFileSplitItemsValEOPage.setItemId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsValEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue())); + sarFileSplitItemsValEOPage.setType("TEXT"); + List leftValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); + if (leftValList != null && !leftValList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : leftValList) { + txt += "

" + sarFileSplitItemsValEO.getItemContent() + "

"; + } + } + map.put("itemsText", txt); + map.put("targetStand", null); + map.put("menuId", sarFileSplitItemsEO.getMenuId()); + mapList.add(map); + } + } + return mapList; + } + + /** + * 填充html代码，返回结果 + * + * @param resMapList + * @return + */ + public List> writeResultHtml(List> resMapList) throws Exception { + List> resultMapList = new ArrayList<>(); + for (Map resMap : resMapList) { + Map map = new HashMap<>(); + StringBuilder stringBuilder = new StringBuilder(); + Object itemsNum = resMap.get("itemsNum"); + if (null != itemsNum) { + stringBuilder.append(itemsNum.toString()); + } else { + stringBuilder.append("undefined"); + } + stringBuilder.append(" "); + Object itemsName = resMap.get("itemsName"); + if (null != itemsName) { + stringBuilder.append(itemsName.toString()); + } else { + stringBuilder.append("undefined"); + } + stringBuilder.append("
"); + + Object itemsTxt = resMap.get("itemsTxt"); + if (null != itemsTxt) { + stringBuilder.append(itemsTxt.toString()); + } + stringBuilder.append("
"); + map.put("resultHtml", stringBuilder.toString()); + Object targetStand = resMap.get("targetStand"); + int targetStandInt = 0; + if (null != targetStand) { + targetStand = (Integer) targetStand; + } + map.put("targetStand", targetStand); + Object itemsId = resMap.get("itemsId"); + String itemsIdStr = "undefined"; + if (null != itemsId) { + itemsIdStr = itemsId.toString(); + } + map.put("itemsId", itemsIdStr); + resultMapList.add(map); + } + return resMapList; + } + + /** + * 保存比对历史 + * + * @param leftStandId + * @param rightStandId + * @param remark + * @param resLeftMapList + * @param resRightMapList + * @throws Exception + */ + public void addStandCompareHis(String leftStandId, String rightStandId, String remark, List> resLeftMapList, List> resRightMapList) throws Exception { + SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.queryById(leftStandId); + SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.queryById(rightStandId); + //保存标准比对历史表数据 + SarFileCompareInfo sarFileCompareInfo = new SarFileCompareInfo(); + sarFileCompareInfo.setId(UUID.randomUUID().toString()); + sarFileCompareInfo.setFileIdLeft(leftInfo.getFileId()); + sarFileCompareInfo.setFileNameLeft(leftInfo.getFileName()); + sarFileCompareInfo.setFileTypeLeft(leftInfo.getFileType()); + sarFileCompareInfo.setSerialNumberLeft(leftInfo.getSerialNumber()); + + sarFileCompareInfo.setFileIdRight(rightInfo.getFileId()); + sarFileCompareInfo.setFileNameRight(rightInfo.getFileName()); + sarFileCompareInfo.setFileTypeRight(rightInfo.getFileType()); + sarFileCompareInfo.setSerialNumberRight(rightInfo.getSerialNumber()); + sarFileCompareInfo.setRemark(remark); + this.add(sarFileCompareInfo); + //保存标准的所有条款比对的历史数据 + if (resLeftMapList != null && !resLeftMapList.isEmpty()) { + setStandCompareHisEO(resLeftMapList, sarFileCompareInfo.getId(), "LEFT"); + } + if (resRightMapList != null && !resRightMapList.isEmpty()) { + setStandCompareHisEO(resRightMapList, sarFileCompareInfo.getId(), "RIGHT"); + } + } + + public void setStandCompareHisEO(List> mapList, String id, String leftOrRight) throws Exception { + for (int i = 0; i < mapList.size(); i++) { + SarFileCompareItem sarFileCompareItem = new SarFileCompareItem(); + sarFileCompareItem.setItemsId(id); + sarFileCompareItem.setItemsDisplayNum(i); + sarFileCompareItem.setLeftOrRight(leftOrRight); + Object itemsId = mapList.get(i).get("itemsId"); + if (null != itemsId) { + sarFileCompareItem.setItemsId(itemsId.toString()); + } + Object itemsName = mapList.get(i).get("itemsName"); + if (null != itemsName) { + sarFileCompareItem.setItemsName(itemsName.toString()); + } + Object itemsNum = mapList.get(i).get("itemsNum"); + if (null != itemsNum) { + sarFileCompareItem.setItemsNum(itemsNum.toString()); + } + Object itemsText = mapList.get(i).get("itemsText"); + if (null != itemsText) { + sarFileCompareItem.setItemsText(itemsText.toString()); + } + Object targetStand = mapList.get(i).get("targetStand"); + if (targetStand != null) { + sarFileCompareItem.setTargetStand((int) targetStand); + } + sarFileCompareItemService.add(sarFileCompareItem); + } + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java new file mode 100644 index 000000000..3373dfce7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.compare.service.impl; + +import com.jero.modules.compare.entity.SarFileCompareItem; +import com.jero.modules.compare.mapper.SarFileCompareItemMapper; +import com.jero.modules.compare.service.ISarFileCompareItemService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 文档对比信息条款表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Service +public class SarFileCompareItemServiceImpl extends ServiceImpl implements ISarFileCompareItemService { + + /** + * 保存 + * + * @param sarFileCompareItem + * @return + */ + @Override + public void add(SarFileCompareItem sarFileCompareItem) { + Date now = new Date(); + sarFileCompareItem.setCreateTime(now); + sarFileCompareItem.setUpdateTime(now); + save(sarFileCompareItem); + } + + /** + * 更新 + * + * @param sarFileCompareItem + * @return + */ + @Override + public void editById(SarFileCompareItem sarFileCompareItem) { + Date now = new Date(); + sarFileCompareItem.setUpdateTime(now); + saveOrUpdate(sarFileCompareItem); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public SarFileCompareItem queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java new file mode 100644 index 000000000..e7f52387e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java @@ -0,0 +1,266 @@ +package com.jero.modules.compare.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.extra.tokenizer.Result; +import cn.hutool.extra.tokenizer.TokenizerEngine; +import cn.hutool.extra.tokenizer.TokenizerUtil; +import cn.hutool.extra.tokenizer.Word; +import cn.hutool.extra.tokenizer.engine.hanlp.HanLPEngine; +import cn.hutool.extra.tokenizer.engine.jieba.JiebaEngine; +import com.hankcs.hanlp.HanLP; +import lombok.extern.slf4j.Slf4j; +import org.jsoup.Jsoup; +import org.wltea.analyzer.core.IKSegmenter; +import org.wltea.analyzer.core.Lexeme; + +import java.io.IOException; +import java.io.StringReader; +import java.text.NumberFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Slf4j +public class CompHanLPUtils { + + + /** + * 通过Ik 进行将句子分词 + * + * @param text + * @return + */ + public static Vector participleIk(String text) { + //对输入进行分词 + Vector str = new Vector<>(); + try { + StringReader reader = new StringReader(text); + //当为true时，分词器进行最大词长切分 + IKSegmenter ik = new IKSegmenter(reader, true); + Lexeme lexeme = null; + while ((lexeme = ik.next()) != null) { + str.add(lexeme.getLexemeText()); + } + if (str.size() == 0) { + return null; + } + //分词后 + log.info("str分词后:" + str); + } catch (IOException e) { + log.error(e.getMessage()); + } + return str; + } + + + /** + * 结巴分词 + * + * @param text + * @return + */ + public static Vector participleJieBa(String text) { + JiebaEngine engine = new JiebaEngine(); + Result results = engine.parse(text); + //输出：这 两个 方法 的 区别 在于 返回 值 + String result = CollUtil.join((Iterator) results, ","); + return new Vector<>(Arrays.asList(result.split(","))); + } + + + /** + * 中文分词 + * + * @param text + * @return + */ + public static Vector participleChinese(String text) { + //自动根据用户引入的分词库的jar来自动选择使用的引擎 + TokenizerEngine engine = TokenizerUtil.createEngine(); + //解析文本 + //String text = "这两个方法的区别在于返回值"; + Result results = engine.parse(text); + //输出：这 两个 方法 的 区别 在于 返回 值 + String result = CollUtil.join((Iterator) results, ","); + return new Vector<>(Arrays.asList(result.split(","))); + } + + /** + * 采用 HanLP 进行自定义分词 + */ + public static Vector participleHanLP(String text) { + TokenizerEngine engine = new HanLPEngine(); + //解析文本 + //String text = "这两个方法的区别在于返回值"; + Result results = engine.parse(text); + //输出：这 两个 方法 的 区别 在于 返回 值 + String result = CollUtil.join((Iterator) results, ","); + return new Vector<>(Arrays.asList(result.split(","))); + } + + + /** + * Java利用hanlp完成语句相似度分析 + * + * @param sentenceOne + * @param sentenceTwo + * @return + */ + public static double findSimilarity(String sentenceOne, String sentenceTwo) { + List sentOneWords = getSplitWords(sentenceOne); + List sentTwoWords = getSplitWords(sentenceTwo); + List allWords = mergeList(sentOneWords, sentTwoWords); + int[] statisticOne = statistic(allWords, sentOneWords); + int[] statisticTwo = statistic(allWords, sentTwoWords); + double dividend = 0; + double divisor1 = 0; + double divisor2 = 0; + int length = statisticOne.length; + for (int i = 0; i < length; i++) { + dividend += statisticOne[i] * statisticTwo[i]; + divisor1 += Math.pow(statisticOne[i], 2); + divisor2 += Math.pow(statisticTwo[i], 2); + } + return dividend / (Math.sqrt(divisor1) * Math.sqrt(divisor2)); + } + + + private static int[] statistic(List allWords, List sentWords) { + int[] result = new int[allWords.size()]; + int size = allWords.size(); + for (int i = 0; i < size; i++) { + result[i] = Collections.frequency(sentWords, allWords.get(i)); + } + return result; + } + + + /** + * 去重 + * + * @param listOne + * @param listTwo + * @return + */ + private static List mergeList(List listOne, List listTwo) { + List result = new ArrayList<>(); + result.addAll(listOne); + result.addAll(listTwo); + return result.stream().distinct().collect(Collectors.toList()); + } + + + /** + * 过滤标签 + * + * @param sentence + * @return + */ + private static List getSplitWords(String sentence) { + // 去除掉html标签 + sentence = Jsoup.parse(sentence.replace(" ", "")).body().text(); + // 标点符号会被单独分为一个Term，去除之 + return HanLP.segment(sentence).stream().map(a -> a.word).filter(s -> !"`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？ ".contains(s)).collect(Collectors.toList()); + } + + + public static void main(String[] args) { + String str1 = "6转向系\n" + + "6.1汽车（三轮汽车除外）的方向盘应设置于左侧，其他机动车的方向盘不得设置于右侧；专项作业车、教练车按需要可设置左右两个方向盘。有驾驶室的正三轮摩托车如使用方向盘转向，则方向盘中心立柱距车辆纵向中心平面的水平距离应小于等于200 mm;其他摩托车不得使用方向盘转向。\n" + + "6.2机动车的方向盘（或方向把）应转动灵活，操纵方便，无卡滞现象。机动车应设置转向限位装置。转向系统在任何操作位置上，不得与其他部件有干涉现象。\n" + + "6.3机动车（摩托车、三轮汽车、手扶拖拉机运输机组除外）正常行驶时，转向轮转向后应有一定的回正能力（允许有残余角），以使机动车具有稳定的直线行驶能力。\n" + + "6.4机动车方向盘的最大自由转动量应小于或等于：\n" + + "a) 最大设计车速大于或等于100 km/h 的机动车：15°\n" + + "b) 三轮汽车：35°；\n" + + "c) 其他机动车：25° 。\n" + + "6.5汽车（三轮汽车除外）应具有适度的不足转向特性。\n" + + "6.6三轮汽车、摩托车的转向轮向左或向右转角应小于等于：\n" + + "a）\t三轮汽车、三轮摩托车、正三轮轻便摩托车:45°;\n" + + "6）\t\t两轮普通摩托车、两轮轻便摩托车:48°。\n" + + "6.6机动车在平坦、硬实、干燥和清洁的道路上行驶不应跑偏，其方向盘（或方向把）不应有摆振、路感不灵或其他异常现象。\n" + + "6.8机动车在平坦、硬实、干燥和清洁的水泥或沥青道路上行驶，以10 km/h的速度在5 s之内沿螺旋线从直线行驶过渡到外圆直径为25 m的车辆通道圆行驶，施加于方向盘外缘的最大切向力应小于等于245 N。\n" + + "6.9专用校车应采用转向助力装置;其他机动车转向轴最大设计轴荷大于4 000 kg时，也应采用转向助力装置。装有转向助力装置的机动车，转向时其转向助力功能不得出现时有时无的现象，且转向助力装置失效时仍应具有用方向盘控制机动车的能力。装有电动转向助力装置的汽车，在产品使用说明书规定的正常使用状态下，应保证转向助力装置的电能供应。\n" + + "6.10汽车和汽车列车（不计具有作业功能的专用装置的突出部分）、轮式拖拉机运输机组应能在同一个车辆通道圆内通过，车辆通道圆的外圆直径认为25.00 m，车辆通道圆的内圆直径D2为10.60 m。 汽车和汽车列车、轮式拖拉机运输机组由直线行驶过渡到上述圆周运动时，任何部分超出直线行驶时的 车辆外侧面垂直面的值（外摆值）应小于等于0.80 m（对铰接客车和铰接式无轨电车外摆值应小于等于 1.20 m），其试验方法见GB 1589。\n" + + "6.11汽车（三轮汽车除外）的车轮定位应与该车型的技术要求一致。对前轴采用非独立悬架的汽车（前轴采用双转向轴时除外），其转向轮的横向侧滑量，用侧滑台检验时侧滑量值应在±5 m/km之间。\n" + + "6.12转向节及臂，转向横、直拉杆及球销不得有裂纹和损伤，并且转向球销不应松旷。对机动车进行改装或修理时横、直拉杆不得拼焊。\n" + + "6.13三轮汽车、摩托车的前减振器、上下联板和方向把不应有变形和裂损。\n"; + String str2 = "6转向系\n" + + "6.1汽车（三轮汽车除外）的方向盘应设置于左侧，其他机动车的方向盘不应设置于右侧；专项作业车、教练车按需要可设置左右两个方向盘。装有两个后轮、有驾驶室的正三轮摩托车如使用方向盘转向，则方向盘中心立柱距车辆纵向中心平面的水平距离应小于或等于200 mm ；其他摩托车不应使用方向盘转向。\n" + + "6.2机动车的方向盘（或方向把）应转动灵活，无卡滞现象。机动车应设置转向限位装置。转向系统在任何操作位置上，不应与其他部件有干涉现象。\n" + + "6.3机动车（摩托车、三轮汽车、手扶拖拉机运输机组除外〉正常行驶时，转向轮转向后应有一定的回正能力（允许有残余角），以使机动车具有稳定的直线行驶能力0\n" + + "6.4机动车方向盘的最大自由转动量应小于或等于：\n" + + "a) 最大设计车速大于或等于100 km/h 的机动车：15°\n" + + "b) 三轮汽车：35°；\n" + + "c) 其他机动车：25° 。\n" + + "6.5汽车（三轮汽车除外）应具有适度的不足转向特性。\n" + + "6.6三轮汽车、摩托车的转向轮向左或向右转角应小于或等于：\n" + + "a) 三轮汽车、三轮摩托车、正三轮轻便摩托车：45°；\n" + + "b）两轮普通摩托车、两轮轻便摩托车：48°0\n" + + "6.7机动车在平坦、硬实、干燥和清洁的道路上行驶不应跑偏，其方向盘（或方向把）不应有摆振等异常现象。\n" + + "6.8机动车在平坦、硬实、干燥和清洁的水泥或沥青道路上行驶，以10 km/h 的速度在5 s 之内沿螺旋线从直线行驶过渡到外圆直径为25m 的车辆通道圆行驶，施加于方向盘外缘的最大切向力应小于或等于245 N。\n" + + "6.9汽车（三轮汽车除外）的车轮定位应与该车型的技术要求一致。对前轴采用非独立悬架的汽车（前轴采用双转向轴时除外），其转向轮的横向侧滑量，用侧滑台检验时侧滑量值应小于或等于5 m/km。\n" + + "6.10 专用校车应采用转向助力装置；其他机动车转向轴最大设计轴荷大于4 000 kg 时，也应采用转向助力装置。装有转向助力装置的机动车，转向时其转向助力功能不应出现时有时无的现象，且转向助力装置失效时仍应具有用方向盘控制机动车的能力。\n" + + "6.11转向节及臂，转向横、直拉杆及球销应连接可靠，且不应有裂纹和损伤，并且转向球销不应松旷。对机动车进行改装或修理时横、直拉杆不应拼焊。\n" + + "6.12三轮汽车、摩托车的前减振器、上下联板和方向把不应有变形和裂损。"; + String str3 = "\n" + + "5车辆识别代号的标示位置\n" + + "5.1每辆车辆都应具有唯一的车辆识别代号，并永久保持地标示在车辆上，同一车辆上标示的所有的 车辆识别代号的字码构成与排列顺序应相同。除第9章规定的情况外，不得对已标示的车辆识别代号 进行变更。\n" + + "5.2车辆应在产品标牌上标示车辆识别代号（L1、L3类车辆可除外），产品标牌的型式、标示位置、标示要求应符合GB/T 18411的规定。\n" + + "5.3车辆应至少有一个车辆识别代号直接打刻在车架（无车架的车辆为车身主要承载且不能拆卸的部件）能防止锈烛、磨损的部位上。其中：\n" + + "a）\tM1类车辆的车辆识别代号应打刻在发动机舱内能防止替换的车辆结构件上，或打刻在车门 立柱上，如受结构限制没有打刻空间时也可打刻在右侧除行李舱外的车辆其他结构件上；\n" + + "b）\t最大设计总质量大于或等于12000 kg的货车及所有牵引杆挂车，车辆识别代号应打刻在右前轮纵向中心线前端纵梁外侧，如受结构限制也可打刻在右前轮纵向中心线附近纵梁外侧；\n" + + "c）\t半挂车和中置轴挂车的车辆识别代号应打刻在右前支腿前端纵梁外侧（无纵梁车辆除外）；\n" + + "d）\t其他汽车和无纵梁挂车的车辆识别代号应打刻在车辆右侧前部的车辆结构件上，如受结构限 制也可打刻在右侧其他车辆结构件上。\n" + + "打刻车辆识别代号的部件不应采用打磨、挖补、垫片、凿改、重新涂漆（设计和制造上为保护打刻的 车辆识别代号而采取涂漆工艺的情形除外）等方式处理，从上（前）方观察时，打刻区域周边足够大面积 的表面不应有任何覆盖物，如有覆盖物，该覆盖物的表面应明确标示“车辆识别代号”或“VIN”字样，且覆盖物在不使用任何专用工具的情况下能直接取下（或揭开）及复原，以方便地观察到足够大的包括打刻区域的表面。\n" + + "注1：打刻区域周边足够大面积的表面（足够大的包括打刻区域的表面）是指打刻车辆识别代号的部件的全部表面，但所暴露表面能满足查看打刻车辆识别代号的部件有无挖补、重新焊接、粘贴等痕迹的需要时，也应视为满足要求。\n" + + "注2：对摩托车，打刻的车辆识别代号在不举升车辆的情形下可观察、拓印的，视为满足要求。\n" + + "打刻的车辆识别代号从上（前）方应易于观察、拓印，对于汽车和挂车还应能拍照。\n" + + "5.4具有电子控制单元的汽车，其至少有一个电子控制单元应不可篡改地存储车辆识别代号。\n" + + "5.5 M1、N1类车辆应在靠近风窗立柱的位置标示车辆识别代号，该车辆识别代号在白天不需移动任何部件从车外即能清晰识读。\n" + + "5.6除按照5.2、5.3、5.4、5.5规定标示车辆识别代号之外，类车辆还应在行李舱的易见部位标示车辆识别代号；且若车辆制造厂选取车辆识别代号作为车辆及部件识别标记的标识信息，还应按照GB 30509的规定，标示车辆识别代号。\n" + + "5.7除按照5.2、5.3、5.4规定标示车辆识别代号之外，最大设计总质量大于或等于12000 kg的栏板式、仓栅式、自卸式、罐式货车及最大设计总质量大于或等于10000 kg的栏板式、仓栅式、自卸式、罐式挂车还应在其货箱或常压罐体（或设计和制造上固定在货箱或常压罐体上且用于与车架连接的结构件）上打刻至少两个车辆识别代号。打刻的车辆识别代号应位于货箱（常压罐体）左、右两侧或前端面且易于拍照；且若打刻在货箱（常压罐体）左、右两侧时，打刻的车辆识别代号距货箱（常压罐体）前端面的距离应小于或等于1 000 mm，若打刻在左、右两侧连接结构件时应尽量靠近货箱（常压罐体）前端面。\n" + + "5.8车辆制造厂应至少在一种随车文件中标示车辆识别代号。"; + + String str4 = "\n" + + "5.3车辆的驱动\n" + + "5.3.1车辆不应靠自身动力驱动。\n" + + "5.3.2在碰撞瞬间，车辆应不冉承受任何附加转向或驱动装置的作用。\n" + + "5.3.3车辆到达壁障的路线在横向任一方向偏离理论轨迹均不应超过150 mm。\n" + + "5.4 试验速度\n" + + "在碰撞瞬间，车辆速度应为504 km/h。如果试验在更高的碰撞速度下进行并且车辆符合要求，也认为试验合格。\n" + + "5.5对前排座椅假人的测量\n" + + "5.5.1为确定性能指标必需的所有测量，均应采用符合附录D要求的测量系统。\n" + + "5.5.2不同的参数应通过具备下列CFC（通道的频率等级）的独立数据通道来记录。\n" + + "5.5.2.1对假人头部的测量\n" + + "重心处的加速度（a）由加速度的二维分量计算得出。加速度分量测量时，CFC为1000。\n" + + "5.5.2.2对假人颈部的测量\n" + + "5.5.2.2.1在头颈连接处测量的轴向张力和前后剪切力，CFC为1000。\n" + + "5.5.2.2.2在头颈连接处测量的对Y轴的弯矩，CFC为600。\n" + + "5.5.2.3对假人胸部的测量\n" + + "胸部变形测量时，CFC为180。\n" + + "5.5.2.4对假人大腿的测量\n" + + "轴向压缩力测量时，CFC为600。"; + + + double similarity = CompHanLPUtils.findSimilarity(str1, str2); + NumberFormat nf = NumberFormat.getPercentInstance(); + nf.setMaximumIntegerDigits(2);//小数点前保留几位 + nf.setMinimumFractionDigits(2);// 小数点后保留几位 + String similarityDegree = nf.format(similarity); + System.out.println(similarityDegree); + System.out.println("======================================================"); + double similarity1 = CompHanLPUtils.findSimilarity(str1, str3); + System.out.println(similarity1); + + System.out.println("======================================================"); + double similarity2 = CompHanLPUtils.findSimilarity(str1, str4); + System.out.println(similarity2); + + + System.out.println("======================================================"); + double similarity3 = CompHanLPUtils.findSimilarity(str3, str4); + System.out.println(similarity3); + + } + +} + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/OrdNamComparator.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/OrdNamComparator.java new file mode 100644 index 000000000..af0892b92 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/OrdNamComparator.java @@ -0,0 +1,21 @@ +package com.jero.modules.compare.utils.treeTool; + +import java.util.Comparator; + +/** + * List 排序 Comparator + * @author david + */ +public class OrdNamComparator implements Comparator { + + @Override + public int compare(TreeNode t1, TreeNode t2) { + if (t1.getOrderNum() > t2.getOrderNum()) { + return 1; + } + if (t1.getOrderNum() < t2.getOrderNum()) { + return -1; + } + return t1.getNodeName().compareTo(t2.getNodeName()); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/Tree.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/Tree.java new file mode 100644 index 000000000..cac186979 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/Tree.java @@ -0,0 +1,174 @@ +package com.jero.modules.compare.utils.treeTool; + +import com.jero.modules.compare.utils.treeTool.annotation.*; +import org.apache.commons.lang3.StringUtils; + +import java.lang.reflect.Field; +import java.util.*; + +/** + * 构建树形建构 + * + * @author David + */ +public class Tree { + /** + * 用于存放treeNode的Map + */ + private LinkedHashMap treeNodesMap = new LinkedHashMap<>(); + /** + * 用于存放treeNode的list + */ + private List treeNodesList = new ArrayList<>(); + + /** + * 构造方法 + * + * @param list + */ + public Tree(List list) { + initTreeNodeMap(list); + initTreeNodeList(); + } + + /** + * 将List对象数据转为TreeNodeMap + * + * @param list + */ + private void initTreeNodeMap(List list) { + TreeNode treeNode; + for (Object item : list) { + treeNode = new TreeNode(); + treeNode.setNodeId(getFieldValue(item, "TreeNodeId")); + treeNode.setNodeName(getFieldValue(item, "TreeNodeName")); + treeNode.setParentNodeId(getFieldValue(item, "TreeNodeParentId")); + if(StringUtils.isEmpty(getFieldValue(item, "TreeNodeLevel"))) { + treeNode.setLevel(0); + } else { + treeNode.setLevel(Integer.parseInt(getFieldValue(item, "TreeNodeLevel"))); + } + if(StringUtils.isEmpty(getFieldValue(item, "TreeNodeOrder"))) { + treeNode.setOrderNum(0); + } else { + treeNode.setOrderNum(Integer.parseInt(getFieldValue(item, "TreeNodeOrder"))); + } + treeNode.setLastNodeNum(1); + treeNode.setData(item); + treeNodesMap.put(treeNode.getNodeId(), treeNode); + } + Iterator iterator = treeNodesMap.values().iterator(); + TreeNode parentTreeNode; + while (iterator.hasNext()) { + treeNode = iterator.next(); + if (StringUtils.isEmpty(treeNode.getParentNodeId())) { + continue; + } + parentTreeNode = treeNodesMap.get(treeNode.getParentNodeId()); + if (parentTreeNode != null) { + treeNode.setParent(parentTreeNode); + parentTreeNode.addChild(treeNode); + // 按照orderNum排序 + Collections.sort(parentTreeNode.getChildren(), new OrdNamComparator()); + // 判断这个节点是否是最子节点 + if (treeNode.getChildren().size() == 0) { + treeNode.setLastNode(true); + } + // 计算每一个节点的最子节点的数量 + List children = parentTreeNode.getChildren(); + if (children.size() > 0) { + int sum = 0; + for (TreeNode treeNode2 : children) { + sum += treeNode2.getLastNodeNum(); + } + parentTreeNode.setLastNodeNum(sum); + } + } + } + } + + private String getFieldValue(Object obj, String type) { + Class clz = obj.getClass(); + Field[] fields = clz.getDeclaredFields(); + String value = null; + try { + for(Field field : fields){ + field.setAccessible(true); + switch (type){ + case "TreeNodeId": + if(field.isAnnotationPresent(TreeNodeId.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeParentId": + if(field.isAnnotationPresent(TreeNodeParentId.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeName": + if(field.isAnnotationPresent(TreeNodeName.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeOrder": + if(field.isAnnotationPresent(TreeNodeOrder.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeLevel": + if(field.isAnnotationPresent(TreeNodeLevel.class)) { + value = String.valueOf(field.get(obj)); + } + break; + default: + break; + } + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return value; + } + + /** + * 根据treeNodesMap转为treeNodesList + */ + private void initTreeNodeList() { + if (treeNodesList.size() > 0) { + return; + } + if (treeNodesMap.size() == 0) { + return; + } + Iterator iterator = treeNodesMap.values().iterator(); + TreeNode treeNode; + while (iterator.hasNext()) { + treeNode = iterator.next(); + if (treeNode.getParent() == null) { + this.treeNodesList.add(treeNode); + this.treeNodesList.addAll(treeNode.getAllChildren()); + } + } + } + + public List getTree() { + return this.treeNodesList; + } + + public List getRoot() { + List rootList = new ArrayList<>(); + if (this.treeNodesList.size() > 0) { + for (TreeNode node : treeNodesList) { + if (node.getParent() == null) { + rootList.add(node); + Collections.sort(rootList, new OrdNamComparator()); + } + } + } + return rootList; + } + + public TreeNode getTreeNode(String nodeId) { + return this.treeNodesMap.get(nodeId); + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/TreeNode.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/TreeNode.java new file mode 100644 index 000000000..f0d9c5e24 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/TreeNode.java @@ -0,0 +1,202 @@ +package com.jero.modules.compare.utils.treeTool; + +import com.alibaba.fastjson.annotation.JSONField; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author David + */ +public class TreeNode { + + /** + * 树节点ID + */ + @JSONField(ordinal = 1) + private String nodeId; + /** + * 树节点名称 + */ + @JSONField(ordinal = 2) + private String nodeName; + /** + * 父节点ID + */ + @JSONField(ordinal = 3) + private String parentNodeId; + /** + * 节点在树中的排序号 + */ + @JSONField(ordinal = 4) + private int orderNum; + /** + * 节点所在的层级 + */ + @JSONField(ordinal = 5) + private int level; + /** + * 最子节点的数量 + */ + @JSONField(ordinal = 6) + private int lastNodeNum; + + /** + * 是否是最子节点 + */ + @JSONField(ordinal = 7) + private boolean lastNode; + + private Object data; + + /** + * 当前节点的儿子节点 + */ + @JSONField(ordinal = 8) + private List children = new ArrayList<>(); + + /** + * 当前节点的完整路径 + */ + @JSONField(ordinal = 9) + private String completeName; + + /** + * 当前节点的父级节点 + * 转json的时候忽略此属性，因为此属性到前端无作用 + */ + @JSONField(serialize = false) + private TreeNode parent; + + /** + * 当前节点的子孙节点 + * 转json的时候忽略此属性，因为此属性到前端无作用 + */ + @JSONField(serialize = false) + private List allChildren = new ArrayList<>(); + + private int standFlag; + + public TreeNode(TreeNode obj) { + this.orderNum = obj.getOrderNum(); + this.level = obj.getLevel(); + this.lastNodeNum = obj.getLastNodeNum(); + } + + public TreeNode() { + } + + public void addChild(TreeNode treeNode) { + this.children.add(treeNode); + } + + public void removeChild(TreeNode treeNode) { + this.children.remove(treeNode); + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getNodeName() { + return nodeName; + } + + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + public String getParentNodeId() { + return parentNodeId; + } + + public void setParentNodeId(String parentNodeId) { + this.parentNodeId = parentNodeId; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + public TreeNode getParent() { + return parent; + } + + public void setParent(TreeNode parent) { + this.parent = parent; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public int getOrderNum() { + return orderNum; + } + + public void setOrderNum(int orderNum) { + this.orderNum = orderNum; + } + + public int getLastNodeNum() { + return lastNodeNum; + } + + public void setLastNodeNum(int lastNodeNum) { + this.lastNodeNum = lastNodeNum; + } + + public boolean isLastNode() { + return lastNode; + } + + public void setLastNode(boolean lastNode) { + this.lastNode = lastNode; + } + + public List getAllChildren() { + if (this.allChildren.isEmpty()) { + for (TreeNode treeNode : this.children) { + this.allChildren.add(treeNode); + this.allChildren.addAll(treeNode.getAllChildren()); + } + } + return this.allChildren; + } + + public String getCompleteName() { + return completeName; + } + + public void setCompleteName(String completeName) { + this.completeName = completeName; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + public int getStandFlag() { + return standFlag; + } + + public void setStandFlag(int standFlag) { + this.standFlag = standFlag; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeId.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeId.java new file mode 100644 index 000000000..97a74f827 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeId.java @@ -0,0 +1,12 @@ +package com.jero.modules.compare.utils.treeTool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeId { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeLevel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeLevel.java new file mode 100644 index 000000000..474dfbcf6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeLevel.java @@ -0,0 +1,12 @@ +package com.jero.modules.compare.utils.treeTool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeLevel { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeName.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeName.java new file mode 100644 index 000000000..a64708d22 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeName.java @@ -0,0 +1,12 @@ +package com.jero.modules.compare.utils.treeTool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeName { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeOrder.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeOrder.java new file mode 100644 index 000000000..a0fb69bc0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeOrder.java @@ -0,0 +1,12 @@ +package com.jero.modules.compare.utils.treeTool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeOrder { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeParentId.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeParentId.java new file mode 100644 index 000000000..9a52c5be0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/treeTool/annotation/TreeNodeParentId.java @@ -0,0 +1,12 @@ +package com.jero.modules.compare.utils.treeTool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeParentId { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java index ec36b56fc..a82b7511b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java @@ -3,6 +3,7 @@ package com.jero.modules.split.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -65,4 +66,6 @@ public interface FileSplitItemsEOMapper extends BaseMapper int deleteByMenuIds(@Param("idList") List idList); int insertForeach(List list); + + List queryByList(SarFileSplitItemsEOPage page); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index f7a7a8ec6..29a65a59f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -118,4 +118,21 @@ + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java index ad2efd4c1..871ebcff5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java @@ -63,6 +63,7 @@ public class SarFileSplitItemsEOPage extends BasePage { private String modifyUserOperator = "="; private String sMenuId; private List idList; + private List menuIdList; private int tableIndex = 1; private int imgIndex = 1; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java index 4a9c3bddc..b16caa11d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java @@ -83,4 +83,6 @@ public interface IFileSplitItemsEOService extends IService int insertForeach(List messageList); // 拆分已入库文件专用 List> getHeader(String flag, String cut); + + List queryByList(SarFileSplitItemsEOPage page); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 8fae259fd..132bc2a02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3731,4 +3731,15 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl queryByList(SarFileSplitItemsEOPage page){ + return dao.queryByList(page); + } + } From 5d9d66da3b1633cbaa8b9d5c7e02c267fa3fadb1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 2 Aug 2022 17:06:04 +0800 Subject: [PATCH 31/53] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 12 ++-- .../components/modules/releaseStandard.vue | 58 +++++++++++-------- .../components/modules/solicitOpinions.vue | 52 ++++++++++------- 3 files changed, 69 insertions(+), 53 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index f8b17a2ce..23ffd3f15 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -10,7 +10,7 @@
@@ -24,7 +24,7 @@
@@ -128,7 +128,7 @@
@@ -158,7 +158,7 @@
@@ -172,7 +172,7 @@
@@ -267,7 +267,7 @@
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue index afea487f4..8fe91d578 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue @@ -1,15 +1,15 @@ @@ -85,4 +218,132 @@ } } } + + .box-text { + display: flex; + justify-content: space-between; + height: 60px; + line-height: 40px; + + .header-text { + font-size: 16px; + font-weight: 400; + color: #000F16; + } + } + + .content-text { + width: 100%; + display: flex; + flex-wrap: wrap; + + .text-field { + width: 33%; + margin-bottom: 8px; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + margin-top: 10px; + } + } + } + + .content { + font-size: 16px; + color: #040B29; + font-weight: 400; + } + + .content-icon { + height: 40px; + line-height: 40px; + font-size: 16px; + color: #040B29; + font-weight: 400; + text-align: right; + margin-top: 20px; + } + + .content-icon-text { + display: inline-block; + padding: 0 20px; + cursor: pointer; + line-height: 40px; + } + + .content-icon-text .icon { + font-size: 24px; + color: #3b4249 !important; + } + + .content-icon-text span { + display: inline-block; + margin-left: 4px; + } + + .box-title-text { + line-height: 1.4; + display: flex; + /*align-items: center;*/ + } + + .title-text { + width: 88px; + text-align: right; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 48px; + color: #000F16; + } + + .box-input { + display: inline-block; + height: 38px; + width: 100%; + } + + .itemModel { + width: 100%; + display: inline-block; + margin-top: 2px; + margin-bottom: 12px; + } + + .content-button { + text-align: right; + } + + .header-btn { + height: 38px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index cdf207ef6..c229dafa3 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -27,7 +27,7 @@
-
+
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index c12ecab81..bdcd92593 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -324,6 +324,7 @@ if (res.success) { this.loading = false this.$message.success(this.$t('OperationSuccessful')) + } else { this.loading = false this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 246dcc425..392dad7b4 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -26,19 +26,10 @@
{{$t('releaseSituation')}}
- - - - {{ item.name }} - - - +
From c18bff110bf30317afc635ece4f259d21a6bbb48 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 14:18:37 +0800 Subject: [PATCH 40/53] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/layouts/TabLayout.vue | 2 + jero-web/src/config/router.config.js | 10 + .../components/countryCardList.vue | 234 +++++++++++++++++- .../components/countryCardRelease.vue | 87 +++++++ .../components/countryCardView.vue | 87 +++++++ 7 files changed, 420 insertions(+), 2 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index deb708f55..708ff3cea 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1225,4 +1225,5 @@ module.exports = { personCharge:'Person in charge', addLabel:'Add Label', editLabel:'Edit Label', + applicableMarket:'Applicable market', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e3ce4ee27..e537f5564 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1328,4 +1328,5 @@ module.exports = { personCharge:'负责人', addLabel:'新增标签', editLabel:'编辑标签', + applicableMarket:'适用市场', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index eab0ee130..33deedcc6 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -92,6 +92,8 @@ this.$route.path == '/virtualListDetails' || this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || + this.$route.path == '/countryCardRelease' || + this.$route.path == '/countryCardView' || this.$route.path == '/problemKnowledgeBaseAdd' || this.$route.path == '/problemKnowledgeBaseRelease' || this.$route.path == '/problemKnowledgeBaseView' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 0ddd91599..e425791de 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -367,6 +367,16 @@ export const constantRouterMap = [ name: 'problemKnowledgeBaseRelease', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease') }, + { + path: '/countryCardView', + name: 'countryCardView', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/countryCardView') + }, + { + path: '/countryCardRelease', + name: 'countryCardRelease', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/countryCardRelease') + }, { path: '/problemKnowledgeBaseView', name: 'problemKnowledgeBaseView', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index af3faab72..cd7fc3755 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -1,13 +1,243 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue new file mode 100644 index 000000000..a4c3a577c --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue new file mode 100644 index 000000000..746eecdc3 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file From feb2c9137b22ebe9f85bf194f8c48529e0707b25 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 3 Aug 2022 14:53:51 +0800 Subject: [PATCH 41/53] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-nio=E7=BC=96=E5=8F=B7=E6=A0=BC=E5=BC=8F=E9=99=90?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9-=E5=8F=96=E6=B6=88=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index eca22b3fb..8648bb5b7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Wed, 3 Aug 2022 14:59:56 +0800 Subject: [PATCH 42/53] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E6=8B=89=E9=80=89-=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=90=AF=E7=94=A8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ParamsReportDetailEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 7810e4dd3..2ca1a4003 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.report.entity.*; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.*; @@ -674,7 +675,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> getTemplateLabelList() { // 查询所有导出模板 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime); + queryWrapper.eq(ParamsExportTemplateEO::getState, ExportTemplateStateEnum.ENABLE.getValue()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); List paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper); List> templateLabelList = new ArrayList<>(); From 7ae3d108dc3c697533eaae3794110407c46daacf Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 15:34:28 +0800 Subject: [PATCH 43/53] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../classificationMaintenanceAdd.vue | 2 +- .../components/countryCardRelease.vue | 293 +++++++++++++++++- .../components/countryCardReleaseModel.vue | 210 +++++++++++++ .../components/countryCardReleaseModelAdd.vue | 256 +++++++++++++++ .../components/countryCardView.vue | 1 + .../components/problemKnowledgeBaseView.vue | 1 + 8 files changed, 768 insertions(+), 3 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 708ff3cea..935e965bb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1226,4 +1226,8 @@ module.exports = { addLabel:'Add Label', editLabel:'Edit Label', applicableMarket:'Applicable market', + templateMaintenance:'Template maintenance', + associatedWebsite:'Associated website', + dropDownOptions:'Drop down options', + dropDownOptionMaintenance:'Drop down option maintenance', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e537f5564..132493ef4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1329,4 +1329,8 @@ module.exports = { addLabel:'新增标签', editLabel:'编辑标签', applicableMarket:'适用市场', + templateMaintenance:'模板维护', + associatedWebsite:'关联网址', + dropDownOptions:'下拉选项', + dropDownOptionMaintenance:'下拉选项维护', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue index e86ce4846..5efb6b6bd 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -48,7 +48,7 @@ @@ -84,4 +310,67 @@ } } } + + .page { + text-align: right; + margin-top: 20px; + } + + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; + } + + .title-text { + width: 20%; + min-width: 110px; + color: #000F16; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + /*margin-top: 2px;*/ + } + + .box-content-right { + width: 100%; + text-align: right; + margin-top: 20px; + margin-bottom: 20px; + } + + .operator-text { + cursor: pointer; + margin-right: 53px; + font-size: 14px; + font-weight: 400; + color: #040B29; + display: inline-block; + } + + .operator-text:last-child { + margin-right: 13px; + } + + .text-operation { + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue new file mode 100644 index 000000000..986380fcd --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue @@ -0,0 +1,210 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue new file mode 100644 index 000000000..a4e39ccb8 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue @@ -0,0 +1,256 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 746eecdc3..75be6e28d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -18,6 +18,7 @@ + + diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 1b353803e..cd59122b3 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -1,36 +1,36 @@ @@ -159,6 +165,7 @@ export default { columns:[], selectedRowKeys: [], formInline: {}, + textLoading:false, url: { tableHeader: 'report/detail/getHeader', tableList: 'report/detail/list', @@ -286,6 +293,58 @@ export default { this.formInline[value] = id this.formInline = { ...this.formInline } }, + // 保存 + handlePreservation(num) { + let _this = this + let postDate = [] + let data = JSON.parse(JSON.stringify(this.dataSource)) + let selectedRowKeysValue = [] + data.forEach(res => { + selectedRowKeysValue.push(res) + }) + console.log(selectedRowKeysValue) + for (let i = 0; i < selectedRowKeysValue.length; i++) { + let postDateobj = {} + let itemIn = Object.keys(selectedRowKeysValue[i]) + console.log(itemIn) + for (let j = 0; j < itemIn.length; j++) { + if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + // console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + // } + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // } + // } + } + } + } + postDateobj.id = selectedRowKeysValue[i].id + postDate.push(postDateobj) + } + let configDataList = { configDataList: postDate } + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + this.textLoading = true + let query = { + ...configDataList, + paramsManifestId: this.$route.query.id + } + postAction('/report/detail/save', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + this.textLoading = false + } else { + _this.$message.warning(_this.$t('operationFailed')) + this.textLoading = false + } + }) + } else { + } + }, getTableList() { // console.log('this.searchParmestable',this.searchParmes) let pageNo = JSON.parse(JSON.stringify(this.pageNo)) @@ -319,70 +378,6 @@ export default { getDataSource(data) { this.dataSource = data }, - handlePreservation(num) { - let _this = this - let postDate = [] - let data = JSON.parse(JSON.stringify(this.dataSource)) - let selectedRowKeysValue = [] - data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写') { - selectedRowKeysValue.push(res) - } - }) - for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt') { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - } - } - } - } - } - postDateobj.id = selectedRowKeysValue[i].id - postDate.push(postDateobj) - } - let configDataList = { configDataList: postDate } - if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { - if (num && num == 1) { - this.textLoading = true - } - let query = { - ...configDataList, - paramsManifestId: this.paramsManifest.id - } - postAction('/params/collectManifest/save', query).then((res) => { - if (res.success) { - if (num && num == 1) { - _this.$message.success(_this.$t('OperationSuccessful')) - this.textLoading = false - } - setTimeout(() => { - if (this.currentPersonRole == 'dre') { - this.handlePreservation() - } - }, 10000) - } else { - if (num && num == 1) { - _this.$message.warning(_this.$t('operationFailed')) - this.textLoading = false - } - } - }) - } else { - if (num && num == 1) { - this.$message.warning(this.$t('theCurrentListSaved')) - } - } - }, LoginUserType(val, currentPersonRole, userType) { this.RoleType = [] if (this.currentPersonRole == '') { diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index c3bf52f65..046e8655d 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -376,7 +376,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, { - pattern: /^[0-9a-zA-Z-/. ]{1,}$/, + pattern: /^[0-9a-zA-Z-/ ]{1,}$/, message: this.$t('onlyThree'), trigger: 'blur' } From 67c3b9d28a31c82df080e8ee4bb260e77074e97c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 16:46:57 +0800 Subject: [PATCH 47/53] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/managementdetails/index.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index a74fec733..7ca198da3 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -311,15 +311,15 @@ export default { if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - // console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) - // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - // } - // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - // } - // } + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + } + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + } + } } } } @@ -336,6 +336,7 @@ export default { postAction('/report/detail/save', query).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) + this.$refs.CollectionTabel.getTableList() this.textLoading = false } else { _this.$message.warning(_this.$t('operationFailed')) From e047e254f0568ef6f95dce740ff4ee22ad0f3556 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 17:27:43 +0800 Subject: [PATCH 48/53] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionTypeDisabled/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 4e30ff1bf..4e000b0f8 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -634,12 +634,12 @@ uploadFileChangeDown }, mounted() { - this.detailDate.list.forEach((item) => { - if (item.type === 'pull_more') { - item.dataValue = [] - } - // this.detailDatetransformation.push(item) - }) + // this.detailDate.list.forEach((item) => { + // if (item.type === 'pull_more') { + // item.dataValue = [] + // } + // // this.detailDatetransformation.push(item) + // }) }, methods: { onInput(r) { From 40fae067e307233cbb72a4d1e14e6755df416009 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 17:44:38 +0800 Subject: [PATCH 49/53] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionTypeDisabled/index.vue | 12 ++++++------ .../src/views/parameter/managementdetails/index.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 4e000b0f8..2404a2e38 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -634,12 +634,12 @@ uploadFileChangeDown }, mounted() { - // this.detailDate.list.forEach((item) => { - // if (item.type === 'pull_more') { - // item.dataValue = [] - // } - // // this.detailDatetransformation.push(item) - // }) + this.detailDate.list.forEach((item) => { + if (item.type === 'pull_more') { + console.log(item.dataValue) + } + // this.detailDatetransformation.push(item) + }) }, methods: { onInput(r) { diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 7ca198da3..d178b43be 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -313,7 +313,7 @@ export default { postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') } if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { From a3916b6bd091eb27c9db65e7f3f6d1799f03c560 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 17:52:11 +0800 Subject: [PATCH 50/53] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8NIO=E7=BC=96=E5=8F=B7=E9=99=90=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 935e965bb..1aa99f303 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -788,7 +788,7 @@ module.exports = { copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completion Time', parameterTemplateName: 'Parameter Template Name', - onlyThree: 'Only letters, numbers, dashes (-), and decimal points (.) can be entered. , left slash, space six kinds of content ', + onlyThree: 'enter only letters, numbers, hyphens (-), left slashes, and Spaces', templateName: 'Template Name', pleaseSelectData: 'Please Select Data', templateCopy: 'Template Copy', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 132493ef4..bee340923 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -804,7 +804,7 @@ module.exports = { copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', parameterTemplateName: '参数模板名称', - onlyThree: '只能输入字母，数字，横杠（-），小数点（.），左斜杠，空格六种内容', + onlyThree: '只能输入字母，数字，横杠（-），左斜杠，空格五种内容', templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', From cbb193e36219228e0ff1a6796e98bba136cb8cd5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 3 Aug 2022 18:01:30 +0800 Subject: [PATCH 51/53] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7-=E6=9B=B4=E6=96=B0=E6=97=B6=E4=B8=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86del=5Fflag=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SysUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 04d975382..304aa6215 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -534,7 +534,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setUsername(ppEmployee.getWorker_user_id()); sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); - sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); +// sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); sysUser.setThirdId(ppEmployee.getWorker_user_id()); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); From bb25d4775fe5cc7cb5ff7372ee064eb49248e9be Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 18:12:32 +0800 Subject: [PATCH 52/53] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/countryCardRelease.vue | 6 +- .../components/countryCardView.vue | 191 +++++++++++++++++- .../components/displayInformationModel.vue | 156 ++++++++++++++ 5 files changed, 350 insertions(+), 9 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1aa99f303..cddee045e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1230,4 +1230,7 @@ module.exports = { associatedWebsite:'Associated website', dropDownOptions:'Drop down options', dropDownOptionMaintenance:'Drop down option maintenance', + displayInformation:'Display information', + addComparison:'Add comparison', + showOrNot:'Show or not', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bee340923..2b024825c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1333,4 +1333,7 @@ module.exports = { associatedWebsite:'关联网址', dropDownOptions:'下拉选项', dropDownOptionMaintenance:'下拉选项维护', + displayInformation:'展示信息', + addComparison:'添加对比', + showOrNot:'是否展示', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 3ccdc4ab9..16f764ed2 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -227,7 +227,11 @@ }, viewClick() { - + let newUrl = this.$router.resolve({ + path: '/countryCardView', + query: {} + }) + window.open(newUrl.href, '_blank') }, deleteData(val) { let _this = this diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 75be6e28d..e2d651aea 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -6,21 +6,95 @@ - {{$t('applicableInstructionsMarketList')}} + {{$t('See')}}
-
+
+
+
+ + {{$t('displayInformation')}} +
+
+ + {{$t('addComparison')}} +
+
+
+
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+
+
+ + + 中国 + +
+
+ + + 中国 + +
+
+
+
@@ -66,11 +140,6 @@ } } - .content-box { - padding: 0 32px; - box-sizing: border-box; - } - .header-text { font-size: 16px; font-weight: 400; @@ -85,4 +154,110 @@ } } } + + .box-content-right { + width: 100%; + text-align: right; + margin-bottom: 20px; + } + + .operator-text { + cursor: pointer; + margin-right: 53px; + font-size: 14px; + font-weight: 400; + color: #040B29; + display: inline-block; + } + + .operator-text:last-child { + margin-right: 13px; + } + + .content-box { + overflow: auto; + white-space: nowrap; + position: relative; + } + + .content-box-left { + width: 200px; + background: #fff; + z-index: 111; + display: inline-block; + position: sticky; + left: 0; + border-top: 1px #d9d9d9 solid; + border-left: 1px #d9d9d9 solid; + border-bottom: 1px #d9d9d9 solid; + border-right: 1px #d9d9d9 solid; + } + + .content-box-left-text { + font-size: 16px; + color: #040B29; + font-weight: 400; + text-align: center; + border-bottom: 1px #d9d9d9 solid; + height: 80px; + line-height: 80px; + } + + .content-box-left-text:last-child { + border-bottom: none; + } + + .content-box-box-top { + width: 340px; + height: 160px; + display: inline-block; + cursor: pointer; + border-left: 1px #d9d9d9 solid; + border-top: 1px #d9d9d9 solid; + border-right: 1px #d9d9d9 solid; + border-bottom: 1px #d9d9d9 solid; + position: sticky; + top: 0; + z-index: 111; + background: #fff; + } + + .content-box-right { + width: 339px; + position: relative; + display: inline-block; + border-top: 1px #d9d9d9 solid; + border-right: 1px #d9d9d9 solid; + border-bottom: 1px #d9d9d9 solid; + } + + .content-box-right:last-child { + border-right: 1px #d9d9d9 solid; + } + + .content-box-box-img { + width: 70%; + height: 100%; + } + + .content-box-box-text { + display: inline-block; + width: 30%; + text-align: center; + font-size: 18px; + font-weight: 500; + color: #040B29; + } + + .content-box-box { + width: 100%; + height: 80px; + border-bottom: 1px #d9d9d9 solid; + cursor: pointer; + } + + .content-box-box:last-child { + border-bottom: none; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue new file mode 100644 index 000000000..baae325aa --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -0,0 +1,156 @@ + + + + + \ No newline at end of file From 6e9e8a9ae4299a8097c6b23573592d4bfd2a7c3f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 3 Aug 2022 18:15:09 +0800 Subject: [PATCH 53/53] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 156 +++++++++++++--- ...wledgeBaseBrowsingHistoryEOController.java | 170 ++++++++++++++++++ ...blemKnowledgeBaseClassifyEOController.java | 170 ++++++++++++++++++ ...oblemKnowledgeBaseCollectEOController.java | 170 ++++++++++++++++++ ...oblemKnowledgeBaseCommentEOController.java | 170 ++++++++++++++++++ .../ProblemKnowledgeBaseEOController.java | 170 ++++++++++++++++++ ...roblemKnowledgeBasePraiseEOController.java | 170 ++++++++++++++++++ .../ProblemKnowledgeBaseUserEOController.java | 170 ++++++++++++++++++ ...ProblemKnowledgeBaseBrowsingHistoryEO.java | 74 ++++++++ .../ProblemKnowledgeBaseClassifyEO.java | 74 ++++++++ .../entity/ProblemKnowledgeBaseCollectEO.java | 79 ++++++++ .../entity/ProblemKnowledgeBaseCommentEO.java | 79 ++++++++ .../entity/ProblemKnowledgeBaseEO.java | 143 +++++++++++++++ .../entity/ProblemKnowledgeBasePraiseEO.java | 79 ++++++++ .../entity/ProblemKnowledgeBaseUserEO.java | 74 ++++++++ ...mKnowledgeBaseBrowsingHistoryEOMapper.java | 17 ++ .../ProblemKnowledgeBaseClassifyEOMapper.java | 17 ++ .../ProblemKnowledgeBaseCollectEOMapper.java | 17 ++ .../ProblemKnowledgeBaseCommentEOMapper.java | 17 ++ .../mapper/ProblemKnowledgeBaseEOMapper.java | 17 ++ .../ProblemKnowledgeBasePraiseEOMapper.java | 17 ++ .../ProblemKnowledgeBaseUserEOMapper.java | 17 ++ ...emKnowledgeBaseBrowsingHistoryEOMapper.xml | 14 ++ .../ProblemKnowledgeBaseClassifyEOMapper.xml | 14 ++ .../ProblemKnowledgeBaseCollectEOMapper.xml | 15 ++ .../ProblemKnowledgeBaseCommentEOMapper.xml | 15 ++ .../xml/ProblemKnowledgeBaseEOMapper.xml | 23 +++ .../ProblemKnowledgeBasePraiseEOMapper.xml | 15 ++ .../xml/ProblemKnowledgeBaseUserEOMapper.xml | 14 ++ ...KnowledgeBaseBrowsingHistoryEOService.java | 61 +++++++ ...ProblemKnowledgeBaseClassifyEOService.java | 61 +++++++ ...IProblemKnowledgeBaseCollectEOService.java | 61 +++++++ ...IProblemKnowledgeBaseCommentEOService.java | 61 +++++++ .../IProblemKnowledgeBaseEOService.java | 61 +++++++ .../IProblemKnowledgeBasePraiseEOService.java | 61 +++++++ .../IProblemKnowledgeBaseUserEOService.java | 61 +++++++ ...ledgeBaseBrowsingHistoryEOServiceImpl.java | 89 +++++++++ ...lemKnowledgeBaseClassifyEOServiceImpl.java | 89 +++++++++ ...blemKnowledgeBaseCollectEOServiceImpl.java | 89 +++++++++ ...blemKnowledgeBaseCommentEOServiceImpl.java | 89 +++++++++ .../ProblemKnowledgeBaseEOServiceImpl.java | 89 +++++++++ ...oblemKnowledgeBasePraiseEOServiceImpl.java | 89 +++++++++ ...ProblemKnowledgeBaseUserEOServiceImpl.java | 89 +++++++++ 43 files changed, 3201 insertions(+), 26 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index d6ea92209..f20a9f262 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -558,33 +558,137 @@ WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390'; -- 问题知识库开发。 -- Country Card模板维护表 2022-08-02 CREATE TABLE `laws_weilai`.`country_card_temp` ( - `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', - `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', - `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', - `lable_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称', - `lable_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签类型', - `order_num` int(11) NULL DEFAULT NULL COMMENT '展示顺序', - `relevant_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联网址', - `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - PRIMARY KEY (`id`) USING BTREE + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `lable_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称', + `lable_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签类型', + `order_num` int(11) NULL DEFAULT NULL COMMENT '展示顺序', + `relevant_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联网址', + `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护表' ROW_FORMAT = Dynamic; + -- Country Card模板维护-字典项表 2022-08-02 CREATE TABLE `laws_weilai`.`country_card_temp_item` ( - `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', - `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', - `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', - `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板维护表id', - `item_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项值', - `item_text` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项中文名称', - `en_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项英文名称', - `del_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '逻辑删除标识', - `status` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1启用 0不启用）', - `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - PRIMARY KEY (`id`) USING BTREE + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板维护表id', + `item_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项值', + `item_text` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项中文名称', + `en_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项英文名称', + `del_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '逻辑删除标识', + `status` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1启用 0不启用）', + `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护-字典项表' ROW_FORMAT = Dynamic; + +-- 问题知识库-分类表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_classify` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_label` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题标签', + `charge_person_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-分类表' ROW_FORMAT = Dynamic; + +-- 问题知识库表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题', + `problem_type` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题分类', + `target_market` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市场', + `buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id', + `stand_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号', + `stand_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题', + `content` blob NULL COMMENT '内容（正文）', + `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件', + `show_permissions` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示权限', + `release_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布人id', + `release_time` datetime NULL DEFAULT NULL COMMENT '发布日期', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库表' ROW_FORMAT = Dynamic; + +-- 问题知识库展示权限表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_user` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库展示权限表' ROW_FORMAT = Dynamic; + +-- 问题知识库评论表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_comment` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `comment_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论内容', + `comment_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论用户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库评论表' ROW_FORMAT = Dynamic; + +-- 问题知识库浏览历史表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_browsing_history` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `browsing_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览人员id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库浏览历史表' ROW_FORMAT = Dynamic; + +-- 问题知识库点赞表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_praise` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `praise_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '点赞人员id', + `praise_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '点赞状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库点赞表' ROW_FORMAT = Dynamic; + +-- 问题知识库收藏表 2022-08-03 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `collect_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏用户id', + `collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java new file mode 100644 index 000000000..f23c69ac0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseBrowsingHistoryEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库浏览历史表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseBrowsingHistoryEO") +@Slf4j +public class ProblemKnowledgeBaseBrowsingHistoryEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseBrowsingHistoryEOService problemKnowledgeBaseBrowsingHistoryEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-分页列表查询") + @ApiOperation(value="问题知识库浏览历史表-分页列表查询", notes="问题知识库浏览历史表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseBrowsingHistoryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseBrowsingHistoryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-列表查询") + @ApiOperation(value="问题知识库浏览历史表-列表查询", notes="问题知识库浏览历史表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseBrowsingHistoryEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-添加") + @ApiOperation(value="问题知识库浏览历史表-添加", notes="问题知识库浏览历史表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + problemKnowledgeBaseBrowsingHistoryEOService.add(problemKnowledgeBaseBrowsingHistoryEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-编辑") + @ApiOperation(value="问题知识库浏览历史表-编辑", notes="问题知识库浏览历史表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + problemKnowledgeBaseBrowsingHistoryEOService.editById(problemKnowledgeBaseBrowsingHistoryEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-通过id删除") + @ApiOperation(value="问题知识库浏览历史表-通过id删除", notes="问题知识库浏览历史表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseBrowsingHistoryEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-批量删除") + @ApiOperation(value="问题知识库浏览历史表-批量删除", notes="问题知识库浏览历史表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseBrowsingHistoryEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-通过id查询") + @ApiOperation(value="问题知识库浏览历史表-通过id查询", notes="问题知识库浏览历史表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO = problemKnowledgeBaseBrowsingHistoryEOService.queryById(id); + if(problemKnowledgeBaseBrowsingHistoryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseBrowsingHistoryEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseBrowsingHistoryEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + return super.exportXls(request, problemKnowledgeBaseBrowsingHistoryEO, ProblemKnowledgeBaseBrowsingHistoryEO.class, "问题知识库浏览历史表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseBrowsingHistoryEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java new file mode 100644 index 000000000..3e9f5c700 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库-分类表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseClassifyEO") +@Slf4j +public class ProblemKnowledgeBaseClassifyEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseClassifyEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库-分类表-分页列表查询") + @ApiOperation(value="问题知识库-分类表-分页列表查询", notes="问题知识库-分类表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseClassifyEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseClassifyEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库-分类表-列表查询") + @ApiOperation(value="问题知识库-分类表-列表查询", notes="问题知识库-分类表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseClassifyEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @AutoLog(value = "问题知识库-分类表-添加") + @ApiOperation(value="问题知识库-分类表-添加", notes="问题知识库-分类表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + problemKnowledgeBaseClassifyEOService.add(problemKnowledgeBaseClassifyEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @AutoLog(value = "问题知识库-分类表-编辑") + @ApiOperation(value="问题知识库-分类表-编辑", notes="问题知识库-分类表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + problemKnowledgeBaseClassifyEOService.editById(problemKnowledgeBaseClassifyEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-分类表-通过id删除") + @ApiOperation(value="问题知识库-分类表-通过id删除", notes="问题知识库-分类表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseClassifyEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库-分类表-批量删除") + @ApiOperation(value="问题知识库-分类表-批量删除", notes="问题知识库-分类表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseClassifyEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-分类表-通过id查询") + @ApiOperation(value="问题知识库-分类表-通过id查询", notes="问题知识库-分类表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO = problemKnowledgeBaseClassifyEOService.queryById(id); + if(problemKnowledgeBaseClassifyEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseClassifyEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseClassifyEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + return super.exportXls(request, problemKnowledgeBaseClassifyEO, ProblemKnowledgeBaseClassifyEO.class, "问题知识库-分类表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseClassifyEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java new file mode 100644 index 000000000..f58424eb6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库收藏表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseCollectEO") +@Slf4j +public class ProblemKnowledgeBaseCollectEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseCollectEOService problemKnowledgeBaseCollectEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseCollectEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库收藏表-分页列表查询") + @ApiOperation(value="问题知识库收藏表-分页列表查询", notes="问题知识库收藏表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCollectEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseCollectEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库收藏表-列表查询") + @ApiOperation(value="问题知识库收藏表-列表查询", notes="问题知识库收藏表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseCollectEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @AutoLog(value = "问题知识库收藏表-添加") + @ApiOperation(value="问题知识库收藏表-添加", notes="问题知识库收藏表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + problemKnowledgeBaseCollectEOService.add(problemKnowledgeBaseCollectEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @AutoLog(value = "问题知识库收藏表-编辑") + @ApiOperation(value="问题知识库收藏表-编辑", notes="问题知识库收藏表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + problemKnowledgeBaseCollectEOService.editById(problemKnowledgeBaseCollectEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库收藏表-通过id删除") + @ApiOperation(value="问题知识库收藏表-通过id删除", notes="问题知识库收藏表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseCollectEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库收藏表-批量删除") + @ApiOperation(value="问题知识库收藏表-批量删除", notes="问题知识库收藏表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseCollectEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库收藏表-通过id查询") + @ApiOperation(value="问题知识库收藏表-通过id查询", notes="问题知识库收藏表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO = problemKnowledgeBaseCollectEOService.queryById(id); + if(problemKnowledgeBaseCollectEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseCollectEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseCollectEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + return super.exportXls(request, problemKnowledgeBaseCollectEO, ProblemKnowledgeBaseCollectEO.class, "问题知识库收藏表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseCollectEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java new file mode 100644 index 000000000..f3b4b1d01 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库评论表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseCommentEO") +@Slf4j +public class ProblemKnowledgeBaseCommentEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseCommentEOService problemKnowledgeBaseCommentEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseCommentEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库评论表-分页列表查询") + @ApiOperation(value="问题知识库评论表-分页列表查询", notes="问题知识库评论表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseCommentEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库评论表-列表查询") + @ApiOperation(value="问题知识库评论表-列表查询", notes="问题知识库评论表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseCommentEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @AutoLog(value = "问题知识库评论表-添加") + @ApiOperation(value="问题知识库评论表-添加", notes="问题知识库评论表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + problemKnowledgeBaseCommentEOService.add(problemKnowledgeBaseCommentEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @AutoLog(value = "问题知识库评论表-编辑") + @ApiOperation(value="问题知识库评论表-编辑", notes="问题知识库评论表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + problemKnowledgeBaseCommentEOService.editById(problemKnowledgeBaseCommentEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库评论表-通过id删除") + @ApiOperation(value="问题知识库评论表-通过id删除", notes="问题知识库评论表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseCommentEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库评论表-批量删除") + @ApiOperation(value="问题知识库评论表-批量删除", notes="问题知识库评论表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseCommentEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库评论表-通过id查询") + @ApiOperation(value="问题知识库评论表-通过id查询", notes="问题知识库评论表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO = problemKnowledgeBaseCommentEOService.queryById(id); + if(problemKnowledgeBaseCommentEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseCommentEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseCommentEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + return super.exportXls(request, problemKnowledgeBaseCommentEO, ProblemKnowledgeBaseCommentEO.class, "问题知识库评论表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseCommentEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java new file mode 100644 index 000000000..09bbe185d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseEO") +@Slf4j +public class ProblemKnowledgeBaseEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库表-分页列表查询") + @ApiOperation(value="问题知识库表-分页列表查询", notes="问题知识库表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库表-列表查询") + @ApiOperation(value="问题知识库表-列表查询", notes="问题知识库表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseEO + * @return + */ + @AutoLog(value = "问题知识库表-添加") + @ApiOperation(value="问题知识库表-添加", notes="问题知识库表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + problemKnowledgeBaseEOService.add(problemKnowledgeBaseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseEO + * @return + */ + @AutoLog(value = "问题知识库表-编辑") + @ApiOperation(value="问题知识库表-编辑", notes="问题知识库表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + problemKnowledgeBaseEOService.editById(problemKnowledgeBaseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库表-通过id删除") + @ApiOperation(value="问题知识库表-通过id删除", notes="问题知识库表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库表-批量删除") + @ApiOperation(value="问题知识库表-批量删除", notes="问题知识库表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库表-通过id查询") + @ApiOperation(value="问题知识库表-通过id查询", notes="问题知识库表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseEO problemKnowledgeBaseEO = problemKnowledgeBaseEOService.queryById(id); + if(problemKnowledgeBaseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + return super.exportXls(request, problemKnowledgeBaseEO, ProblemKnowledgeBaseEO.class, "问题知识库表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java new file mode 100644 index 000000000..93a08e54e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBasePraiseEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库点赞表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBasePraiseEO") +@Slf4j +public class ProblemKnowledgeBasePraiseEOController extends JeroController { + @Autowired + private IProblemKnowledgeBasePraiseEOService problemKnowledgeBasePraiseEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBasePraiseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库点赞表-分页列表查询") + @ApiOperation(value="问题知识库点赞表-分页列表查询", notes="问题知识库点赞表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBasePraiseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBasePraiseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库点赞表-列表查询") + @ApiOperation(value="问题知识库点赞表-列表查询", notes="问题知识库点赞表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBasePraiseEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @AutoLog(value = "问题知识库点赞表-添加") + @ApiOperation(value="问题知识库点赞表-添加", notes="问题知识库点赞表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + problemKnowledgeBasePraiseEOService.add(problemKnowledgeBasePraiseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @AutoLog(value = "问题知识库点赞表-编辑") + @ApiOperation(value="问题知识库点赞表-编辑", notes="问题知识库点赞表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + problemKnowledgeBasePraiseEOService.editById(problemKnowledgeBasePraiseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库点赞表-通过id删除") + @ApiOperation(value="问题知识库点赞表-通过id删除", notes="问题知识库点赞表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBasePraiseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库点赞表-批量删除") + @ApiOperation(value="问题知识库点赞表-批量删除", notes="问题知识库点赞表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBasePraiseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库点赞表-通过id查询") + @ApiOperation(value="问题知识库点赞表-通过id查询", notes="问题知识库点赞表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO = problemKnowledgeBasePraiseEOService.queryById(id); + if(problemKnowledgeBasePraiseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBasePraiseEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBasePraiseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + return super.exportXls(request, problemKnowledgeBasePraiseEO, ProblemKnowledgeBasePraiseEO.class, "问题知识库点赞表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBasePraiseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java new file mode 100644 index 000000000..cff1a4c79 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +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.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库展示权限表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseUserEO") +@Slf4j +public class ProblemKnowledgeBaseUserEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseUserEOService problemKnowledgeBaseUserEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseUserEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库展示权限表-分页列表查询") + @ApiOperation(value="问题知识库展示权限表-分页列表查询", notes="问题知识库展示权限表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseUserEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseUserEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库展示权限表-列表查询") + @ApiOperation(value="问题知识库展示权限表-列表查询", notes="问题知识库展示权限表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseUserEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @AutoLog(value = "问题知识库展示权限表-添加") + @ApiOperation(value="问题知识库展示权限表-添加", notes="问题知识库展示权限表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + problemKnowledgeBaseUserEOService.add(problemKnowledgeBaseUserEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @AutoLog(value = "问题知识库展示权限表-编辑") + @ApiOperation(value="问题知识库展示权限表-编辑", notes="问题知识库展示权限表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + problemKnowledgeBaseUserEOService.editById(problemKnowledgeBaseUserEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库展示权限表-通过id删除") + @ApiOperation(value="问题知识库展示权限表-通过id删除", notes="问题知识库展示权限表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseUserEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库展示权限表-批量删除") + @ApiOperation(value="问题知识库展示权限表-批量删除", notes="问题知识库展示权限表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseUserEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库展示权限表-通过id查询") + @ApiOperation(value="问题知识库展示权限表-通过id查询", notes="问题知识库展示权限表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO = problemKnowledgeBaseUserEOService.queryById(id); + if(problemKnowledgeBaseUserEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseUserEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseUserEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + return super.exportXls(request, problemKnowledgeBaseUserEO, ProblemKnowledgeBaseUserEO.class, "问题知识库展示权限表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseUserEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java new file mode 100644 index 000000000..c96d6da99 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_browsing_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_browsing_history对象", description="问题知识库浏览历史表") +public class ProblemKnowledgeBaseBrowsingHistoryEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**浏览人员id*/ + @Excel(name = "浏览人员id", width = 15) + @ApiModelProperty(value = "浏览人员id") + private java.lang.String browsingUserId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java new file mode 100644 index 000000000..2ce96532e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_classify") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_classify对象", description="问题知识库-分类表") +public class ProblemKnowledgeBaseClassifyEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题标签*/ + @Excel(name = "问题标签", width = 15) + @ApiModelProperty(value = "问题标签") + private java.lang.String problemLabel; + + /**负责人id*/ + @Excel(name = "负责人id", width = 15) + @ApiModelProperty(value = "负责人id") + private java.lang.String chargePersonId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java new file mode 100644 index 000000000..e20eaf190 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_collect") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_collect对象", description="问题知识库收藏表") +public class ProblemKnowledgeBaseCollectEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**收藏用户id*/ + @Excel(name = "收藏用户id", width = 15) + @ApiModelProperty(value = "收藏用户id") + private java.lang.String collectUserId; + + /**收藏状态*/ + @Excel(name = "收藏状态", width = 15) + @ApiModelProperty(value = "收藏状态") + private java.lang.String collectStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java new file mode 100644 index 000000000..a7d8fee97 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_comment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_comment对象", description="问题知识库评论表") +public class ProblemKnowledgeBaseCommentEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**评论内容*/ + @Excel(name = "评论内容", width = 15) + @ApiModelProperty(value = "评论内容") + private java.lang.String commentContent; + + /**评论用户id*/ + @Excel(name = "评论用户id", width = 15) + @ApiModelProperty(value = "评论用户id") + private java.lang.String commentUserId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java new file mode 100644 index 000000000..ac34b78ff --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -0,0 +1,143 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base对象", description="问题知识库表") +public class ProblemKnowledgeBaseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + + /**问题分类*/ + @Excel(name = "问题分类", width = 15) + @ApiModelProperty(value = "问题分类") + private java.lang.String problemType; + + /**市场*/ + @Excel(name = "市场", width = 15) + @ApiModelProperty(value = "市场") + private java.lang.String targetMarket; + + /**文档库id*/ + @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private java.lang.String bussDocumentLibraryId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String standNumber; + + /**标准标题*/ + @Excel(name = "标准标题", width = 15) + @ApiModelProperty(value = "标准标题") + private java.lang.String standTitle; + + /**内容（正文）*/ + @Excel(name = "内容（正文）", width = 15) + private transient java.lang.String contentString; + + private byte[] content; + + public byte[] getContent(){ + if(contentString==null){ + return null; + } + try { + return contentString.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } + + public String getContentString(){ + if(content==null || content.length==0){ + return ""; + } + try { + return new String(content,"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return ""; + } + /**附件*/ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private java.lang.String accessoryFile; + + /**展示权限*/ + @Excel(name = "展示权限", width = 15) + @ApiModelProperty(value = "展示权限") + private java.lang.String showPermissions; + + /**发布人id*/ + @Excel(name = "展示权限", width = 15) + @ApiModelProperty(value = "发布人id") + private java.lang.String releaseUserId; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15) + @ApiModelProperty(value = "发布日期") + private java.lang.String releaseTime; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java new file mode 100644 index 000000000..b12cb40cb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_praise") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_praise对象", description="问题知识库点赞表") +public class ProblemKnowledgeBasePraiseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**点赞人员id*/ + @Excel(name = "点赞人员id", width = 15) + @ApiModelProperty(value = "点赞人员id") + private java.lang.String praiseUserId; + + /**点赞状态*/ + @Excel(name = "点赞状态", width = 15) + @ApiModelProperty(value = "点赞状态") + private java.lang.String praiseStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java new file mode 100644 index 000000000..4865c5bdd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_user对象", description="问题知识库展示权限表") +public class ProblemKnowledgeBaseUserEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**用户id*/ + @Excel(name = "用户id", width = 15) + @ApiModelProperty(value = "用户id") + private java.lang.String userId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java new file mode 100644 index 000000000..cc4c4dca5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseBrowsingHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java new file mode 100644 index 000000000..ae0853022 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseClassifyEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java new file mode 100644 index 000000000..2a5a58b75 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseCollectEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java new file mode 100644 index 000000000..c62e67df3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseCommentEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java new file mode 100644 index 000000000..be6e0e9f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java new file mode 100644 index 000000000..6387837a4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBasePraiseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java new file mode 100644 index 000000000..833e8b7ca --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseUserEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml new file mode 100644 index 000000000..d7d8e2386 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml new file mode 100644 index 000000000..21927cc7b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml new file mode 100644 index 000000000..3b4f91413 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml new file mode 100644 index 000000000..23e191dfe --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml new file mode 100644 index 000000000..d1061e37f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml new file mode 100644 index 000000000..044434263 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml new file mode 100644 index 000000000..e23f914c1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java new file mode 100644 index 000000000..b1a377731 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseBrowsingHistoryEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + void add(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + void editById(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseBrowsingHistoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java new file mode 100644 index 000000000..486f3ea5e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseClassifyEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + void add(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + void editById(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseClassifyEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java new file mode 100644 index 000000000..63c116f63 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseCollectEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + void add(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + void editById(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseCollectEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java new file mode 100644 index 000000000..a3b779b5f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseCommentEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + void add(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + void editById(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseCommentEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java new file mode 100644 index 000000000..426a968f0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseEO + * @return + */ + void add(ProblemKnowledgeBaseEO problemKnowledgeBaseEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseEO + * @return + */ + void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java new file mode 100644 index 000000000..1a396fd62 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBasePraiseEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + void add(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO); + + /** + * 更新 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + void editById(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBasePraiseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java new file mode 100644 index 000000000..6a1521524 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseUserEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + void add(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + void editById(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseUserEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java new file mode 100644 index 000000000..6d55d0538 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseBrowsingHistoryEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseBrowsingHistoryEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseBrowsingHistoryEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + Date now = new Date(); + problemKnowledgeBaseBrowsingHistoryEO.setCreateTime(now); + problemKnowledgeBaseBrowsingHistoryEO.setUpdateTime(now); + save(problemKnowledgeBaseBrowsingHistoryEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + Date now = new Date(); + problemKnowledgeBaseBrowsingHistoryEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseBrowsingHistoryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseBrowsingHistoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java new file mode 100644 index 000000000..c1cf2e368 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseClassifyEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + Date now = new Date(); + problemKnowledgeBaseClassifyEO.setCreateTime(now); + problemKnowledgeBaseClassifyEO.setUpdateTime(now); + save(problemKnowledgeBaseClassifyEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + Date now = new Date(); + problemKnowledgeBaseClassifyEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseClassifyEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseClassifyEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java new file mode 100644 index 000000000..bd7d2d498 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCollectEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBaseCollectEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseCollectEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + Date now = new Date(); + problemKnowledgeBaseCollectEO.setCreateTime(now); + problemKnowledgeBaseCollectEO.setUpdateTime(now); + save(problemKnowledgeBaseCollectEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + Date now = new Date(); + problemKnowledgeBaseCollectEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseCollectEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseCollectEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java new file mode 100644 index 000000000..d2c6bb916 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCommentEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseCommentEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + Date now = new Date(); + problemKnowledgeBaseCommentEO.setCreateTime(now); + problemKnowledgeBaseCommentEO.setUpdateTime(now); + save(problemKnowledgeBaseCommentEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + Date now = new Date(); + problemKnowledgeBaseCommentEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseCommentEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseCommentEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java new file mode 100644 index 000000000..d403edede --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + Date now = new Date(); + problemKnowledgeBaseEO.setCreateTime(now); + problemKnowledgeBaseEO.setUpdateTime(now); + save(problemKnowledgeBaseEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + Date now = new Date(); + problemKnowledgeBaseEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java new file mode 100644 index 000000000..eebb73dd2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBasePraiseEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBasePraiseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBasePraiseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBasePraiseEOService { + + /** + * 保存 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @Override + public void add(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + Date now = new Date(); + problemKnowledgeBasePraiseEO.setCreateTime(now); + problemKnowledgeBasePraiseEO.setUpdateTime(now); + save(problemKnowledgeBasePraiseEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + Date now = new Date(); + problemKnowledgeBasePraiseEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBasePraiseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBasePraiseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java new file mode 100644 index 000000000..6d34b12f7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseUserEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseUserEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + Date now = new Date(); + problemKnowledgeBaseUserEO.setCreateTime(now); + problemKnowledgeBaseUserEO.setUpdateTime(now); + save(problemKnowledgeBaseUserEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + Date now = new Date(); + problemKnowledgeBaseUserEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseUserEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseUserEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}