diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 254824c4f..7b38ef329 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -439,3 +439,58 @@ CREATE TABLE `laws_weilai`.`doc_translation` ( `target_file_id` varchar(4000) 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; + +-- 文档翻译-源语言数据字典 +INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550306517749547010', '文档翻译-翻译语言-源语言', 'source_language', '文档翻译-翻译语言-源语言', 0, 'admin', '2022-07-22 10:27:32', 'admin', '2022-07-22 10:29:17', NULL, NULL, 1, 0, '1', 2); + +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('155030756958032691412', '1550306517749547010', '中文', 'zh', '中文', 2, 1, 'admin', '2022-07-22 10:31:43', 'admin', '2022-07-22 10:31:59', 1, NULL, NULL, '0', 'Chinese'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('155030763691987763313', '1550306517749547010', '英文', 'en', '英文', 1, 1, 'admin', '2022-07-22 10:31:59', NULL, NULL, 1, NULL, NULL, '0', 'English'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('155030778369954611414', '1550306517749547010', '日语', 'ja', '日语', 3, 1, 'admin', '2022-07-22 10:32:34', NULL, NULL, 1, NULL, NULL, '0', 'Japanese'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('155030790598028493015', '1550306517749547010', '俄语', 'ru', '俄语', 4, 1, 'admin', '2022-07-22 10:33:03', NULL, NULL, 1, NULL, NULL, '0', 'Russian'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('155030797657042124916', '1550306517749547010', '德语', 'de', '德语', 5, 1, 'admin', '2022-07-22 10:33:20', 'admin', '2022-07-22 10:34:58', 1, NULL, NULL, '0', 'German'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503088022275522577', '1550306517749547010', '法语', 'fr', '法语', 6, 1, 'admin', '2022-07-22 10:36:36', NULL, NULL, 1, NULL, NULL, '0', 'French'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503112074344038418', '1550306517749547010', '意大利语', 'it', '意大利语', 7, 1, 'admin', '2022-07-22 10:46:10', NULL, NULL, 1, NULL, NULL, '0', 'Italian'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503112704622100509', '1550306517749547010', '波兰语', 'pl', '波兰语', 8, 1, 'admin', '2022-07-22 10:46:25', NULL, NULL, 1, NULL, NULL, '0', 'Polish'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503114101073674251', '1550306517749547010', '泰语', 'th', '泰语', 9, 1, 'admin', '2022-07-22 10:46:58', NULL, NULL, 1, NULL, NULL, '0', 'Thai language'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503115557294080012', '1550306517749547010', '印地语', 'hi', '印地语', 11, 1, 'admin', '2022-07-22 10:47:33', NULL, NULL, 1, NULL, NULL, '0', 'Hindi'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503116395022417943', '1550306517749547010', '印尼语', 'id', '印尼语', 12, 1, 'admin', '2022-07-22 10:47:53', NULL, NULL, 1, NULL, NULL, '0', 'Indonesian'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503117185522892814', '1550306517749547010', '西班牙语', 'es', '西班牙语', 13, 1, 'admin', '2022-07-22 10:48:12', NULL, NULL, 1, NULL, NULL, '0', 'Spanish language'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503118402584084505', '1550306517749547010', '葡萄牙语', 'pt', '葡萄牙语', 17, 1, 'admin', '2022-07-22 10:48:41', 'admin', '2022-07-22 10:49:21', 1, NULL, NULL, '0', 'Portuguese'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503119403009474586', '1550306517749547010', '朝鲜语', 'ko', '朝鲜语', 15, 1, 'admin', '2022-07-22 10:49:05', NULL, NULL, 1, NULL, NULL, '0', 'Korean'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503120084961361947', '1550306517749547010', '越南语', 'vi', '越南语', 16, 1, 'admin', '2022-07-22 10:49:21', NULL, NULL, 1, NULL, NULL, '0', 'Vietnamese'); + +-- 文档翻译-目标语言数据字典 +INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550306581909815297', '文档翻译-翻译语言-目标语言', 'target_language', '文档翻译-翻译语言-目标语言', 0, 'admin', '2022-07-22 10:27:47', 'admin', '2022-07-22 10:29:13', NULL, NULL, 1, 0, '1', 1); + +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503075695803269141', '1550306581909815297', '中文', 'zh', '中文', 2, 1, 'admin', '2022-07-22 10:31:43', 'admin', '2022-07-22 10:31:59', 1, NULL, NULL, '0', 'Chinese'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503076369198776331', '1550306581909815297', '英文', 'en', '英文', 1, 1, 'admin', '2022-07-22 10:31:59', NULL, NULL, 1, NULL, NULL, '0', 'English'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503077836995461141', '1550306581909815297', '日语', 'ja', '日语', 3, 1, 'admin', '2022-07-22 10:32:34', NULL, NULL, 1, NULL, NULL, '0', 'Japanese'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503079059802849301', '1550306581909815297', '俄语', 'ru', '俄语', 4, 1, 'admin', '2022-07-22 10:33:03', NULL, NULL, 1, NULL, NULL, '0', 'Russian'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503079765704212491', '1550306581909815297', '德语', 'de', '德语', 5, 1, 'admin', '2022-07-22 10:33:20', 'admin', '2022-07-22 10:34:58', 1, NULL, NULL, '0', 'German'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550308802227552257', '1550306581909815297', '法语', 'fr', '法语', 6, 1, 'admin', '2022-07-22 10:36:36', NULL, NULL, 1, NULL, NULL, '0', 'French'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311207434403841', '1550306581909815297', '意大利语', 'it', '意大利语', 7, 1, 'admin', '2022-07-22 10:46:10', NULL, NULL, 1, NULL, NULL, '0', 'Italian'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311270462210050', '1550306581909815297', '波兰语', 'pl', '波兰语', 8, 1, 'admin', '2022-07-22 10:46:25', NULL, NULL, 1, NULL, NULL, '0', 'Polish'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311410107367425', '1550306581909815297', '泰语', 'th', '泰语', 9, 1, 'admin', '2022-07-22 10:46:58', NULL, NULL, 1, NULL, NULL, '0', 'Thai language'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311555729408001', '1550306581909815297', '印地语', 'hi', '印地语', 11, 1, 'admin', '2022-07-22 10:47:33', NULL, NULL, 1, NULL, NULL, '0', 'Hindi'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311639502241794', '1550306581909815297', '印尼语', 'id', '印尼语', 12, 1, 'admin', '2022-07-22 10:47:53', NULL, NULL, 1, NULL, NULL, '0', 'Indonesian'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311718552289281', '1550306581909815297', '西班牙语', 'es', '西班牙语', 13, 1, 'admin', '2022-07-22 10:48:12', NULL, NULL, 1, NULL, NULL, '0', 'Spanish language'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311840258408450', '1550306581909815297', '葡萄牙语', 'pt', '葡萄牙语', 17, 1, 'admin', '2022-07-22 10:48:41', 'admin', '2022-07-22 10:49:21', 1, NULL, NULL, '0', 'Portuguese'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311940300947458', '1550306581909815297', '朝鲜语', 'ko', '朝鲜语', 15, 1, 'admin', '2022-07-22 10:49:05', NULL, NULL, 1, NULL, NULL, '0', 'Korean'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550312008496136194', '1550306581909815297', '越南语', 'vi', '越南语', 16, 1, 'admin', '2022-07-22 10:49:21', NULL, NULL, 1, NULL, NULL, '0', 'Vietnamese'); + +-- 文档翻译-发布情况数据字典 +INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550314527293128705', '文档翻译-发布情况', 'release_condition', '文档翻译-发布情况', 0, 'admin', '2022-07-22 10:59:21', 'admin', '2022-07-22 11:01:07', NULL, NULL, 1, 0, '1', 2); + +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314666682433537', '1550314527293128705', '已发布', 'published', '已发布', 1, 1, 'admin', '2022-07-22 10:59:55', NULL, NULL, 1, NULL, NULL, '0', 'Have published'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314731320852482', '1550314527293128705', '草稿', 'draft', '草稿', 2, 1, 'admin', '2022-07-22 11:00:10', NULL, NULL, 1, NULL, NULL, '0', 'Draft'); + +-- 文档翻译-翻译结果数据字典 +INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550314971079852034', '文档翻译-翻译结果', 'translation_result', '文档翻译-翻译结果', 0, 'admin', '2022-07-22 11:01:07', NULL, NULL, NULL, NULL, 1, 0, '1', 1); + +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550315090797871105', '1550314971079852034', '翻译中', 'In the translation', '翻译中', 1, 1, 'admin', '2022-07-22 11:01:36', NULL, NULL, 1, NULL, NULL, '0', 'In the translation'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550315193285689345', '1550314971079852034', '翻译完成', 'Translation done', '翻译完成', 2, 1, 'admin', '2022-07-22 11:02:00', NULL, NULL, 1, NULL, NULL, '0', 'Translation done'); + +-- 文档翻译表-增加字段 编号、标题 +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`; 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 346534b85..50ebb976f 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 @@ -49,7 +49,6 @@ import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; -import com.jero.modules.split.common.ReadExcel; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; @@ -2009,7 +2008,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl下载。"; - String contentInfo = "您导出的" + paramsCollectManifestVO.getExportName() + "已经生成完毕，请点击" + href; + String href = "download."; + String contentInfo = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click " + href; SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); @@ -2154,14 +2153,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); String dbFieldName = onlCgformField.getDbFieldName(); if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName) && !"description".equals(dbFieldName)) { dbFieldList.add(dbFieldName); @@ -2216,7 +2214,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { dbFieldListCC.add(sysDictItem.getItemValue()); - dbFieldNameListCC.add(sysDictItem.getItemText() + " 编号"); + dbFieldNameListCC.add(sysDictItem.getItemText() + "编号"); }); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 9bacd0c8d..2bd69698c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -151,4 +151,6 @@ public interface SysUserMapper extends BaseMapper { List queryByDepIds(@Param("departIds")List departIds,@Param("username") String username); List getPPEmployeeList(@Param("thirdType") String thirdType); + + void updateByIdPP (SysUser sysUser); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 6c22a7661..ee3c91cde 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -200,4 +200,26 @@ select * from sys_user where third_type = #{thirdType} + + UPDATE + sys_user + SET + username = #{username}, + realname = #{realname}, + status = #{status}, + del_flag = #{delFlag}, + third_id = #{thirdId}, + work_no = #{workNo}, + worker_type = #{workerType}, + create_time = #{createTime}, + update_time = #{updateTime}, + job_code = #{jobCode}, + job_title = #{jobTitle}, + org_code = #{orgCode}, + email = #{email}, + telephone = #{telephone} + WHERE + id = #{id} + + 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 2783d1166..04d975382 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 @@ -562,7 +562,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } - updateById(sysUser); + this.baseMapper.updateByIdPP(sysUser); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java index 3383c9982..1ffb02b43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class DocTranslationEOController extends JeroController { @Autowired private IDocTranslationEOService docTranslationEOService; - + /** * 分页列表查询 * @@ -51,11 +51,12 @@ public class DocTranslationEOController extends JeroController queryPageList(DocTranslationEO docTranslationEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut", defaultValue="cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = docTranslationEOService.page(page, queryWrapper); - return Result.OK(pageList); + return Result.OK(cut,pageList); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java index b6ca2dbff..442d9d205 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java @@ -1,8 +1,6 @@ package com.jero.modules.docTranslation.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; @@ -15,8 +13,6 @@ 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: 文档翻译表 @@ -66,7 +62,18 @@ public class DocTranslationEO implements Serializable { @ApiModelProperty(value = "文档库id") private java.lang.String bussDocumentLibraryId; + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private String title; + /**文本状态*/ + @Dict(dicCode = "state") @Excel(name = "文本状态", width = 15) @ApiModelProperty(value = "文本状态") private java.lang.String textStatus; @@ -77,16 +84,19 @@ public class DocTranslationEO implements Serializable { private java.lang.String fileName; /**翻译前语言(源语言)*/ + @Dict(dicCode = "source_language") @Excel(name = "翻译前语言(源语言)", width = 15) @ApiModelProperty(value = "翻译前语言(源语言)") private java.lang.String sourceLanguage; /**翻译后语言(目标语言)*/ + @Dict(dicCode = "target_language") @Excel(name = "翻译后语言(目标语言)", width = 15) @ApiModelProperty(value = "翻译后语言(目标语言)") private java.lang.String targetLanguage; /**翻译结果*/ + @Dict(dicCode = "translation_result") @Excel(name = "翻译结果", width = 15) @ApiModelProperty(value = "翻译结果") private java.lang.String translationResult; @@ -99,6 +109,7 @@ public class DocTranslationEO implements Serializable { private java.util.Date translationTime; /**发布情况*/ + @Dict(dicCode = "release_condition") @Excel(name = "发布情况", width = 15) @ApiModelProperty(value = "发布情况") private java.lang.String releaseCondition; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java new file mode 100644 index 000000000..bba19ad94 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java @@ -0,0 +1,63 @@ +package com.jero.modules.docTranslation.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 发布情况枚举类 + */ +public enum ReleaseConditionEnum { + + PUBLISHED("已发布","published","Have published"), + DRAFT("草稿","draft","Draft"), + ; + + + String cnName; + String enName; + String value; + + private ReleaseConditionEnum(String cnName, String value, String enName) { + this.cnName = cnName; + this.value = value; + this.enName = enName; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + 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 static String getTextByValue(String value,String cut) { + ReleaseConditionEnum[] values = values(); + for (ReleaseConditionEnum releaseConditionEnum : values) { + if (releaseConditionEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return releaseConditionEnum.cnName; + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + return releaseConditionEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/TranslationResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/TranslationResultEnum.java new file mode 100644 index 000000000..18c3a13f9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/enums/TranslationResultEnum.java @@ -0,0 +1,63 @@ +package com.jero.modules.docTranslation.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 翻译结果枚举类 + */ +public enum TranslationResultEnum { + + IN_THE_TRANSLATION("翻译中","In the translation","In the translation"), + TRANSLATION_DONE("翻译完成","Translation done","Translation done"), + ; + + + String cnName; + String enName; + String value; + + private TranslationResultEnum(String cnName, String value, String enName) { + this.cnName = cnName; + this.value = value; + this.enName = enName; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + 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 static String getTextByValue(String value,String cut) { + TranslationResultEnum[] values = values(); + for (TranslationResultEnum translationResultEnum : values) { + if (translationResultEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return translationResultEnum.cnName; + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + return translationResultEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java index 344364cc1..20b0115d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java @@ -1,12 +1,19 @@ package com.jero.modules.docTranslation.service.impl; import com.jero.modules.docTranslation.entity.DocTranslationEO; +import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.docTranslation.enums.TranslationResultEnum; import com.jero.modules.docTranslation.mapper.DocTranslationEOMapper; import com.jero.modules.docTranslation.service.IDocTranslationEOService; +import com.jero.modules.docTranslation.utils.TranslationDocumentUtils; +import com.jero.modules.oss.entity.OSSFile; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; + +import java.util.*; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 文档翻译表 @@ -15,6 +22,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class DocTranslationEOServiceImpl extends ServiceImpl implements IDocTranslationEOService { /** @@ -28,7 +36,16 @@ public class DocTranslationEOServiceImpl extends ServiceImpl sourceFileList = iossFileService.getFileInfos(sourceFileId); + + if(CollectionUtils.isNotEmpty(sourceFileList)){ + OSSFile sourceOssFile = sourceFileList.get(0); + String translateFrontText = ReadWordUtil.readWord(sourceOssFile.getUrl(),uploadpath); + + String translateAfter =""; + StringBuffer translateAfterSb = new StringBuffer(); + + String tenantAccessToken = ""; + try { + tenantAccessToken = feishuService.getTenantAccessToken(); + } catch (IOException e) { + e.printStackTrace(); + } + + Map feishuTranslateParamsMap = new HashMap<>(); + feishuTranslateParamsMap.put("sourceLanguage",docTranslationEO.getSourceLanguage()); + feishuTranslateParamsMap.put("targetLanguage",docTranslationEO.getTargetLanguage()); + feishuTranslateParamsMap.put("tenantAccessToken",tenantAccessToken); + + //分隔长度 + int splitLength = 1000; + if(translateFrontText.length() > splitLength){ + //计算出能分隔几次 + int translateArrLength = translateFrontText.length() / splitLength + 1; + String translateFrontTextSplit = ""; + for (int i = 0; i < translateArrLength; i ++){ + if(i == 0){ + translateFrontTextSplit = translateFrontText.substring(0,splitLength); + }else { + //如果长度不够根据splitLength再截取一次。 + if(translateFrontText.length() < i*splitLength+(splitLength+1)){ + translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),translateFrontText.length()); + }else { + translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),i*splitLength+(splitLength+1)); + } + } + + feishuTranslateParamsMap.put("translateFrontText",translateFrontTextSplit); + translateAfter = feishuService.translateText(feishuTranslateParamsMap); + translateAfterSb.append(translateAfter); + } + }else { + feishuTranslateParamsMap.put("translateFrontText",translateFrontText); + translateAfter = feishuService.translateText(feishuTranslateParamsMap); + translateAfterSb.append(translateAfter); + } + + logger.debug("源文本：\n" + translateFrontText); + logger.debug("翻译后文本：\n" + translateAfter); + + //翻译后的文件路径 + String translateAfterFilePath = uploadpath + "/tempZip/translationTempFile"; + try { + translateAfterFile = createTranslateAfterFile(translateAfterFilePath, translateAfterSb.toString(),sourceOssFile.getFileName()); + } catch (Exception ex) { + ex.printStackTrace(); + logger.error("翻译文档-写入文档失败：" + ex.getMessage()); + } + } + + return translateAfterFile; + } + + /** + * 创建翻译后的文件，把翻译后的语言放进去。 + * @param translateAfterFilePath + * @throws Exception + */ + public static OSSFile createTranslateAfterFile(String translateAfterFilePath,String translateAfter,String fileName) throws Exception{ + OSSFile ossFile = null; + File newFilePath = new File(translateAfterFilePath); + if (!newFilePath.exists()) { + newFilePath.mkdirs(); + } + translateAfterFilePath = translateAfterFilePath + "/" + fileName; + File newFile = new File(translateAfterFilePath); + if (!newFile.exists()) { + newFile.createNewFile(); + } + try { + FileOutputStream out = new FileOutputStream(newFile); + + MultipartFile multipartFile = createMfileByPath(translateAfterFilePath); + ossFile = iossFileService.uploadLocalOfCos(multipartFile, "", null, null); + out.write(translateAfter.getBytes("UTF-8")); + out.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + }finally { + //将翻译后的本地文件删除 + File file = new File(translateAfterFilePath); + FileUtil.deleteContents(file); + } + return ossFile; + } + + /** + * 根据路径创建文件 + * @param translateAfterFilePath + * @return + */ + private static MultipartFile createMfileByPath(String translateAfterFilePath) { + MultipartFile mFile = null; + try { + File file = new File(translateAfterFilePath); + FileInputStream fileInputStream = new FileInputStream(file); + + String fileName = file.getName(); + fileName = fileName.substring((fileName.lastIndexOf(File.separator) + 1)); + mFile = new MockMultipartFile(fileName, fileName, ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream); + } catch (Exception ex) { + ex.printStackTrace(); + logger.error("封装文件出现错误：{}", ex.getMessage()); + } + return mFile; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java index 425e8aad1..0a857879d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -3,6 +3,7 @@ package com.jero.modules.feishu.service; import com.jero.modules.feishu.vo.FeishuMsgVo; import java.io.IOException; +import java.util.Map; /** * @Author: liyawei @@ -35,4 +36,11 @@ public interface IFeishuService { * @return */ String sendCardMsg(String[] userIds, FeishuMsgVo feishuMsgVo) throws IOException; + + /** + * 翻译文本 + * @param params + * @return + */ + String translateText(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index f5aa0fc96..df3ed86d6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -37,6 +37,9 @@ public class FeishuServiceImpl implements IFeishuService { @Value("${Feishu.batchSendMessageUrl}") private String batchSendMessageUrl; + @Value("${Feishu.translateTextUrl}") + private String translateTextUrl; + /** * 获取token * @return @@ -238,4 +241,69 @@ public class FeishuServiceImpl implements IFeishuService { return tokenJson.get("msg").toString(); } + /** + * 翻译文本 + * 参数： + * params:{ + * "translateFrontText":"翻译前文本", + * "sourceLanguage":"源语言", + * "targetLanguage":"目标语言", + * "tenantAccessToken":"登录令牌(飞书token)", + * } + */ + @Override + public String translateText(Map params) { + String result = null; + + String translateFrontText = (String) params.get("translateFrontText"); + String sourceLanguage = (String) params.get("sourceLanguage"); + String targetLanguage = (String) params.get("targetLanguage"); + String tenantAccessToken = (String) params.get("tenantAccessToken"); + + Map headerMap = new HashMap<>(); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + headerMap.put("Authorization", "Bearer "+tenantAccessToken); + + List> glossaryList = new ArrayList<>(); + Map glossaryMap = new HashMap<>(); + glossaryMap.put("from","飞书"); + glossaryMap.put("to","Lark"); + glossaryList.add(glossaryMap); + + Map paramsMap = new HashMap<>(); + //请求级术语表，携带术语，仅在本次翻译中生效（最多能携带 128个术语词） + paramsMap.put("glossary", glossaryList); + //源语言 + paramsMap.put("source_language", sourceLanguage); + //源文本 + paramsMap.put("text", translateFrontText); + //目标语言 + paramsMap.put("target_language", targetLanguage); + + try { + String response = null; + response = HttpRequestUtil.getResponseOfPOST(translateTextUrl, headerMap, JSON.toJSONString(paramsMap)); + //返回结果样例： {"code":0,"data":{"text":"Try using Lark."},"msg":"Success"} + JSONObject translateAfterJson = JSONObject.parseObject(response); + + if(response != null && translateAfterJson != null){ + if(!translateAfterJson.get("code").toString().equals("0")) { + result = null; + } + result = JSONObject.parseObject(translateAfterJson.get("data").toString()).getString("text"); + }else { + //如果出现了异常，把翻译前的文本返回 + result = translateFrontText; + } + + } catch (IOException ex) { + //如果出现了异常，把翻译前的文本返回 + result = translateFrontText; + ex.printStackTrace(); + log.error("飞书翻译-文本翻译失败：{}",ex.getMessage()); + } + + return result; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index 3679cf031..5e5acc773 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -36,6 +36,8 @@ import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,6 +49,7 @@ import javax.servlet.http.HttpServletResponse; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl implements ILawsOpinionAssessmentResultEOService { @Value(value = "${jero.path.upload}") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 3107550fb..d966397cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -23,6 +23,8 @@ import java.util.Date; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 法规意见收集表 @@ -31,6 +33,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsOpinionGatherEOServiceImpl extends ServiceImpl implements ILawsOpinionGatherEOService { @Autowired diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java index ec91475dc..f6fbb3dba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java @@ -28,6 +28,8 @@ import java.util.Date; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; @@ -38,6 +40,7 @@ import javax.servlet.http.HttpServletRequest; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsProcessHistoryEOServiceImpl extends ServiceImpl implements ILawsProcessHistoryEOService { @Autowired diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 05c434846..79646a533 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -410,14 +410,18 @@ people: ## Feishu Feishu: # 测试 - appId: cli_a16d47ca9f381013 - appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe +# appId: cli_a16d47ca9f381013 +# appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe + + appId: cli_a25c9fdae5bc100c + appSecret: zIS7BLzcWaFvlpdz7CqRJbwVml4g4ESy # 正式 # appId: cli_a2a1a6014679500d # appSecret: AeHwisC82S0fhiREJg6bkdxhIZMevnZZ getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/ + translateTextUrl: https://open.feishu.cn/open-apis/translation/v1/text/translate local-tool: uri: http://139.9.235.66:9022 opensso: diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 423f7bcbd..c1c5b2d4a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -38,7 +38,7 @@ module.exports = { serialNumber: 'Number', userAccount: 'User Account', userName: 'User Name', - Department: 'Department', + department: 'Department', status: 'Status', Operation: 'Operation', aRcord: 'A Rcord', @@ -1168,4 +1168,9 @@ module.exports = { fullTextComments:'Full text comments', fileDeclaration:'file Declaration', FileForDetails:'File For Details', + Converting:'Converting', + convertNetwork:'Convert Network', + convertFailed:'Convert Failed', + standardData:'Standard Data', + Theorganization:'The Organization', } \ 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 30aeaec72..43142beb5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1172,4 +1172,9 @@ module.exports = { fullTextComments:'全文评论', fileDeclaration:'文件说明', FileForDetails:'文件详情', + Converting:'转换中', + convertNetwork:'转换完成', + convertFailed:'转换失败', + standardData:'标准数据', + Theorganization:'组织机构', } \ No newline at end of file diff --git a/jero-web/src/components/exportTree/index.vue b/jero-web/src/components/exportTree/index.vue deleted file mode 100644 index fa269e4b0..000000000 --- a/jero-web/src/components/exportTree/index.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue new file mode 100644 index 000000000..7237ce8f6 --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -0,0 +1,365 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue new file mode 100644 index 000000000..2838e708c --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -0,0 +1,366 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue new file mode 100644 index 000000000..9ba6c282c --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue @@ -0,0 +1,318 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 28593c4e6..fddde2cf3 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -23,15 +23,15 @@
-
- {{$t('releaseSituation')}} +
+ {{$t('translationResults')}}
- - + @@ -41,19 +41,53 @@
+ {{$t('query')}} {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + +
-
- - {{$t('initiateComparison')}} +
+ + {{$t('upload1')}} +
+
+ + {{$t('RetrieveFiles')}} +
+
+ + {{$t('BatchDelete')}}
@@ -93,24 +127,32 @@ />
+ + diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 329442c47..f261141e4 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -1,47 +1,106 @@ - + + \ No newline at end of file diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 45f381221..b44f2bb1a 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -57,13 +57,34 @@ + +
+
+ {{ $t('department') }} +
+ + + + + +
+ {{$t('query')}} {{$t('reset')}} - {{ toggleSearchStatus ? $t('open') : $t('away') }} + {{ toggleSearchStatus ? $t('away') : $t('open') }} @@ -141,7 +162,7 @@ import DepartmentAllocation from './modules/departmentAllocation' import UserModal from './modules/UserModal' import PasswordModal from './modules/PasswordModal' - import { putAction, getFileAccessHttpUrl } from '@/api/manage' + import {getAction, putAction, getFileAccessHttpUrl } from '@/api/manage' import { frozenBatch } from '@/api/api' import { JeroListMixin } from '@/mixins/JeroListMixin' import JInput from '@/components/jero/JInput' @@ -174,6 +195,18 @@ departmentvisible: false, // 部门配置得弹框 selectedRowKeys: [], selectedRowKeysvalue: [], + CategoryTreeList:[], + ipagination: { + current: 1, + pageSize: 10, + pageSizeOptions: ['10', '30', '50', '100'], + showTotal: (total, range) => { + return range[0] + '-' + range[1] + ' 共' + total + '条' + }, + showQuickJumper: true, + showSizeChanger: true, + total: 0 + }, columns: [ { title: this.$t('serialNumber'), @@ -259,6 +292,7 @@ list: '/sys/user/page', delete: '/sys/user/delete', deleteBatch: '/sys/user/deleteBatch', + getSysCategoryTree: '/sys/sysDepart/queryTreeList', exportXlsUrl: '/sys/user/exportXls', importExcelUrl: 'sys/user/importExcel' } @@ -269,6 +303,9 @@ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` } }, + mounted() { + this.getSysCategoryTree() + }, methods: { // 重置密码 resetPassword(val) { @@ -368,6 +405,15 @@ }) } }, + getSysCategoryTree() { + getAction(this.url.getSysCategoryTree, {}).then((res) => { + if (res.success) { + this.CategoryTreeList = res.result + } else { + this.CategoryTreeList = [] + } + }) + }, handleMenuClick(e) { if (e.key == 1) { this.batchDel() diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index fe741c908..d0ddf3695 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -156,7 +156,7 @@ + v-decorator="[ 'telephone', validatorRules.telephone]"/>