From 3a7f5867fa350410850dba8c7fca3f0fdd93db63 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 28 Jul 2022 09:37:36 +0800 Subject: [PATCH 01/21] =?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=A1=A8=E5=A4=B4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=86=BB=E7=BB=93=E5=88=97=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsCollectManifestEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 4456a79fb..91bfb3d99 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -676,6 +676,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 28 Jul 2022 10:33:38 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=86=BB=E7=BB=93=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 3 ++- .../components/ParameterItemCollectionList.vue | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 03f462ef7..40b343d06 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -21,7 +21,8 @@ {{ text }}
- {{ item.db_field_txt }} + + {{ item.db_field_txt }} {{$t('See')}}
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 9ed4581f4..fc24c69e0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1102,6 +1102,7 @@ _this.$message.success(this.$t('OperationSuccessful')) this.areaVisibleFreeze = false this.$refs.CollectionTabel.getTableList() + this.$refs.CollectionTabel.getHeader() } else { this.textLoading = false _this.$message.warning(this.$t('operationFailed')) From e6a99db73e54676d8caee8535b50e07fe1f7053a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 28 Jul 2022 11:07:25 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=90=9C=E7=B4=A2=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index c04af8877..22bbafad7 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -82,7 +82,7 @@ {{$t('uploadedBy')}} + v-model="queryParams.updateBy"> @@ -96,7 +96,7 @@ @change="onChange" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParams.uploadTime" + v-model="queryParams.updateTime" :disabled="false"/> @@ -714,6 +714,9 @@ export default { //搜索 searchQuery(item) { this.pageNo = 1 + if(this.queryParams.updateTime){ + this.queryParams.updateTime = this.queryParams.updateTime.join(',') + } this.loadData(item) }, //清空 @@ -799,12 +802,12 @@ export default { downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear) }, onChange(value,dateString){ - if (this.queryParams.uploadTime && this.queryParams.uploadTime.length > 0) { + if (this.queryParams.updateTime && this.queryParams.updateTime.length > 0) { let dateOne = moment(dateString[0]).format('YYYY-MM-DD') let dateTwo = moment(dateString[1]).format('YYYY-MM-DD') - this.queryParams.uploadTime = [dateOne, dateTwo] + this.queryParams.updateTime = [dateOne, dateTwo] } else { - this.queryParams.uploadTime = [] + this.queryParams.updateTime = [] // this.queryParamOne[item + '_name'] = [] } }, From 9a0216daa9e4479e8fafd324e1115a88ad5854f7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 28 Jul 2022 11:40:39 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/mapper/xml/ParamsReportDetailEOMapper.xml | 10 ++++++++-- .../service/impl/ParamsReportDetailEOServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index 06d76a401..6db9c4628 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -43,10 +43,16 @@ AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%') - AND sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.sdt}),'%') + AND sdt in + + #{item} + - AND dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.dre}),'%') + AND dre in + + #{item} + AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId} 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 9bf90f6c1..9756c00b3 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 @@ -1285,7 +1285,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Thu, 28 Jul 2022 11:46:04 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BC=96=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../externalReports/components/addModel.vue | 4 ++-- jero-web/src/views/externalReports/index.vue | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index d45561f2a..1a67da74b 100644 --- a/jero-web/src/views/externalReports/components/addModel.vue +++ b/jero-web/src/views/externalReports/components/addModel.vue @@ -41,7 +41,6 @@ @@ -56,7 +55,7 @@ {{$t('submit')}} - + @@ -135,6 +134,7 @@ export default { editModel(value) { this.visible = true this.title = this.$t('edit') + this.disabled = true this.$nextTick(() => { this.formInline = value this.$refs['ruleForm'].clearValidate() diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 22bbafad7..3993d2101 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -82,7 +82,7 @@ {{$t('uploadedBy')}} + v-model="queryParams.createBy"> @@ -96,7 +96,7 @@ @change="onChange" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParams.updateTime" + v-model="queryParams.createTime" :disabled="false"/> @@ -327,7 +327,7 @@ export default { { title: this.$t('uploadedBy'), align: 'center', - dataIndex: 'updateBy', + dataIndex: 'createBy', }, // { // title: this.$t('category'), @@ -337,7 +337,7 @@ export default { { title: this.$t('uploadTime'), align: 'center', - dataIndex: 'updateTime', + dataIndex: 'createTime', width: 250 }, { @@ -714,8 +714,8 @@ export default { //搜索 searchQuery(item) { this.pageNo = 1 - if(this.queryParams.updateTime){ - this.queryParams.updateTime = this.queryParams.updateTime.join(',') + if(this.queryParams.createTime){ + this.queryParams.createTime = this.queryParams.createTime.join(',') } this.loadData(item) }, @@ -802,12 +802,12 @@ export default { downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear) }, onChange(value,dateString){ - if (this.queryParams.updateTime && this.queryParams.updateTime.length > 0) { + if (this.queryParams.createTime && this.queryParams.createTime.length > 0) { let dateOne = moment(dateString[0]).format('YYYY-MM-DD') let dateTwo = moment(dateString[1]).format('YYYY-MM-DD') - this.queryParams.updateTime = [dateOne, dateTwo] + this.queryParams.createTime = [dateOne, dateTwo] } else { - this.queryParams.updateTime = [] + this.queryParams.createTime = [] // this.queryParamOne[item + '_name'] = [] } }, From b60802f0a4dc82eeebd3aa5427a5fd748615bdfe Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 28 Jul 2022 11:53:49 +0800 Subject: [PATCH 06/21] =?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=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86-=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/escalationlibrary/index.vue | 4 ++-- jero-web/src/views/parameter/managementdetails/index.vue | 4 ++-- jero-web/src/views/parameter/parameterexport/index.vue | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 6effd1f5c..226f3b068 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -48,8 +48,8 @@ - {{$t('Exporthistory')}} - {{$t('See')}} + {{$t('Exporthistory')}} + {{$t('See')}} diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 3dc497d98..ac2fd70f2 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -81,11 +81,11 @@
-
+
{{$t('ConventionalExport')}}
-
+
{{$t('CustomExport')}}
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index f40c865c6..acd79f530 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -22,11 +22,11 @@
-
+
{{$t('newlyAdded')}}
-
+
{{$t('BatchDelete')}}
@@ -47,8 +47,8 @@ {{ text && text.length > 100 ? text.slice(0, 99) + '...' : text }} - {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('edit')}} + {{$t('deleteLib')}}
From 80259601791a6a04e82d898870b64236413b06cf Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 28 Jul 2022 12:01:43 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 12 ++++++++++++ .../ParamsExportTemplateEOController.java | 11 ++++++----- .../ParamsReportDetailEOController.java | 17 +++++++++-------- .../controller/ParamsReportEOController.java | 5 +++-- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6722f97f8..9943d9847 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -494,3 +494,15 @@ INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_v ALTER TABLE `laws_weilai`.`doc_translation` ADD COLUMN `serial_number` varchar(255) NULL COMMENT '编号' AFTER `buss_document_library_id`, ADD COLUMN `title` varchar(255) NULL COMMENT '标题' AFTER `serial_number`; + +-- 菜单管理 添加上报库按钮 2022-07-28 +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487817415819266', '1552487412749369345', '自定义导出', NULL, NULL, NULL, NULL, 2, 'report:detail:export:custom', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:55:14', NULL, NULL, 0, 0, '1', 0, 'Custom Export'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487616038895618', '1552487412749369345', '常规导出', NULL, NULL, NULL, NULL, 2, 'report:detail:export:normal', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:54:26', NULL, NULL, 0, 0, '1', 0, 'Normal Export'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487412749369345', '1539429224550457346', '查看', NULL, NULL, NULL, NULL, 2, 'report:detail:list', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2022-07-28 10:53:38', NULL, NULL, 0, 0, '1', 0, 'Detail'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487236076896257', '1539429224550457346', '导出历史', NULL, NULL, NULL, NULL, 2, 'params:report:history', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:52:56', NULL, NULL, 0, 0, '1', 0, 'Export History'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484580440735746', '1539426795780005889', '批量删除', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:deleteBatch', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:42:22', NULL, NULL, 0, 0, '1', 0, 'Batch Delete'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484462484324353', '1539426795780005889', '删除', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:41:54', NULL, NULL, 0, 0, '1', 0, 'Delete'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484292065558530', '1539426795780005889', '编辑', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:41:14', NULL, NULL, 0, 0, '1', 0, 'Edit'); +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484136976973825', '1539426795780005889', '新增', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:40:37', NULL, NULL, 0, 0, '1', 0, 'Add'); +UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '上报库管理', `url` = '/escalationlibrary', `component` = 'parameter/escalationlibrary/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:report:page', `perms_type` = '1', `sort_no` = 3.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 10:05:03', `update_by` = 'admin', `update_time` = '2022-07-28 10:52:00', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Escalation library management' WHERE `id` = '1539429224550457346'; +UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数导出模板管理', `url` = '/Parameterexport', `component` = 'parameter/parameterexport/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'report:exportTemplate:page', `perms_type` = '1', `sort_no` = 2.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 09:55:24', `update_by` = 'admin', `update_time` = '2022-07-28 10:40:02', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter export template management' WHERE `id` = '1539426795780005889'; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java index ae1128236..872aacfee 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java @@ -13,6 +13,7 @@ import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -51,7 +52,7 @@ public class ParamsExportTemplateEOController extends JeroController queryPageList(ParamsExportTemplateEO paramsExportTemplateEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -111,7 +112,7 @@ public class ParamsExportTemplateEOController extends JeroController add(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) { boolean isSuccess = paramsExportTemplateEOService.add(paramsExportTemplateEO); if (isSuccess) { @@ -130,7 +131,7 @@ public class ParamsExportTemplateEOController extends JeroController edit(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) { boolean isSuccess = paramsExportTemplateEOService.editById(paramsExportTemplateEO); if (isSuccess) { @@ -149,7 +150,7 @@ public class ParamsExportTemplateEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { boolean isSuccess = paramsExportTemplateEOService.deleteById(id); if (isSuccess) { @@ -168,7 +169,7 @@ public class ParamsExportTemplateEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { boolean isSuccess = paramsExportTemplateEOService.deleteByIds(Arrays.asList(ids.split(","))); if (isSuccess) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 010580e3e..8906be54b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -64,7 +65,7 @@ public class ParamsReportDetailEOController extends JeroController>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId, @RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { @@ -80,7 +81,7 @@ public class ParamsReportDetailEOController extends JeroController queryList(ParamsReportDetailEO paramsReportDetailEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="100") Integer pageSize, @@ -105,7 +106,7 @@ public class ParamsReportDetailEOController extends JeroController getConfigLableList(ParamsReportDetailVO paramsReportDetailVO) { List> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO); return Result.OK(configLabelList); @@ -136,7 +137,7 @@ public class ParamsReportDetailEOController extends JeroController getConfigLableListCustom(ParamsReportDetailVO paramsReportDetailVO) { List> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO); return Result.OK(configLabelList); @@ -151,7 +152,7 @@ public class ParamsReportDetailEOController extends JeroController getTemplateLabelList() { List> templateLabelList = paramsReportDetailEOService.getTemplateLabelList(); return Result.OK(templateLabelList); @@ -159,7 +160,7 @@ public class ParamsReportDetailEOController extends JeroController getById(@RequestParam(name = "id") String id) { ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(id); return Result.OK(paramsReportConfigEO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 1ba513ce4..7307250e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -13,6 +13,7 @@ import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -53,7 +54,7 @@ public class ParamsReportEOController extends JeroController queryPageList(ParamsReportEO paramsReportEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -82,7 +83,7 @@ public class ParamsReportEOController extends JeroController exportHistoryPage(ParamsReportExportHistoryEO paramsReportExportHistoryEO, @RequestParam(name="cut") String cut, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, From e8832637ed3b28781b70182b657aa3aa089479e5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 28 Jul 2022 14:10:56 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../externalReports/components/addModel.vue | 1 + jero-web/src/views/externalReports/index.vue | 33 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index 1a67da74b..13b1c911a 100644 --- a/jero-web/src/views/externalReports/components/addModel.vue +++ b/jero-web/src/views/externalReports/components/addModel.vue @@ -125,6 +125,7 @@ export default { addModel(menuId) { this.visible = true this.title = this.$t('UploadFile') + this.disabled = false this.menuId = menuId this.formInline = {} this.$nextTick(() => { diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 3993d2101..23959c9af 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -383,7 +383,7 @@ export default { // this.infoId = this.$route.query.infoId // console.log('info', this.$route.query) this.loadMenuData() - this.loadData() + // this.loadData() this.generateList(this.gData) }, methods: { @@ -459,6 +459,12 @@ export default { // this.data = this.toTree(res.result) this.data = res.result this.menuId = this.data[0].key + console.log(this.menuId) + let queryParam = { + supFolder: this.menuId + + } + this.loadData(JSON.parse(JSON.stringify(queryParam))) this.gData = [...this.data] Object.assign(this, { expandedKeys: this.expandedKeys, @@ -698,6 +704,7 @@ export default { }, //获取列表数据 loadData(item) { + this.queryParams.supFolder = this.menuId let params = { ...this.queryParams, ...item, @@ -784,23 +791,6 @@ export default { this.parameter.info_id = this.infoId this.parameter.menu_id = this.menuId }, - //导出 - handleExportManage() { - if (JSON.stringify(this.parameter) == '{}') { - this.parameter.info_id = this.infoId - this.parameter.menu_id = this.menuId - } - // console.log('menuId',this.menuId) - let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss') - let name = this.$route.query.infoNumber + ' ' + dateName + '.zip' - let query = { - exportName: this.$route.query.infoNumber + ' ' + dateName, - idList: this.selectedRowKeys.join(','), - parameter: this.parameter - } - - downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear) - }, onChange(value,dateString){ if (this.queryParams.createTime && this.queryParams.createTime.length > 0) { let dateOne = moment(dateString[0]).format('YYYY-MM-DD') @@ -825,6 +815,13 @@ export default { handleEdit(item) { this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item))) }, + //下载 + download(item){ + let query = { + id: item.fileKey + } + downloadFile('/sys/common/downLoadFile', item.fileName, query, this.Deselect) + }, //删除 batchDel(val) { console.log(this.menuId) From 5c1f32e0f84d2b5c612db8128b081ccb6355aa97 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 28 Jul 2022 16:09:06 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RegulationMonthlyFill.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 5a312fa44..ca1b2926e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -94,7 +94,8 @@ //url传参严格按照当前命名 url: { deleteBatch: '/report/lawsMonthlyReportWriteEO/deleteBatch', - list:'/report/lawsMonthlyReportWriteEO/page', + list: '/report/lawsMonthlyReportWriteEO/page', + exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport' }, loading: false, dataSource: [], @@ -161,7 +162,7 @@ methods: { dateChange(item) { this.queryParam[item.db_field_name] = this.queryParam[item.db_field_name] ? moment(this.queryParam[item.db_field_name]).format('YYYY-MM') : '' - this.queryParam = {...this.queryParam} + this.queryParam = { ...this.queryParam } }, searchQuery() { this.pageNo = 1 @@ -170,7 +171,7 @@ searchReset() { this.queryParam = {} this.queryParam.month = moment(new Date()).format('YYYY-MM') - this.queryParam = {...this.queryParam} + this.queryParam = { ...this.queryParam } this.pageNo = 1 this.getList() }, @@ -219,7 +220,15 @@ this.$refs.fillTableRef.getData() }, monthlyIntegrationAndExportClick() { - + let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + let query = { + ids: selectedRowKeys.join(','), + ...this.queryParam + } + downloadFile(this.url.exportData, this.$t('monthlyReportRegulations') + '.zip', query, this.Deselect) + }, + Deselect() { + this.selectedRowKeys = [] }, addContentClick() { this.$refs.fillAddRef.add() @@ -323,6 +332,7 @@ height: 38px; /*margin-top: 2px;*/ } + .text-operation { margin-right: 8px; } From fea4a232e0f163429a5c874a366a724c676cdf15 Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 28 Jul 2022 16:16:31 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/CollectManifestUserTypeEnum.java | 2 +- .../controller/ExtRepoDataController.java | 60 +++++--- .../enums/ExtRepoMamagerRoleIdEnum.java | 73 +++++++++ .../extRepo/service/IExtRepoDataService.java | 2 +- .../service/IExtRepoFolderService.java | 15 ++ .../service/impl/ExtRepoDataServiceImpl.java | 136 ++++++++++------- .../impl/ExtRepoFolderServiceImpl.java | 139 +++++++++++++----- 7 files changed, 318 insertions(+), 109 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java index b9a2956e3..15938c07a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java @@ -14,7 +14,7 @@ public enum CollectManifestUserTypeEnum { DRE("填写人", "Dre People","dre"), STUDIO("R&H Studio","R&H Studio","studio"), MANAGER("R&H Manager","R&H Manager","manager"), - ADMIN("系统管理员","Administrator","admin"), + ADMIN("系统","Administrator","admin"), GUEST("游客", "Guest","guest"); String name; 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 9798e3269..0eab59998 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 @@ -1,12 +1,11 @@ package com.jero.modules.extRepo.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoDataPage; @@ -24,7 +23,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.List; @@ -45,6 +46,9 @@ public class ExtRepoDataController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(extRepoData, req.getParameterMap()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Page page = new Page(pageNo, pageSize); // 文件名称模糊查询 String fileName = req.getParameter("fileName"); if (StringUtils.isNotBlank(fileName)) { - queryWrapper.like("fileName", fileName); + queryWrapper.like(ExtRepoData::getFileName, fileName); } - // 创建人模糊查询 + // 上传人模糊查询 String createBy = req.getParameter("createBy"); - if (StringUtils.isNotBlank(fileName)) { - queryWrapper.like("createBy", createBy); + if (StringUtils.isNotBlank(createBy)) { + queryWrapper.like(ExtRepoData::getCreateBy, createBy); } + // 更新时间查询 + String createTime = req.getParameter("time"); + if (StringUtils.isNotBlank(createTime)) { + String[] createTimeArr = createTime.split(","); + if (createTimeArr.length >= 2) { + queryWrapper.between(ExtRepoData::getCreateTime, createTimeArr[0], createTimeArr[1]); + } + } + queryWrapper.eq(ExtRepoData::getSupFolder, extRepoData.getSupFolder()); IPage pageList = extRepoDataService.page(page, queryWrapper); log.info("查询当前页：" + pageList.getCurrent()); log.info("查询当前页数量：" + pageList.getSize()); @@ -107,13 +120,15 @@ public class ExtRepoDataController extends JeroController add(@Validated @RequestBody ExtRepoData extRepoData) { if (extRepoFolderService.haveManageAuth(extRepoData.getSupFolder())) { - extRepoDataService.add(extRepoData); - return Result.OK("添加成功！"); + log.info("对外报告数据表收到文件添加请求，开始处理文件:【" + sdf.format(new Date()) + "】"); + int res = extRepoDataService.add(extRepoData); + return Result.OK("添加成功" + res + "条数据！"); } else { return Result.error("没有权限！"); } } + /** * 编辑 * @@ -125,10 +140,11 @@ public class ExtRepoDataController extends JeroController edit(@Validated @RequestBody ExtRepoData extRepoData) { ExtRepoData erd = extRepoDataService.queryById(extRepoData.getId()); - if (extRepoFolderService.haveManageAuth(erd.getSupFolder())) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) { extRepoData.setSupFolder(erd.getSupFolder()); extRepoDataService.editById(extRepoData); - return Result.OK("编辑成功!"); + return Result.OK("添加成功！"); } else { return Result.error("没有权限！"); } @@ -143,14 +159,18 @@ public class ExtRepoDataController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestParam("id") String id) { ExtRepoData erd = extRepoDataService.queryById(id); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (erd.getCreateBy().equals(sysUser.getUsername())) { - extRepoDataService.deleteById(id); - return Result.OK("删除成功!"); + if (null != erd) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) { + extRepoDataService.deleteById(id); + return Result.OK("删除成功!"); + } else { + return Result.error("没有权限！"); + } } else { - return Result.error("没有权限！"); + return Result.error("没有此数据！"); } } @@ -163,13 +183,13 @@ public class ExtRepoDataController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestParam("ids") String ids) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List idsList = Arrays.asList(ids.split(",")); for (String id : idsList) { ExtRepoData erd = extRepoDataService.queryById(id); - if (null != erd && !erd.getCreateBy().equals(sysUser.getUsername())) { - return Result.OK("没有权限!"); + if (null != erd && !extRepoFolderService.isManager() && !sysUser.getUsername().equals(erd.getCreateBy())) { + return Result.error("没有权限!"); } } this.extRepoDataService.deleteByIds(idsList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java new file mode 100644 index 000000000..542d4ef58 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java @@ -0,0 +1,73 @@ +package com.jero.modules.extRepo.enums; + +import java.util.ArrayList; +import java.util.List; + +public enum ExtRepoMamagerRoleIdEnum { + MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",1), + ERMANAGER_ID("对外报告管理员","ExternalReportsManager","ExternalReportsManager","1552536424587862017",2); + + + String name; + String enName; + String value; + String id; + Integer order; + + ExtRepoMamagerRoleIdEnum(String name, String enName, String value, String id, Integer order) { + this.name = name; + this.enName = enName; + this.value = value; + this.id = id; + this.order = order; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public static List getIdList() { + List idList = new ArrayList<>(); + ExtRepoMamagerRoleIdEnum[] values = values(); + for (ExtRepoMamagerRoleIdEnum ermriEnum : values) { + idList.add(ermriEnum.getId()); + } + return idList; + } +} 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 bc9bfb91a..2a88e9294 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 @@ -19,7 +19,7 @@ public interface IExtRepoDataService extends IService { * @param extRepoData * @return */ - void add(ExtRepoData extRepoData); + int add(ExtRepoData extRepoData); /** * 更新 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java index d9be6458b..a207ba037 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java @@ -68,4 +68,19 @@ public interface IExtRepoFolderService extends IService { * @return */ boolean haveManageAuth(String folderId); + + /** + * 是否有查看权限 + * + * @param folderId + * @return + */ + boolean haveViewAuth(String folderId); + + /** + * 是否管理员 + * + * @return + */ + boolean isManager(); } 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 4f07b2182..58bbf73cb 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,11 +1,14 @@ package com.jero.modules.extRepo.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.vo.LoginUser; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.mapper.ExtRepoDataMapper; import com.jero.modules.extRepo.service.IExtRepoDataService; -import org.apache.shiro.SecurityUtils; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -14,80 +17,111 @@ import java.util.List; /** * @Description: 对外报告数据表 * @Author: jero-boot - * @Date: 2022-07-25 + * @Date: 2022-07-25 * @Version: V1.0 */ @Service public class ExtRepoDataServiceImpl extends ServiceImpl implements IExtRepoDataService { - /** - * 保存 - * - * @param extRepoData - * @return - */ - @Override - public void add(ExtRepoData extRepoData) { + @Autowired + private IOSSFileService ossFileService; + + /** + * 保存 + * + * @param extRepoData + * @return + */ + @Override + public int add(ExtRepoData extRepoData) { + //返回成功数量 + int res = 0; Date now = new Date(); - extRepoData.setCreateTime(now); - extRepoData.setUpdateTime(now); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - extRepoData.setUpdateBy(sysUser.getUsername()); - save(extRepoData); + // 根据fileKey查找文件 + String fileIds = extRepoData.getFileKey(); + if (StringUtils.isNotBlank(fileIds)) { + String[] fileIdsArr = fileIds.split(","); + for (String fid : fileIdsArr) { + OSSFile ossFile = ossFileService.getById(fid); + if (ObjectUtil.isNotEmpty(ossFile)) { + String fileName = ossFile.getFileName(); + extRepoData.setFileName(fileName); + ExtRepoData erd = extRepoDataCopy(extRepoData, fid, now); + save(erd); + res++; + } + } + } + return res; } - /** - * 更新 - * - * @param extRepoData - * @return - */ - @Override + private ExtRepoData extRepoDataCopy(ExtRepoData extRepoData, String key, Date now) { + ExtRepoData res = new ExtRepoData(); + res.setId(extRepoData.getId()); + res.setCreateBy(extRepoData.getCreateBy()); + res.setCreateTime(now); + res.setUpdateBy(extRepoData.getUpdateBy()); + res.setUpdateTime(now); + res.setSysOrgCode(extRepoData.getSysOrgCode()); + res.setFileKey(key); + res.setFileName(extRepoData.getFileName()); + res.setFileDescription(extRepoData.getFileDescription()); + res.setSupFolder(extRepoData.getSupFolder()); + return res; + } + + /** + * 更新 + * + * @param extRepoData + * @return + */ + @Override public void editById(ExtRepoData extRepoData) { - Date now = new Date(); + Date now = new Date(); extRepoData.setUpdateTime(now); - saveOrUpdate(extRepoData); + saveOrUpdate(extRepoData); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public ExtRepoData queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index 6a840e8cf..ec923e61a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.extRepo.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; @@ -7,13 +8,18 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.modules.extRepo.entity.ERFTreeData; import com.jero.modules.extRepo.entity.ExtRepoFolder; +import com.jero.modules.extRepo.enums.ExtRepoMamagerRoleIdEnum; import com.jero.modules.extRepo.mapper.ExtRepoFolderMapper; import com.jero.modules.extRepo.service.IExtRepoFolderService; +import com.jero.modules.system.entity.SysUserRole; +import com.jero.modules.system.service.ISysUserRoleService; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 对外报告文件夹表 @@ -23,7 +29,8 @@ import java.util.*; */ @Service public class ExtRepoFolderServiceImpl extends ServiceImpl implements IExtRepoFolderService { - + @Autowired + private ISysUserRoleService sysUserRoleService; /** * 一级文件夹的supFolder统一存root */ @@ -42,11 +49,18 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl resList = getListBySupFolder(id); - if (resList.isEmpty()) { - removeById(id); + if (haveManageAuth(id)) { + List resList = getListBySupFolder(id); + if (resList.isEmpty()) { + removeById(id); + } else { + throw new JeroBootException("请先删除子文件夹！"); + } + } else { + throw new JeroBootException("没有权限！"); } } catch (Exception ex) { log.error("删除对外报告文件夹失败：" + ex.getMessage()); @@ -262,7 +289,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getStringList(String listStr) { List res = new ArrayList(); if (null != listStr) { @@ -311,4 +321,61 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl userRoles = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, loginUser.getId())); // 查询用户所有角色 + List userRoleIds = new ArrayList<>(); // 用户管理员/对外报告管理员 + if (CollectionUtil.isNotEmpty(userRoles)) { + List roleIdList = ExtRepoMamagerRoleIdEnum.getIdList(); + List userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + userRoleIds = roleIdList.stream().filter(e -> userRoleIdList.contains(e)).collect(Collectors.toList()); + return !CollectionUtil.isEmpty(userRoleIds); + } + return false; + } + + /** + * 是否有管理权限 + * + * @param folderId + * @return + */ + @Override + public boolean haveManageAuth(String folderId) { + boolean res = false; + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + res = isManager(); + ExtRepoFolder erf = queryById(folderId); + if (null != erf) { + res = res || getStringList(erf.getAuthManageIds()).contains(sysUser.getId()); + } + return res; + } + + /** + * 是否有查看权限 + * + * @param folderId + * @return + */ + public boolean haveViewAuth(String folderId) { + boolean res = false; + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + res = isManager(); + ExtRepoFolder erf = queryById(folderId); + if (null != erf) { + res = res || getStringList(erf.getAuthManageIds()).contains(sysUser.getId()) + || getStringList(erf.getAuthViewIds()).contains(sysUser.getId()); + } + return false; + + } + } From aa90dfd75dcf0d5b94f94b062a029cdd5d0df0ad Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 28 Jul 2022 16:17:07 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 23959c9af..bd813e019 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -96,7 +96,7 @@ @change="onChange" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParams.createTime" + v-model="queryParams.time" :disabled="false"/>
@@ -721,8 +721,8 @@ export default { //搜索 searchQuery(item) { this.pageNo = 1 - if(this.queryParams.createTime){ - this.queryParams.createTime = this.queryParams.createTime.join(',') + if(this.queryParams.time){ + this.queryParams.time = this.queryParams.time.join(',') } this.loadData(item) }, @@ -792,12 +792,12 @@ export default { this.parameter.menu_id = this.menuId }, onChange(value,dateString){ - if (this.queryParams.createTime && this.queryParams.createTime.length > 0) { + if (this.queryParams.time && this.queryParams.time.length > 0) { let dateOne = moment(dateString[0]).format('YYYY-MM-DD') let dateTwo = moment(dateString[1]).format('YYYY-MM-DD') - this.queryParams.createTime = [dateOne, dateTwo] + this.queryParams.time = [dateOne, dateTwo] } else { - this.queryParams.createTime = [] + this.queryParams.time = [] // this.queryParamOne[item + '_name'] = [] } }, From bee93d3caa4b9837618624f86d8ed5e4cb2a9602 Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 28 Jul 2022 16:39:11 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86sql=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 9943d9847..7baf9a923 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -506,3 +506,9 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484136976973825', '1539426795780005889', '新增', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:40:37', NULL, NULL, 0, 0, '1', 0, 'Add'); UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '上报库管理', `url` = '/escalationlibrary', `component` = 'parameter/escalationlibrary/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:report:page', `perms_type` = '1', `sort_no` = 3.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 10:05:03', `update_by` = 'admin', `update_time` = '2022-07-28 10:52:00', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Escalation library management' WHERE `id` = '1539429224550457346'; UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数导出模板管理', `url` = '/Parameterexport', `component` = 'parameter/parameterexport/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'report:exportTemplate:page', `perms_type` = '1', `sort_no` = 2.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 09:55:24', `update_by` = 'admin', `update_time` = '2022-07-28 10:40:02', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter export template management' WHERE `id` = '1539426795780005889'; + +-- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境 +INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL); + +-- 菜单管理 添加对外报告文件夹管理按钮权限 2022-07-28 已同步生产环境 +INSERT INTO `sys_permission` VALUES ('1552182885208608770', '1549937961282908162', '对外报告文件夹管理', '', NULL, NULL, NULL, 2, 'externalReports:folder', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-7-27 14:43:33', NULL, NULL, 0, 0, '1', 0, 'External Report Folder Management '); From de5ac6c08e8f143a61325317245f368d978cbf2f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 28 Jul 2022 17:06:13 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/package.json | 1 + .../components/documentTranslationResults.vue | 65 ++++++++++++++++--- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/jero-web/package.json b/jero-web/package.json index da4e81b29..895530955 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -28,6 +28,7 @@ "jsencrypt": "^3.0.0-rc.1", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", + "mammoth": "^1.4.21", "md5": "^2.2.1", "nprogress": "^0.2.0", "tinymce": "^5.3.2", diff --git a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue index ae67c40a1..a1b5d4d06 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue @@ -18,18 +18,22 @@
+ {{$t('dataLoading')}}
{{$t('translatedText')}}
- +
+ {{$t('dataLoading')}}
@@ -39,6 +43,10 @@