diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 95420e13b..d3b171032 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -495,7 +495,7 @@ 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 +-- 菜单管理 添加上报库按钮 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'); @@ -506,6 +506,7 @@ 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'; +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 ('1554745894282264577', '1552487412749369345', '保存', NULL, NULL, NULL, NULL, 2, 'report:detail:export:save', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-08-03 16:28:02', NULL, NULL, 0, 0, '1', 0, 'Save'); -- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境 INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL); @@ -550,7 +551,178 @@ CREATE TABLE `ext_repo_data` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- 参数项收集清单 认证类别取消列表显示 2022-08-02 +-- 参数项收集清单 认证类别取消列表显示 2022-08-02 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0, `update_by` = 'admin', `update_time` = '2022-08-02 09:36:09' WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390'; + +-- 问题知识库开发。 +-- Country Card模板维护表 2022-08-02 已同步生产环境 +CREATE TABLE `laws_weilai`.`country_card_temp` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `lable_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称', + `lable_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签类型', + `order_num` int(11) NULL DEFAULT NULL COMMENT '展示顺序', + `relevant_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联网址', + `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护表' ROW_FORMAT = Dynamic; + +-- Country Card模板维护-字典项表 2022-08-02 已同步生产环境 +CREATE TABLE `laws_weilai`.`country_card_temp_item` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板维护表id', + `item_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项值', + `item_text` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项中文名称', + `en_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项英文名称', + `del_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '逻辑删除标识', + `status` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1启用 0不启用）', + `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护-字典项表' ROW_FORMAT = Dynamic; + +-- 问题知识库-分类表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_classify` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_label` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题标签', + `charge_person_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-分类表' ROW_FORMAT = Dynamic; + +-- 问题知识库表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题', + `problem_type` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题分类', + `target_market` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市场', + `buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id', + `stand_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号', + `stand_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题', + `content` blob NULL COMMENT '内容（正文）', + `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件', + `show_permissions` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示权限', + `release_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布人id', + `release_time` datetime NULL DEFAULT NULL COMMENT '发布日期', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库表' ROW_FORMAT = Dynamic; + +-- 问题知识库展示权限表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_user` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库展示权限表' ROW_FORMAT = Dynamic; + +-- 问题知识库评论表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_comment` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `comment_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论内容', + `comment_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论用户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库评论表' ROW_FORMAT = Dynamic; + +-- 问题知识库浏览历史表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_browsing_history` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `browsing_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览人员id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库浏览历史表' ROW_FORMAT = Dynamic; + +-- 问题知识库点赞表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_praise` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `praise_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '点赞人员id', + `praise_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '点赞状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库点赞表' ROW_FORMAT = Dynamic; + +-- 问题知识库收藏表 2022-08-03 已同步生产环境 +CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id', + `collect_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏用户id', + `collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic; + +-- 参数清单 添加字段 2022-08-04 已同步生产环境 +ALTER TABLE `laws_weilai`.`params_manifest` + ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `params_template_publish_version`; +ALTER TABLE `laws_weilai`.`params_manifest_history` + ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `source_params_manifest_id`; +-- 问题知识库-country_card-管理发布表 2022-08-04 已同步生产环境 +CREATE TABLE `laws_weilai`.`country_card_manage_release` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `apply_market` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '适用市场', + `release_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-country_card-管理发布表' ROW_FORMAT = Dynamic; + +-- 问题知识库-country_card-管理发布明细表 2022-08-04 已同步生产环境 +CREATE TABLE `laws_weilai`.`country_card_manage_release_detail` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `country_card_manage_release_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'country_card管理发布表id', + `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板表id', + `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + `content` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-country_card-管理发布明细表' ROW_FORMAT = Dynamic; diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 3aedad2d8..598e071d8 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -53,3 +53,7 @@ ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id` -- 2022-07-05 修改字段类型 生产环境已同步 ALTER TABLE `project_laws_inventory_log` MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`; + +-- 2022-08-04 修改字段类型 生产环境已同步 +ALTER TABLE `dummy_inventory_info` +MODIFY COLUMN `subtitle` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子标题' AFTER `wvta_id`; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index a57e7db62..dc48bf546 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -151,6 +151,9 @@ public class ShiroConfig { filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon"); // 法规技术评估-条款信息评估结果表 工作流处理数据接口排除 filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/processCall", "anon"); + + filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。 + filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 // 添加自己的过滤器并且取名为jwt diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 6ee8b20a4..c797b78a3 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -23,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -173,15 +172,15 @@ public class ParamsCollectManifestEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { + boolean isSuccess = paramsCollectManifestEOService.deleteBatch(paramsCollectManifestVO); if (isSuccess) { return Result.OK("批量删除成功！"); } else { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 0e5fa32ec..9d9cb0d9b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -94,7 +94,7 @@ public class ParamsManifestEO implements Serializable { @ApiModelProperty(value = "对应参数模板发布版本") private Integer paramsTemplatePublishVersion; - @TableField(exist = false) + @ApiModelProperty(value = "参数模板名称") private String paramsTemplateName; @TableField(exist = false) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index a27b4ca68..12e46fcfd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -43,7 +43,7 @@ pm.project_id as project_id, pm.params_template_id as params_template_id, pm.params_template_publish_version as params_template_publish_version, - pt.params_template_name as params_template_name + if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 8ba0fa9e6..fac103ab5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -43,13 +43,22 @@ public interface IParamsCollectManifestEOService extends IService ids); + + /** + * 批量删除-参数项收集页面级 + * + * @param paramsCollectManifestVO + * @return + */ + boolean deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO); + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index ea5d647c5..cbfd3c68c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -87,4 +87,7 @@ public interface IParamsManifestEOService extends IService { List> labelListForProjectDetails(String projectId); Map getStatisticsForProjectDetails(String paramsManifestId, String cut); + + // 参数模板删除时，记录参数模板名称到清单 + boolean setTemplateName(List paramsTemplateIds); } 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 91bfb3d99..9efca35d4 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 @@ -235,7 +235,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl ids = Arrays.asList(paramsCollectManifestVO.getIds().split(",")); + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + + // 删除参数项 + boolean isSuccess = removeByIds(ids); + // 关联删除配置数据 + paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids); + + // 判断清单收集状态 + Map map = isCollectFinished(paramsManifestId); + Boolean finish = (Boolean) map.get("finish"); + Date time = (Date) map.get("time"); + if (finish) { + // 更新清单状态和完成时间 + ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); + updateParamsManifestEO.setId(paramsManifestId); + updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue()); + updateParamsManifestEO.setFinishTime(time); + boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO); + if (isSuccess2) { + webSocketServer.sendMessage(); + } + } + + return isSuccess; + } + /** * 通过id查询 * @@ -1901,6 +1936,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsTemplateIds) { + List updateManifestEOList = new ArrayList<>(); + + // 查询被删除模板信息 + LambdaQueryWrapper paramsTemplateEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + paramsTemplateEOLambdaQueryWrapper.in(ParamsTemplateEO::getId, paramsTemplateIds); + List paramsTemplateEOList = paramsTemplateEOService.list(paramsTemplateEOLambdaQueryWrapper); + List paramsTemplateIdList = paramsTemplateEOList.stream().map(ParamsTemplateEO::getId).collect(Collectors.toList()); + + // 查询被删除模板的所有清单 + LambdaQueryWrapper paramsManifestEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + paramsManifestEOLambdaQueryWrapper.in(ParamsManifestEO::getParamsTemplateId, paramsTemplateIdList); + List paramsManifestEOList = list(paramsManifestEOLambdaQueryWrapper); + + paramsTemplateEOList.forEach(templateEO-> { + // 查询使用该模板的所有清单 + List paramsManifestEOS = paramsManifestEOList.stream() + .filter(e-> templateEO.getId().equals(e.getParamsTemplateId())) + .collect(Collectors.toList()); + + paramsManifestEOS.forEach(manifestEO -> { + ParamsManifestEO updateManifestEO = new ParamsManifestEO(); + updateManifestEO.setId(manifestEO.getId()); + updateManifestEO.setParamsTemplateName(templateEO.getParamsTemplateName()); + updateManifestEO.setFinishTime(manifestEO.getFinishTime()); + + updateManifestEOList.add(updateManifestEO); + }); + + }); + return updateBatchById(updateManifestEOList); + } + private void getData(List> data, double quantity, String percentage) { Map map = new HashMap<>(); map.put("quantity", quantity); 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 8906be54b..0a0b444a8 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 @@ -22,10 +22,7 @@ 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; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -197,4 +194,23 @@ public class ParamsReportDetailEOController extends JeroController save(@RequestBody ParamsReportDetailVO paramsReportDetailVO) { + boolean isSuccess = paramsReportDetailEOService.save(paramsReportDetailVO.getConfigDataList(), paramsReportDetailVO.getParamsManifestId()); + if (isSuccess) { + return Result.OK("保存成功！"); + } else { + return Result.error("保存失败！"); + } + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index 16dce9473..dc3818c1d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -23,4 +23,11 @@ public interface IParamsReportConfigDataEOService extends IService queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId); + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + List queryListByConfigIdList(List configIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java index 4c0d18c9c..076a08978 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java @@ -1,7 +1,8 @@ package com.jero.modules.cert.report.service; -import com.jero.modules.cert.report.entity.ParamsReportConfigEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.report.entity.ParamsReportConfigEO; + import java.util.List; /** @@ -12,5 +13,10 @@ import java.util.List; */ public interface IParamsReportConfigEOService extends IService { + /** + * 列表查询 + * @param paramsManifestId + * @return + */ List queryList(String paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 551b001b1..9f377b597 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -56,4 +56,7 @@ public interface IParamsReportDetailEOService extends IService> configDataList, String paramsManifestId); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index ac69c6438..cce1ae4ed 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; @@ -38,4 +39,20 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId) { return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId); } + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + @Override + public List queryListByConfigIdList(List configIdList) { + if (CollectionUtil.isNotEmpty(configIdList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportConfigDataEO::getParamsConfigId, configIdList); + return list(queryWrapper); + } + return null; + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 7810e4dd3..5dffa3509 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.report.entity.*; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.*; @@ -422,8 +423,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> getTemplateLabelList() { // 查询所有导出模板 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime); + queryWrapper.eq(ParamsExportTemplateEO::getState, ExportTemplateStateEnum.ENABLE.getValue()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); List paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper); List> templateLabelList = new ArrayList<>(); @@ -1366,6 +1368,103 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataList, String paramsManifestId) { + List newConfigDataEOList = new ArrayList<>(); + List paramsReportConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 + List paramsReportConfigIdList = paramsReportConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsReportConfigDataEOList = paramsReportConfigDataEOService.queryListByConfigIdList(paramsReportConfigIdList); // 查询所有配置数据 + + // 处理数据 + for (Map map : configDataList) { + String paramsCollectManifestId = (String) map.get("id"); + + // 添加配置数据 + for (Map.Entry entry : map.entrySet()) { + ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO(); + if ("id".equals(entry.getKey())) { + continue; + } + + // 取值 + String paramsReportConfigEOId = entry.getKey(); + Map paramsReportConfigDataMap = (Map) entry.getValue(); + // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） + List> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); + + // 判断是新增还是修改 + ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList); + if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { + paramsReportConfigDataEO.setId(oldConfigDataEO.getId()); + + } + paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); + if (CollectionUtil.isNotEmpty(configDataVOList)) { + for (Map paramsConfigDataVO : configDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + paramsReportConfigDataEO.setTextData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + paramsReportConfigDataEO.setPullData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); + String connectId = UUID.randomUUID().toString().replace("-", ""); + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileIdList[i]); + ossFile.setConnectId(connectId); + updateFileList.add(ossFile); + } + ossFileService.updateBatchById(updateFileList); + dataValue = connectId; + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + } + } + paramsReportConfigDataEO.setFileConnectId(dataValue); + + } + } + } + newConfigDataEOList.add(paramsReportConfigDataEO); + } + } + + // 批量更新 + return paramsReportConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); + } + + private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List paramsReportConfigDataEOList) { + List configDataEOList = paramsReportConfigDataEOList.stream() + .filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList.get(0); + } + return null; + } + /** * 实体对象转成Map * @param obj 实体对象 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 20b992308..76c937679 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 上报库 @@ -132,18 +134,31 @@ public class ParamsReportEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); List paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList); + List paramsManifestIdList = paramsManifestEOList.stream().map(ParamsManifestVO::getId).collect(Collectors.toList()); + List paramsManifestVersionList = paramsManifestEOList.stream().map(ParamsManifestVO::getVersion).collect(Collectors.toList()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList) + .in(ParamsReportEO::getVersion, paramsManifestVersionList); + List paramsReportEOList = list(queryWrapper); + paramsManifestEOList.forEach(paramsManifestVO -> { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, paramsManifestVO.getId()) - .eq(ParamsReportEO::getVersion, paramsManifestVO.getVersion()); - ParamsReportEO paramsReportEO = getOne(queryWrapper); - ParamsReportEO updateEO = new ParamsReportEO(); - updateEO.setId(paramsReportEO.getId()); - updateEO.setTitle(paramsManifestVO.getTitle()); - updateEO.setProjectName(paramsManifestVO.getProjectName()); + List paramsReportEOS = paramsReportEOList.stream() + .filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()) && paramsManifestVO.getVersion().equals(e.getVersion())) + .collect(Collectors.toList()); + + if (CollectionUtil.isNotEmpty(paramsReportEOS)) { + ParamsReportEO paramsReportEO = paramsReportEOS.get(0); + + ParamsReportEO updateEO = new ParamsReportEO(); + updateEO.setId(paramsReportEO.getId()); + updateEO.setTitle(paramsManifestVO.getTitle()); + updateEO.setProjectName(paramsManifestVO.getProjectName()); + + updateEOList.add(updateEO); + } - updateEOList.add(updateEO); }); return updateBatchById(updateEOList); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java index 1ab8e7c79..d93101f2b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java @@ -3,6 +3,9 @@ package com.jero.modules.cert.report.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; +import java.util.Map; + @Data public class ParamsReportDetailVO { @@ -37,6 +40,9 @@ public class ParamsReportDetailVO { @ApiModelProperty(value = "对应参数模板发布版本") private Integer paramsTemplatePublishVersion; + @ApiModelProperty(value = "保存专用") + private List> configDataList; // 保存专用 + // 导出通用 private String cut; private String exportName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index eca22b3fb..8648bb5b7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl impl sysUser.setUsername(ppEmployee.getWorker_user_id()); sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); - sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); +// sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); sysUser.setThirdId(ppEmployee.getWorker_user_id()); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 7d48f7722..89a09fc42 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3630,8 +3630,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 100){ + if(subtitle.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "子标题不能超过100个字符, "; + message = errorMsg + "子标题不能超过300个字符, "; }else{ - message = errorMsg + " Subheadings cannot be checked more than 100 characters, "; + message = errorMsg + " Subheadings cannot be checked more than 300 characters, "; } msgList.add(message); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java new file mode 100644 index 000000000..c7b51528e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java @@ -0,0 +1,91 @@ +package com.jero.modules.feishu.controller; + +import com.alibaba.fastjson.JSONObject; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.utils.LarkDecryptUtil; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags="飞书交互控制层") +@RestController +@RequestMapping("/lark") +@Slf4j +public class LarkController { + @Autowired + private IFeishuService feishuService; + + //加密密钥 + @Value("${Feishu.eventSubscription.encryptKey}") + private String encryptKey; + /** + * 飞书调用接口，飞书事件订阅配置。 + * @param jsonObject + * @return + */ + @PostMapping(value = "/larkEventSubscriptionConfig") + public String larkEventSubscriptionConfig(@RequestBody JSONObject jsonObject){ + String encrypt = jsonObject.getString("encrypt"); + log.info(encrypt); + + LarkDecryptUtil d = new LarkDecryptUtil(encryptKey); + + String decrypt = null; + try { + decrypt = d.decrypt(encrypt); + } catch (Exception exception) { + exception.printStackTrace(); + } + log.info("decrypt:==========================================================" + decrypt); + + //解析密钥json + JSONObject decryptJson = JSONObject.parseObject(decrypt); + Object event = decryptJson.get("event"); + if(event != null){ + JSONObject eventJson = JSONObject.parseObject(decryptJson.get("event").toString()); + + // 消息类型 与飞书开放平台文档应该一致 + String msgType = eventJson.getString("msg_type"); + + //如果是文本类型消息，进入处理， + if(StringUtils.equals(msgType,"text")){ + //用户发送的内容 + String textWithoutAtBot = eventJson.getString("text_without_at_bot"); + //用户发送的内容 与上方textWithoutAtBot变量一致(迷惑行为，同样的内容，用了两个字段返回) + String text = eventJson.getString("text"); + //用户id + String employeeId = eventJson.getString("employee_id"); + + //判断用户发送的消息内容，如果包含"知识库" 那么给用户推送知识库分类菜单 + if(StringUtils.contains(text,"知识库")){ + log.info("给"+employeeId+"用户推送知识库一级分类菜单:=========================================================="); + feishuService.sendKnowledgeBaseTypeCard(employeeId.split(",")); + } + } + } + return decrypt; + } + + /** + * 飞书卡片消息配置 + * @param jsonObject + * @return + */ + @PostMapping(value = "/larkCardMessageConfig") + public JSONObject larkCardMessageConfig(@RequestBody JSONObject jsonObject){ + JSONObject result = new JSONObject(); + String challenge = jsonObject.getString("challenge"); + if(StringUtils.isEmpty(challenge)){ + this.feishuService.sendKnowledgeBaseInfoCard(jsonObject); + } + result.put("challenge",challenge); + log.info(result.toString()); + return result; + } +} 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 0a857879d..5c8a8d213 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 @@ -1,5 +1,6 @@ package com.jero.modules.feishu.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.feishu.vo.FeishuMsgVo; import java.io.IOException; @@ -43,4 +44,16 @@ public interface IFeishuService { * @return */ String translateText(Map params); + + /** + * 发送知识库分类卡片消息 （用户输入知识库的时候） + * @param userIds + */ + void sendKnowledgeBaseTypeCard(String[] userIds); + + /** + * 发送知识库信息卡片消息 （用户点击某一个分类的时候） + * @param jsonObject + */ + void sendKnowledgeBaseInfoCard(JSONObject jsonObject); } 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 df3ed86d6..55e6e2429 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 @@ -3,11 +3,13 @@ package com.jero.modules.feishu.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.system.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -306,4 +308,175 @@ public class FeishuServiceImpl implements IFeishuService { return result; } + /** + * 发送知识库分类卡片消息 （用户输入知识库的时候） + * @param userIds + */ + @Override + public void sendKnowledgeBaseTypeCard(String[] userIds){ + String token = null; + try { + token = getTenantAccessToken(); + } catch (IOException e) { + e.printStackTrace(); + } + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + String sendJson = " {\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"header\": {\n" + + " \"title\": {\n" + + " \"tag\": \"plain_text\",\n" + + " \"content\": \"点击下方的分类查看常见问题\"\n" + + " }\n" + + " }\n" + + "}"; + JSONObject jsonObject = JSONObject.parseObject(sendJson); + JSONArray elements = new JSONArray(); + JSONObject element = new JSONObject(); + element.put("tag","action"); + element.put("layout","bisected"); + + JSONArray actions = new JSONArray(); + //组装推送过去的点击按钮 + for (int i=0; i<5; i++){ + + JSONObject buttonObject = new JSONObject(); + JSONObject text = new JSONObject(); + JSONObject value = new JSONObject(); + buttonObject.put("tag","button"); + + if(i==0){ + text.put("tag","plain_text"); + text.put("content","content1"); + + value.put("chosen","chosen1"); + } + if(i==1){ + text.put("tag","plain_text"); + text.put("content","content2"); + + value.put("chosen","chosen2"); + } + if(i==2){ + text.put("tag","plain_text"); + text.put("content","content3"); + + value.put("chosen","chosen3"); + } + if(i==3){ + text.put("tag","plain_text"); + text.put("content","content4"); + + value.put("chosen","chosen4"); + } + if(i==4){ + text.put("tag","plain_text"); + text.put("content","content5"); + + value.put("chosen","chosen5"); + } + if(i==5){ + text.put("tag","plain_text"); + text.put("content","content6"); + + value.put("chosen","chosen6"); + } + buttonObject.put("text",text); + buttonObject.put("type","primary"); + buttonObject.put("value",value); + actions.add(buttonObject); + } + element.put("actions",actions); + + + elements.add(element); + jsonObject.put("elements",elements); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + } + + @Override + public void sendKnowledgeBaseInfoCard(JSONObject jsonObject) { + String[] userIds = jsonObject.getString("user_id").split(","); + String clickStr = JSONObject.toJSONString(JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("action"))).get("value")); + log.info("用户点击的数据: " + clickStr); + + String sendJson = " "; + + JSONObject clickJson = JSONObject.parseObject(clickStr); + if(StringUtils.isNotEmpty(clickJson.getString("chosen"))){ + sendJson = clickJson.getString("chosen"); + } + + String token = null; + try { + token = getTenantAccessToken(); + } catch (IOException e) { + e.printStackTrace(); + } + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + // 设置消息标题 + JSONObject zh_cn = new JSONObject(); + zh_cn.put("title", "title"); + // 设置消息内容 + // 第一行 + JSONObject contentOne = new JSONObject(); + contentOne.put("tag", "text"); + contentOne.put("text", sendJson); + List contentList = new ArrayList<>(); + contentList.add(contentOne); + + List> list = new ArrayList<>(); + list.add(contentList); + zh_cn.put("content", list); + + JSONObject post = new JSONObject(); + post.put("zh_cn", zh_cn); + JSONObject contentObj = new JSONObject(); + contentObj.put("post", post); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "post"); + paramsMap.put("content", contentObj); + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 返回结果样例：{"code":0,"data":{"invalid_department_ids":[],"invalid_open_ids":[],"invalid_union_ids":[],"invalid_user_ids":[],"message_id":"bm-d595567e4f448fafe397bc916f0be646"},"msg":"ok"} + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java new file mode 100644 index 000000000..8ef4967f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java @@ -0,0 +1,55 @@ +package com.jero.modules.feishu.utils; + +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; + +/** + * 飞书解密工具类 + * @Author: wzj + * @Date: 2022/8/4 10:52 + **/ +public class LarkDecryptUtil { + + public static void main(String[] args) throws Exception { + LarkDecryptUtil d = new LarkDecryptUtil("test key"); + System.out.println(d.decrypt("P37w+VZImNgPEO1RBhJ6RtKl7n6zymIbEG1pReEzghk=")); //hello world + } + + private byte[] keyBs; + public LarkDecryptUtil(String key) { + MessageDigest digest = null; + try { + digest = MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException e) { + // won't happen + } + keyBs = digest.digest(key.getBytes(StandardCharsets.UTF_8)); + } + + public String decrypt(String base64) throws Exception { + byte[] decode = Base64.getDecoder().decode(base64); + Cipher cipher = Cipher.getInstance("AES/CBC/NOPADDING"); + byte[] iv = new byte[16]; + System.arraycopy(decode, 0, iv, 0, 16); + byte[] data = new byte[decode.length - 16]; + System.arraycopy(decode, 16, data, 0, data.length); + cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(keyBs, "AES"), new IvParameterSpec(iv)); + byte[] r = cipher.doFinal(data); + if (r.length > 0) { + int p = r.length - 1; + for (; p >= 0 && r[p] <= 16; p--) { + } + if (p != r.length - 1) { + byte[] rr = new byte[p + 1]; + System.arraycopy(r, 0, rr, 0, p + 1); + r = rr; + } + } + return new String(r, StandardCharsets.UTF_8); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java new file mode 100644 index 000000000..685e49453 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库-country_card-管理发布明细表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +@Api(tags="问题知识库-country_card-管理发布明细表") +@RestController +@RequestMapping("/problemKnowledgeBase/countryCardManageReleaseDetailEO") +@Slf4j +public class CountryCardManageReleaseDetailEOController extends JeroController { + @Autowired + private ICountryCardManageReleaseDetailEOService countryCardManageReleaseDetailEOService; + + /** + * 分页列表查询 + * + * @param countryCardManageReleaseDetailEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-分页列表查询") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-分页列表查询", notes="问题知识库-country_card-管理发布明细表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = countryCardManageReleaseDetailEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-列表查询") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-列表查询", notes="问题知识库-country_card-管理发布明细表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = countryCardManageReleaseDetailEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param countryCardManageReleaseDetailEO + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-添加") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-添加", notes="问题知识库-country_card-管理发布明细表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) { + countryCardManageReleaseDetailEOService.add(countryCardManageReleaseDetailEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param countryCardManageReleaseDetailEO + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-编辑") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-编辑", notes="问题知识库-country_card-管理发布明细表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) { + countryCardManageReleaseDetailEOService.editById(countryCardManageReleaseDetailEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-通过id删除") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-通过id删除", notes="问题知识库-country_card-管理发布明细表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + countryCardManageReleaseDetailEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-批量删除") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-批量删除", notes="问题知识库-country_card-管理发布明细表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.countryCardManageReleaseDetailEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布明细表-通过id查询") + @ApiOperation(value="问题知识库-country_card-管理发布明细表-通过id查询", notes="问题知识库-country_card-管理发布明细表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO = countryCardManageReleaseDetailEOService.queryById(id); + if(countryCardManageReleaseDetailEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(countryCardManageReleaseDetailEO); + } + + /** + * 导出excel + * + * @param request + * @param countryCardManageReleaseDetailEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) { + return super.exportXls(request, countryCardManageReleaseDetailEO, CountryCardManageReleaseDetailEO.class, "问题知识库-country_card-管理发布明细表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CountryCardManageReleaseDetailEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java new file mode 100644 index 000000000..7504e7c33 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库-country_card-管理发布表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +@Api(tags="问题知识库-country_card-管理发布表") +@RestController +@RequestMapping("/problemKnowledgeBase/countryCardManageReleaseEO") +@Slf4j +public class CountryCardManageReleaseEOController extends JeroController { + @Autowired + private ICountryCardManageReleaseEOService countryCardManageReleaseEOService; + + /** + * 分页列表查询 + * + * @param countryCardManageReleaseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-分页列表查询") + @ApiOperation(value="问题知识库-country_card-管理发布表-分页列表查询", notes="问题知识库-country_card-管理发布表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(CountryCardManageReleaseEO countryCardManageReleaseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = countryCardManageReleaseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-列表查询") + @ApiOperation(value="问题知识库-country_card-管理发布表-列表查询", notes="问题知识库-country_card-管理发布表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = countryCardManageReleaseEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param countryCardManageReleaseEO + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-添加") + @ApiOperation(value="问题知识库-country_card-管理发布表-添加", notes="问题知识库-country_card-管理发布表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody CountryCardManageReleaseEO countryCardManageReleaseEO) { + countryCardManageReleaseEOService.add(countryCardManageReleaseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param countryCardManageReleaseEO + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-编辑") + @ApiOperation(value="问题知识库-country_card-管理发布表-编辑", notes="问题知识库-country_card-管理发布表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody CountryCardManageReleaseEO countryCardManageReleaseEO) { + countryCardManageReleaseEOService.editById(countryCardManageReleaseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-通过id删除") + @ApiOperation(value="问题知识库-country_card-管理发布表-通过id删除", notes="问题知识库-country_card-管理发布表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + countryCardManageReleaseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-批量删除") + @ApiOperation(value="问题知识库-country_card-管理发布表-批量删除", notes="问题知识库-country_card-管理发布表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.countryCardManageReleaseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-通过id查询") + @ApiOperation(value="问题知识库-country_card-管理发布表-通过id查询", notes="问题知识库-country_card-管理发布表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CountryCardManageReleaseEO countryCardManageReleaseEO = countryCardManageReleaseEOService.queryById(id); + if(countryCardManageReleaseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(countryCardManageReleaseEO); + } + + /** + * 导出excel + * + * @param request + * @param countryCardManageReleaseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CountryCardManageReleaseEO countryCardManageReleaseEO) { + return super.exportXls(request, countryCardManageReleaseEO, CountryCardManageReleaseEO.class, "问题知识库-country_card-管理发布表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CountryCardManageReleaseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java new file mode 100644 index 000000000..9c56a1552 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java @@ -0,0 +1,182 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: Country Card模板维护表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Api(tags="Country Card模板维护表") +@RestController +@RequestMapping("/problemKnowledgeBase/countryCardTempEO") +@Slf4j +public class CountryCardTempEOController extends JeroController { + @Autowired + private ICountryCardTempEOService countryCardTempEOService; + + /** + * 分页列表查询 + * + * @param countryCardTempEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "Country Card模板维护表-分页列表查询") + @ApiOperation(value="Country Card模板维护表-分页列表查询", notes="Country Card模板维护表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(CountryCardTempEO countryCardTempEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = countryCardTempEOService.page(page, queryWrapper); + this.countryCardTempEOService.disposeData(pageList.getRecords(),countryCardTempEO.getCut()); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "Country Card模板维护表-列表查询") + @ApiOperation(value="Country Card模板维护表-列表查询", notes="Country Card模板维护表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(CountryCardTempEO countryCardTempEO,HttpServletRequest req) { + List list = countryCardTempEOService.queryList(countryCardTempEO,req); + this.countryCardTempEOService.disposeData(list,countryCardTempEO.getCut()); + return Result.OK(list); + } + + /** + * 添加 + * + * @param countryCardTempEO + * @return + */ + @AutoLog(value = "Country Card模板维护表-添加") + @ApiOperation(value="Country Card模板维护表-添加", notes="Country Card模板维护表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody CountryCardTempEO countryCardTempEO) { + countryCardTempEOService.add(countryCardTempEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param countryCardTempEO + * @return + */ + @AutoLog(value = "Country Card模板维护表-编辑") + @ApiOperation(value="Country Card模板维护表-编辑", notes="Country Card模板维护表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody CountryCardTempEO countryCardTempEO) { + countryCardTempEOService.editById(countryCardTempEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "Country Card模板维护表-通过id删除") + @ApiOperation(value="Country Card模板维护表-通过id删除", notes="Country Card模板维护表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + countryCardTempEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "Country Card模板维护表-批量删除") + @ApiOperation(value="Country Card模板维护表-批量删除", notes="Country Card模板维护表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.countryCardTempEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "Country Card模板维护表-通过id查询") + @ApiOperation(value="Country Card模板维护表-通过id查询", notes="Country Card模板维护表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CountryCardTempEO countryCardTempEO = countryCardTempEOService.queryById(id); + if(countryCardTempEO==null) { + return Result.error("未找到对应数据"); + } + + List countryCardTempEOList = new ArrayList<>(); + countryCardTempEOList.add(countryCardTempEO); + this.countryCardTempEOService.disposeData(countryCardTempEOList,countryCardTempEO.getCut()); + + if(countryCardTempEOList.size() == 0){ + return Result.error("未找到对应数据"); + } + + return Result.OK(countryCardTempEOList.get(0)); + } + + /** + * 导出excel + * + * @param request + * @param countryCardTempEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CountryCardTempEO countryCardTempEO) { + return super.exportXls(request, countryCardTempEO, CountryCardTempEO.class, "Country Card模板维护表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CountryCardTempEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java new file mode 100644 index 000000000..ce1d9a4e4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempItemEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: Country Card模板维护-字典项表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Api(tags="Country Card模板维护-字典项表") +@RestController +@RequestMapping("/problemKnowledgeBase/countryCardTempItemEO") +@Slf4j +public class CountryCardTempItemEOController extends JeroController { + @Autowired + private ICountryCardTempItemEOService countryCardTempItemEOService; + + /** + * 分页列表查询 + * + * @param countryCardTempItemEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-分页列表查询") + @ApiOperation(value="Country Card模板维护-字典项表-分页列表查询", notes="Country Card模板维护-字典项表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(CountryCardTempItemEO countryCardTempItemEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempItemEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = countryCardTempItemEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-列表查询") + @ApiOperation(value="Country Card模板维护-字典项表-列表查询", notes="Country Card模板维护-字典项表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(CountryCardTempItemEO countryCardTempItemEO,HttpServletRequest req) { + List list = countryCardTempItemEOService.queryList(countryCardTempItemEO,req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param countryCardTempItemEO + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-添加") + @ApiOperation(value="Country Card模板维护-字典项表-添加", notes="Country Card模板维护-字典项表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody CountryCardTempItemEO countryCardTempItemEO) { + countryCardTempItemEOService.add(countryCardTempItemEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param countryCardTempItemEO + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-编辑") + @ApiOperation(value="Country Card模板维护-字典项表-编辑", notes="Country Card模板维护-字典项表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody CountryCardTempItemEO countryCardTempItemEO) { + countryCardTempItemEOService.editById(countryCardTempItemEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-通过id删除") + @ApiOperation(value="Country Card模板维护-字典项表-通过id删除", notes="Country Card模板维护-字典项表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + countryCardTempItemEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-批量删除") + @ApiOperation(value="Country Card模板维护-字典项表-批量删除", notes="Country Card模板维护-字典项表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.countryCardTempItemEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "Country Card模板维护-字典项表-通过id查询") + @ApiOperation(value="Country Card模板维护-字典项表-通过id查询", notes="Country Card模板维护-字典项表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CountryCardTempItemEO countryCardTempItemEO = countryCardTempItemEOService.queryById(id); + if(countryCardTempItemEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(countryCardTempItemEO); + } + + /** + * 导出excel + * + * @param request + * @param countryCardTempItemEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CountryCardTempItemEO countryCardTempItemEO) { + return super.exportXls(request, countryCardTempItemEO, CountryCardTempItemEO.class, "Country Card模板维护-字典项表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CountryCardTempItemEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java new file mode 100644 index 000000000..f23c69ac0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseBrowsingHistoryEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库浏览历史表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseBrowsingHistoryEO") +@Slf4j +public class ProblemKnowledgeBaseBrowsingHistoryEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseBrowsingHistoryEOService problemKnowledgeBaseBrowsingHistoryEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-分页列表查询") + @ApiOperation(value="问题知识库浏览历史表-分页列表查询", notes="问题知识库浏览历史表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseBrowsingHistoryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseBrowsingHistoryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-列表查询") + @ApiOperation(value="问题知识库浏览历史表-列表查询", notes="问题知识库浏览历史表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseBrowsingHistoryEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-添加") + @ApiOperation(value="问题知识库浏览历史表-添加", notes="问题知识库浏览历史表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + problemKnowledgeBaseBrowsingHistoryEOService.add(problemKnowledgeBaseBrowsingHistoryEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-编辑") + @ApiOperation(value="问题知识库浏览历史表-编辑", notes="问题知识库浏览历史表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + problemKnowledgeBaseBrowsingHistoryEOService.editById(problemKnowledgeBaseBrowsingHistoryEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-通过id删除") + @ApiOperation(value="问题知识库浏览历史表-通过id删除", notes="问题知识库浏览历史表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseBrowsingHistoryEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-批量删除") + @ApiOperation(value="问题知识库浏览历史表-批量删除", notes="问题知识库浏览历史表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseBrowsingHistoryEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库浏览历史表-通过id查询") + @ApiOperation(value="问题知识库浏览历史表-通过id查询", notes="问题知识库浏览历史表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO = problemKnowledgeBaseBrowsingHistoryEOService.queryById(id); + if(problemKnowledgeBaseBrowsingHistoryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseBrowsingHistoryEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseBrowsingHistoryEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + return super.exportXls(request, problemKnowledgeBaseBrowsingHistoryEO, ProblemKnowledgeBaseBrowsingHistoryEO.class, "问题知识库浏览历史表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseBrowsingHistoryEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java new file mode 100644 index 000000000..3e9f5c700 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库-分类表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseClassifyEO") +@Slf4j +public class ProblemKnowledgeBaseClassifyEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseClassifyEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库-分类表-分页列表查询") + @ApiOperation(value="问题知识库-分类表-分页列表查询", notes="问题知识库-分类表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseClassifyEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseClassifyEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库-分类表-列表查询") + @ApiOperation(value="问题知识库-分类表-列表查询", notes="问题知识库-分类表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseClassifyEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @AutoLog(value = "问题知识库-分类表-添加") + @ApiOperation(value="问题知识库-分类表-添加", notes="问题知识库-分类表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + problemKnowledgeBaseClassifyEOService.add(problemKnowledgeBaseClassifyEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @AutoLog(value = "问题知识库-分类表-编辑") + @ApiOperation(value="问题知识库-分类表-编辑", notes="问题知识库-分类表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + problemKnowledgeBaseClassifyEOService.editById(problemKnowledgeBaseClassifyEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-分类表-通过id删除") + @ApiOperation(value="问题知识库-分类表-通过id删除", notes="问题知识库-分类表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseClassifyEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库-分类表-批量删除") + @ApiOperation(value="问题知识库-分类表-批量删除", notes="问题知识库-分类表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseClassifyEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库-分类表-通过id查询") + @ApiOperation(value="问题知识库-分类表-通过id查询", notes="问题知识库-分类表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO = problemKnowledgeBaseClassifyEOService.queryById(id); + if(problemKnowledgeBaseClassifyEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseClassifyEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseClassifyEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + return super.exportXls(request, problemKnowledgeBaseClassifyEO, ProblemKnowledgeBaseClassifyEO.class, "问题知识库-分类表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseClassifyEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java new file mode 100644 index 000000000..f58424eb6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库收藏表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseCollectEO") +@Slf4j +public class ProblemKnowledgeBaseCollectEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseCollectEOService problemKnowledgeBaseCollectEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseCollectEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库收藏表-分页列表查询") + @ApiOperation(value="问题知识库收藏表-分页列表查询", notes="问题知识库收藏表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCollectEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseCollectEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库收藏表-列表查询") + @ApiOperation(value="问题知识库收藏表-列表查询", notes="问题知识库收藏表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseCollectEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @AutoLog(value = "问题知识库收藏表-添加") + @ApiOperation(value="问题知识库收藏表-添加", notes="问题知识库收藏表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + problemKnowledgeBaseCollectEOService.add(problemKnowledgeBaseCollectEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @AutoLog(value = "问题知识库收藏表-编辑") + @ApiOperation(value="问题知识库收藏表-编辑", notes="问题知识库收藏表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + problemKnowledgeBaseCollectEOService.editById(problemKnowledgeBaseCollectEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库收藏表-通过id删除") + @ApiOperation(value="问题知识库收藏表-通过id删除", notes="问题知识库收藏表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseCollectEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库收藏表-批量删除") + @ApiOperation(value="问题知识库收藏表-批量删除", notes="问题知识库收藏表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseCollectEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库收藏表-通过id查询") + @ApiOperation(value="问题知识库收藏表-通过id查询", notes="问题知识库收藏表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO = problemKnowledgeBaseCollectEOService.queryById(id); + if(problemKnowledgeBaseCollectEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseCollectEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseCollectEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + return super.exportXls(request, problemKnowledgeBaseCollectEO, ProblemKnowledgeBaseCollectEO.class, "问题知识库收藏表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseCollectEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java new file mode 100644 index 000000000..f3b4b1d01 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库评论表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseCommentEO") +@Slf4j +public class ProblemKnowledgeBaseCommentEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseCommentEOService problemKnowledgeBaseCommentEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseCommentEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库评论表-分页列表查询") + @ApiOperation(value="问题知识库评论表-分页列表查询", notes="问题知识库评论表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseCommentEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库评论表-列表查询") + @ApiOperation(value="问题知识库评论表-列表查询", notes="问题知识库评论表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseCommentEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @AutoLog(value = "问题知识库评论表-添加") + @ApiOperation(value="问题知识库评论表-添加", notes="问题知识库评论表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + problemKnowledgeBaseCommentEOService.add(problemKnowledgeBaseCommentEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @AutoLog(value = "问题知识库评论表-编辑") + @ApiOperation(value="问题知识库评论表-编辑", notes="问题知识库评论表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + problemKnowledgeBaseCommentEOService.editById(problemKnowledgeBaseCommentEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库评论表-通过id删除") + @ApiOperation(value="问题知识库评论表-通过id删除", notes="问题知识库评论表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseCommentEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库评论表-批量删除") + @ApiOperation(value="问题知识库评论表-批量删除", notes="问题知识库评论表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseCommentEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库评论表-通过id查询") + @ApiOperation(value="问题知识库评论表-通过id查询", notes="问题知识库评论表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO = problemKnowledgeBaseCommentEOService.queryById(id); + if(problemKnowledgeBaseCommentEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseCommentEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseCommentEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + return super.exportXls(request, problemKnowledgeBaseCommentEO, ProblemKnowledgeBaseCommentEO.class, "问题知识库评论表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseCommentEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java new file mode 100644 index 000000000..09bbe185d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseEO") +@Slf4j +public class ProblemKnowledgeBaseEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库表-分页列表查询") + @ApiOperation(value="问题知识库表-分页列表查询", notes="问题知识库表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库表-列表查询") + @ApiOperation(value="问题知识库表-列表查询", notes="问题知识库表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseEO + * @return + */ + @AutoLog(value = "问题知识库表-添加") + @ApiOperation(value="问题知识库表-添加", notes="问题知识库表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + problemKnowledgeBaseEOService.add(problemKnowledgeBaseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseEO + * @return + */ + @AutoLog(value = "问题知识库表-编辑") + @ApiOperation(value="问题知识库表-编辑", notes="问题知识库表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + problemKnowledgeBaseEOService.editById(problemKnowledgeBaseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库表-通过id删除") + @ApiOperation(value="问题知识库表-通过id删除", notes="问题知识库表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库表-批量删除") + @ApiOperation(value="问题知识库表-批量删除", notes="问题知识库表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库表-通过id查询") + @ApiOperation(value="问题知识库表-通过id查询", notes="问题知识库表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseEO problemKnowledgeBaseEO = problemKnowledgeBaseEOService.queryById(id); + if(problemKnowledgeBaseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + return super.exportXls(request, problemKnowledgeBaseEO, ProblemKnowledgeBaseEO.class, "问题知识库表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java new file mode 100644 index 000000000..93a08e54e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBasePraiseEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库点赞表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBasePraiseEO") +@Slf4j +public class ProblemKnowledgeBasePraiseEOController extends JeroController { + @Autowired + private IProblemKnowledgeBasePraiseEOService problemKnowledgeBasePraiseEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBasePraiseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库点赞表-分页列表查询") + @ApiOperation(value="问题知识库点赞表-分页列表查询", notes="问题知识库点赞表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBasePraiseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBasePraiseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库点赞表-列表查询") + @ApiOperation(value="问题知识库点赞表-列表查询", notes="问题知识库点赞表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBasePraiseEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @AutoLog(value = "问题知识库点赞表-添加") + @ApiOperation(value="问题知识库点赞表-添加", notes="问题知识库点赞表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + problemKnowledgeBasePraiseEOService.add(problemKnowledgeBasePraiseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @AutoLog(value = "问题知识库点赞表-编辑") + @ApiOperation(value="问题知识库点赞表-编辑", notes="问题知识库点赞表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + problemKnowledgeBasePraiseEOService.editById(problemKnowledgeBasePraiseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库点赞表-通过id删除") + @ApiOperation(value="问题知识库点赞表-通过id删除", notes="问题知识库点赞表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBasePraiseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库点赞表-批量删除") + @ApiOperation(value="问题知识库点赞表-批量删除", notes="问题知识库点赞表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBasePraiseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库点赞表-通过id查询") + @ApiOperation(value="问题知识库点赞表-通过id查询", notes="问题知识库点赞表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO = problemKnowledgeBasePraiseEOService.queryById(id); + if(problemKnowledgeBasePraiseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBasePraiseEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBasePraiseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + return super.exportXls(request, problemKnowledgeBasePraiseEO, ProblemKnowledgeBasePraiseEO.class, "问题知识库点赞表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBasePraiseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java new file mode 100644 index 000000000..cff1a4c79 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.problemKnowledgeBase.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Api(tags="问题知识库展示权限表") +@RestController +@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseUserEO") +@Slf4j +public class ProblemKnowledgeBaseUserEOController extends JeroController { + @Autowired + private IProblemKnowledgeBaseUserEOService problemKnowledgeBaseUserEOService; + + /** + * 分页列表查询 + * + * @param problemKnowledgeBaseUserEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题知识库展示权限表-分页列表查询") + @ApiOperation(value="问题知识库展示权限表-分页列表查询", notes="问题知识库展示权限表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseUserEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseUserEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题知识库展示权限表-列表查询") + @ApiOperation(value="问题知识库展示权限表-列表查询", notes="问题知识库展示权限表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemKnowledgeBaseUserEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @AutoLog(value = "问题知识库展示权限表-添加") + @ApiOperation(value="问题知识库展示权限表-添加", notes="问题知识库展示权限表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + problemKnowledgeBaseUserEOService.add(problemKnowledgeBaseUserEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @AutoLog(value = "问题知识库展示权限表-编辑") + @ApiOperation(value="问题知识库展示权限表-编辑", notes="问题知识库展示权限表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + problemKnowledgeBaseUserEOService.editById(problemKnowledgeBaseUserEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库展示权限表-通过id删除") + @ApiOperation(value="问题知识库展示权限表-通过id删除", notes="问题知识库展示权限表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + problemKnowledgeBaseUserEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "问题知识库展示权限表-批量删除") + @ApiOperation(value="问题知识库展示权限表-批量删除", notes="问题知识库展示权限表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.problemKnowledgeBaseUserEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "问题知识库展示权限表-通过id查询") + @ApiOperation(value="问题知识库展示权限表-通过id查询", notes="问题知识库展示权限表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO = problemKnowledgeBaseUserEOService.queryById(id); + if(problemKnowledgeBaseUserEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemKnowledgeBaseUserEO); + } + + /** + * 导出excel + * + * @param request + * @param problemKnowledgeBaseUserEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + return super.exportXls(request, problemKnowledgeBaseUserEO, ProblemKnowledgeBaseUserEO.class, "问题知识库展示权限表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProblemKnowledgeBaseUserEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java new file mode 100644 index 000000000..6df383189 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -0,0 +1,84 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库-country_card-管理发布明细表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +@Data +@TableName("country_card_manage_release_detail") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="country_card_manage_release_detail对象", description="问题知识库-country_card-管理发布明细表") +public class CountryCardManageReleaseDetailEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**country_card管理发布表id*/ + @Excel(name = "country_card管理发布表id", width = 15) + @ApiModelProperty(value = "country_card管理发布表id") + private java.lang.String countryCardManageReleaseId; + + /**模板表id*/ + @Excel(name = "模板表id", width = 15) + @ApiModelProperty(value = "模板表id") + private java.lang.String countryCardTempId; + + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private java.lang.String description; + + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private java.lang.String content; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java new file mode 100644 index 000000000..03b247fc6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库-country_card-管理发布表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +@Data +@TableName("country_card_manage_release") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="country_card_manage_release对象", description="问题知识库-country_card-管理发布表") +public class CountryCardManageReleaseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**适用市场*/ + @Excel(name = "适用市场", width = 15) + @ApiModelProperty(value = "适用市场") + private java.lang.String applyMarket; + + /**发布状态*/ + @Excel(name = "发布状态", width = 15) + @ApiModelProperty(value = "发布状态") + private java.lang.String releaseStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java new file mode 100644 index 000000000..8bf7c2d28 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java @@ -0,0 +1,98 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: Country Card模板维护表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Data +@TableName("country_card_temp") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="country_card_temp对象", description="Country Card模板维护表") +public class CountryCardTempEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**标签名称*/ + @Excel(name = "标签名称", width = 15) + @ApiModelProperty(value = "标签名称") + private java.lang.String lableName; + + /**标签类型*/ + @Excel(name = "标签类型", width = 15) + @ApiModelProperty(value = "标签类型") + private java.lang.String lableType; + + /**展示顺序*/ + @Excel(name = "展示顺序", width = 15) + @ApiModelProperty(value = "展示顺序") + private java.lang.Integer orderNum; + + /**关联网址*/ + @Excel(name = "关联网址", width = 15) + @ApiModelProperty(value = "关联网址") + private java.lang.String relevantUrl; + + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private java.lang.String description; + + /**Country Card模板维护-字典项实体*/ + @TableField(exist = false) + private List countryCardTempItemEOList; + + @TableField(exist = false) + private String cut; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempItemEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempItemEO.java new file mode 100644 index 000000000..50e38c05d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempItemEO.java @@ -0,0 +1,99 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: Country Card模板维护-字典项表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Data +@TableName("country_card_temp_item") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="country_card_temp_item对象", description="Country Card模板维护-字典项表") +public class CountryCardTempItemEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**模板维护表id*/ + @Excel(name = "模板维护表id", width = 15) + @ApiModelProperty(value = "模板维护表id") + private java.lang.String countryCardTempId; + + /**字典项值*/ + @Excel(name = "字典项值", width = 15) + @ApiModelProperty(value = "字典项值") + private java.lang.String itemValue; + + /**字典项中文名称*/ + @Excel(name = "字典项中文名称", width = 15) + @ApiModelProperty(value = "字典项中文名称") + private java.lang.String itemText; + + /**字典项英文名称*/ + @Excel(name = "字典项英文名称", width = 15) + @ApiModelProperty(value = "字典项英文名称") + private java.lang.String enName; + + /**逻辑删除标识*/ + @Excel(name = "逻辑删除标识", width = 15) + @ApiModelProperty(value = "逻辑删除标识") + private java.lang.String delFlag; + + /**状态（1启用 0不启用）*/ + @Excel(name = "状态（1启用 0不启用）", width = 15) + @ApiModelProperty(value = "状态（1启用 0不启用）") + private java.lang.String status; + + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private java.lang.String description; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java new file mode 100644 index 000000000..c96d6da99 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_browsing_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_browsing_history对象", description="问题知识库浏览历史表") +public class ProblemKnowledgeBaseBrowsingHistoryEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**浏览人员id*/ + @Excel(name = "浏览人员id", width = 15) + @ApiModelProperty(value = "浏览人员id") + private java.lang.String browsingUserId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java new file mode 100644 index 000000000..2ce96532e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_classify") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_classify对象", description="问题知识库-分类表") +public class ProblemKnowledgeBaseClassifyEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题标签*/ + @Excel(name = "问题标签", width = 15) + @ApiModelProperty(value = "问题标签") + private java.lang.String problemLabel; + + /**负责人id*/ + @Excel(name = "负责人id", width = 15) + @ApiModelProperty(value = "负责人id") + private java.lang.String chargePersonId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java new file mode 100644 index 000000000..e20eaf190 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_collect") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_collect对象", description="问题知识库收藏表") +public class ProblemKnowledgeBaseCollectEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**收藏用户id*/ + @Excel(name = "收藏用户id", width = 15) + @ApiModelProperty(value = "收藏用户id") + private java.lang.String collectUserId; + + /**收藏状态*/ + @Excel(name = "收藏状态", width = 15) + @ApiModelProperty(value = "收藏状态") + private java.lang.String collectStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java new file mode 100644 index 000000000..a7d8fee97 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_comment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_comment对象", description="问题知识库评论表") +public class ProblemKnowledgeBaseCommentEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**评论内容*/ + @Excel(name = "评论内容", width = 15) + @ApiModelProperty(value = "评论内容") + private java.lang.String commentContent; + + /**评论用户id*/ + @Excel(name = "评论用户id", width = 15) + @ApiModelProperty(value = "评论用户id") + private java.lang.String commentUserId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java new file mode 100644 index 000000000..ac34b78ff --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -0,0 +1,143 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base对象", description="问题知识库表") +public class ProblemKnowledgeBaseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + + /**问题分类*/ + @Excel(name = "问题分类", width = 15) + @ApiModelProperty(value = "问题分类") + private java.lang.String problemType; + + /**市场*/ + @Excel(name = "市场", width = 15) + @ApiModelProperty(value = "市场") + private java.lang.String targetMarket; + + /**文档库id*/ + @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private java.lang.String bussDocumentLibraryId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String standNumber; + + /**标准标题*/ + @Excel(name = "标准标题", width = 15) + @ApiModelProperty(value = "标准标题") + private java.lang.String standTitle; + + /**内容（正文）*/ + @Excel(name = "内容（正文）", width = 15) + private transient java.lang.String contentString; + + private byte[] content; + + public byte[] getContent(){ + if(contentString==null){ + return null; + } + try { + return contentString.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } + + public String getContentString(){ + if(content==null || content.length==0){ + return ""; + } + try { + return new String(content,"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return ""; + } + /**附件*/ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private java.lang.String accessoryFile; + + /**展示权限*/ + @Excel(name = "展示权限", width = 15) + @ApiModelProperty(value = "展示权限") + private java.lang.String showPermissions; + + /**发布人id*/ + @Excel(name = "展示权限", width = 15) + @ApiModelProperty(value = "发布人id") + private java.lang.String releaseUserId; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15) + @ApiModelProperty(value = "发布日期") + private java.lang.String releaseTime; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java new file mode 100644 index 000000000..b12cb40cb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_praise") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_praise对象", description="问题知识库点赞表") +public class ProblemKnowledgeBasePraiseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**点赞人员id*/ + @Excel(name = "点赞人员id", width = 15) + @ApiModelProperty(value = "点赞人员id") + private java.lang.String praiseUserId; + + /**点赞状态*/ + @Excel(name = "点赞状态", width = 15) + @ApiModelProperty(value = "点赞状态") + private java.lang.String praiseStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java new file mode 100644 index 000000000..4865c5bdd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.problemKnowledgeBase.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Data +@TableName("problem_knowledge_base_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_knowledge_base_user对象", description="问题知识库展示权限表") +public class ProblemKnowledgeBaseUserEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**问题知识库id*/ + @Excel(name = "问题知识库id", width = 15) + @ApiModelProperty(value = "问题知识库id") + private java.lang.String problemKnowledgeBaseId; + + /**用户id*/ + @Excel(name = "用户id", width = 15) + @ApiModelProperty(value = "用户id") + private java.lang.String userId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java new file mode 100644 index 000000000..ff422ef83 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java @@ -0,0 +1,49 @@ +package com.jero.modules.problemKnowledgeBase.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 标签类型枚举类 + */ +public enum LableTypeEnum { + + PULL_SINGLE("单选下拉框","Option drop - down box","3"), + FILE("文件","file","7"), + TEXT("文本框","text","8"), + LINK("链接输入","Link to the input","9"), + ; + + + String cnName; + String enName; + String value; + + private LableTypeEnum(String cnName,String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + LableTypeEnum[] values = values(); + for (LableTypeEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return taskStatusEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return taskStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java new file mode 100644 index 000000000..90b7d3ab5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库-country_card-管理发布明细表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +public interface CountryCardManageReleaseDetailEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java new file mode 100644 index 000000000..1785a2ecf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库-country_card-管理发布表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +public interface CountryCardManageReleaseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardTempEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardTempEOMapper.java new file mode 100644 index 000000000..0ba039894 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardTempEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: Country Card模板维护表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface CountryCardTempEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardTempItemEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardTempItemEOMapper.java new file mode 100644 index 000000000..0014c1188 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardTempItemEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: Country Card模板维护-字典项表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface CountryCardTempItemEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java new file mode 100644 index 000000000..cc4c4dca5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseBrowsingHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java new file mode 100644 index 000000000..ae0853022 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseClassifyEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java new file mode 100644 index 000000000..2a5a58b75 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseCollectEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java new file mode 100644 index 000000000..c62e67df3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseCommentEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java new file mode 100644 index 000000000..be6e0e9f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java new file mode 100644 index 000000000..6387837a4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBasePraiseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java new file mode 100644 index 000000000..833e8b7ca --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.problemKnowledgeBase.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface ProblemKnowledgeBaseUserEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml new file mode 100644 index 000000000..e1ba89471 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml new file mode 100644 index 000000000..24321aefd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardTempEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardTempEOMapper.xml new file mode 100644 index 000000000..3f35fc079 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardTempEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardTempItemEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardTempItemEOMapper.xml new file mode 100644 index 000000000..6a7f14296 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardTempItemEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml new file mode 100644 index 000000000..d7d8e2386 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml new file mode 100644 index 000000000..21927cc7b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml new file mode 100644 index 000000000..3b4f91413 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml new file mode 100644 index 000000000..23e191dfe --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml new file mode 100644 index 000000000..d1061e37f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml new file mode 100644 index 000000000..044434263 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml new file mode 100644 index 000000000..e23f914c1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java new file mode 100644 index 000000000..9d078df1b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库-country_card-管理发布明细表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +public interface ICountryCardManageReleaseDetailEOService extends IService { + + /** + * 保存 + * + * @param countryCardManageReleaseDetailEO + * @return + */ + void add(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO); + + /** + * 更新 + * + * @param countryCardManageReleaseDetailEO + * @return + */ + void editById(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + CountryCardManageReleaseDetailEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java new file mode 100644 index 000000000..e5958d1e2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库-country_card-管理发布表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +public interface ICountryCardManageReleaseEOService extends IService { + + /** + * 保存 + * + * @param countryCardManageReleaseEO + * @return + */ + void add(CountryCardManageReleaseEO countryCardManageReleaseEO); + + /** + * 更新 + * + * @param countryCardManageReleaseEO + * @return + */ + void editById(CountryCardManageReleaseEO countryCardManageReleaseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + CountryCardManageReleaseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java new file mode 100644 index 000000000..4e10be53d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempEOService.java @@ -0,0 +1,70 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: Country Card模板维护表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface ICountryCardTempEOService extends IService { + + /** + * 保存 + * + * @param countryCardTempEO + * @return + */ + void add(CountryCardTempEO countryCardTempEO); + + /** + * 更新 + * + * @param countryCardTempEO + * @return + */ + void editById(CountryCardTempEO countryCardTempEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + CountryCardTempEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(CountryCardTempEO countryCardTempEO, HttpServletRequest req); + + /*** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempItemEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempItemEOService.java new file mode 100644 index 000000000..e81e6296e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardTempItemEOService.java @@ -0,0 +1,66 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: Country Card模板维护-字典项表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +public interface ICountryCardTempItemEOService extends IService { + + /** + * 保存 + * + * @param countryCardTempItemEO + * @return + */ + void add(CountryCardTempItemEO countryCardTempItemEO); + + /** + * 更新 + * + * @param countryCardTempItemEO + * @return + */ + void editById(CountryCardTempItemEO countryCardTempItemEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + CountryCardTempItemEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(CountryCardTempItemEO countryCardTempItemEO, HttpServletRequest req); + + void batchInsert(List countryCardTempItemEOList, String id,String cut); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java new file mode 100644 index 000000000..b1a377731 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseBrowsingHistoryEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + void add(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + void editById(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseBrowsingHistoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java new file mode 100644 index 000000000..486f3ea5e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseClassifyEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + void add(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + void editById(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseClassifyEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java new file mode 100644 index 000000000..63c116f63 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseCollectEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + void add(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + void editById(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseCollectEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java new file mode 100644 index 000000000..a3b779b5f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseCommentEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + void add(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + void editById(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseCommentEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java new file mode 100644 index 000000000..426a968f0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseEO + * @return + */ + void add(ProblemKnowledgeBaseEO problemKnowledgeBaseEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseEO + * @return + */ + void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java new file mode 100644 index 000000000..1a396fd62 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBasePraiseEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + void add(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO); + + /** + * 更新 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + void editById(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBasePraiseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java new file mode 100644 index 000000000..6a1521524 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.problemKnowledgeBase.service; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +public interface IProblemKnowledgeBaseUserEOService extends IService { + + /** + * 保存 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + void add(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO); + + /** + * 更新 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + void editById(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemKnowledgeBaseUserEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java new file mode 100644 index 000000000..949ec4682 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库-country_card-管理发布明细表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseDetailEOService { + + /** + * 保存 + * + * @param countryCardManageReleaseDetailEO + * @return + */ + @Override + public void add(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) { + Date now = new Date(); + countryCardManageReleaseDetailEO.setCreateTime(now); + countryCardManageReleaseDetailEO.setUpdateTime(now); + save(countryCardManageReleaseDetailEO); + } + + /** + * 更新 + * + * @param countryCardManageReleaseDetailEO + * @return + */ + @Override + public void editById(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) { + Date now = new Date(); + countryCardManageReleaseDetailEO.setUpdateTime(now); + saveOrUpdate(countryCardManageReleaseDetailEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public CountryCardManageReleaseDetailEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java new file mode 100644 index 000000000..cec8bb911 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; +import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库-country_card-管理发布表 + * @Author: jero-boot + * @Date: 2022-08-04 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseEOService { + + /** + * 保存 + * + * @param countryCardManageReleaseEO + * @return + */ + @Override + public void add(CountryCardManageReleaseEO countryCardManageReleaseEO) { + Date now = new Date(); + countryCardManageReleaseEO.setCreateTime(now); + countryCardManageReleaseEO.setUpdateTime(now); + save(countryCardManageReleaseEO); + } + + /** + * 更新 + * + * @param countryCardManageReleaseEO + * @return + */ + @Override + public void editById(CountryCardManageReleaseEO countryCardManageReleaseEO) { + Date now = new Date(); + countryCardManageReleaseEO.setUpdateTime(now); + saveOrUpdate(countryCardManageReleaseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public CountryCardManageReleaseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java new file mode 100644 index 000000000..143ab8369 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -0,0 +1,145 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; +import com.jero.modules.problemKnowledgeBase.enums.LableTypeEnum; +import com.jero.modules.problemKnowledgeBase.mapper.CountryCardTempEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +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; + +/** + * @Description: Country Card模板维护表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class CountryCardTempEOServiceImpl extends ServiceImpl implements ICountryCardTempEOService { + + @Autowired + private ICountryCardTempItemEOService countryCardTempItemEOService; + + /** + * 保存 + * + * @param countryCardTempEO + * @return + */ + @Override + public void add(CountryCardTempEO countryCardTempEO) { + Date now = new Date(); + countryCardTempEO.setCreateTime(now); + countryCardTempEO.setUpdateTime(now); + save(countryCardTempEO); + //如果选择了下拉框 + if(StringUtils.equals(countryCardTempEO.getLableType(), LableTypeEnum.PULL_SINGLE.getValue())){ + this.countryCardTempItemEOService.batchInsert(countryCardTempEO.getCountryCardTempItemEOList(),countryCardTempEO.getId(),countryCardTempEO.getCut()); + } + } + + /** + * 更新 + * + * @param countryCardTempEO + * @return + */ + @Override + public void editById(CountryCardTempEO countryCardTempEO) { + Date now = new Date(); + countryCardTempEO.setUpdateTime(now); + saveOrUpdate(countryCardTempEO); + //如果选择了下拉框 + if(StringUtils.equals(countryCardTempEO.getLableType(), LableTypeEnum.PULL_SINGLE.getValue())){ + this.countryCardTempItemEOService.batchInsert(countryCardTempEO.getCountryCardTempItemEOList(),countryCardTempEO.getId(),countryCardTempEO.getCut()); + } + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public CountryCardTempEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(CountryCardTempEO countryCardTempEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; + } + + @Override + public void disposeData(List datas, String cut) { + if (CollectionUtils.isNotEmpty(datas)) { + List countroCardTempIdList = datas.stream().map(CountryCardTempEO::getId).distinct().collect(Collectors.toList()); + QueryWrapper tempItemEOQueryWrapper = new QueryWrapper<>(); + tempItemEOQueryWrapper.lambda().in(CountryCardTempItemEO::getCountryCardTempId,countroCardTempIdList); + List countryCardTempItemEOList = this.countryCardTempItemEOService.list(tempItemEOQueryWrapper); + + datas.forEach(countryCardTemp -> { + //如果该条数据的标签类型是下拉选项 + if(CollectionUtils.isNotEmpty(countryCardTempItemEOList) && StringUtils.equals(countryCardTemp.getLableType(),LableTypeEnum.PULL_SINGLE.getValue())){ + //把这条模板的下拉选项设置进去 + List collect = countryCardTempItemEOList.stream().filter(countryCardTempItemEO -> { + boolean flag = false; + if (StringUtils.equals(countryCardTemp.getId(), countryCardTempItemEO.getCountryCardTempId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + countryCardTemp.setCountryCardTempItemEOList(collect); + } + }); + } + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempItemEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempItemEOServiceImpl.java new file mode 100644 index 000000000..0b55782e7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempItemEOServiceImpl.java @@ -0,0 +1,131 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; +import com.jero.modules.problemKnowledgeBase.mapper.CountryCardTempItemEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import java.util.UUID; + +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; + +/** + * @Description: Country Card模板维护-字典项表 + * @Author: jero-boot + * @Date: 2022-08-02 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class CountryCardTempItemEOServiceImpl extends ServiceImpl implements ICountryCardTempItemEOService { + + /** + * 保存 + * + * @param countryCardTempItemEO + * @return + */ + @Override + public void add(CountryCardTempItemEO countryCardTempItemEO) { + Date now = new Date(); + countryCardTempItemEO.setCreateTime(now); + countryCardTempItemEO.setUpdateTime(now); + save(countryCardTempItemEO); + } + + /** + * 更新 + * + * @param countryCardTempItemEO + * @return + */ + @Override + public void editById(CountryCardTempItemEO countryCardTempItemEO) { + Date now = new Date(); + countryCardTempItemEO.setUpdateTime(now); + saveOrUpdate(countryCardTempItemEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public CountryCardTempItemEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(CountryCardTempItemEO countryCardTempItemEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempItemEO, req.getParameterMap()); + List countryCardTempItemEOList = this.list(queryWrapper); + return countryCardTempItemEOList; + } + + @Override + public void batchInsert(List countryCardTempItemEOList, String countryCardTempId,String cut) { + if(CollectionUtils.isEmpty(countryCardTempItemEOList)){ + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + throw new JeroBootException("请维护下拉选项值！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Please maintain the drop-down option values!"); + } + } + + countryCardTempItemEOList.forEach(countryCardTempItemEO -> { + if(StringUtils.isEmpty(countryCardTempItemEO.getItemValue())){ + String itemValue = UUID.randomUUID().toString().replace("-", ""); + countryCardTempItemEO.setItemValue(itemValue); + } + countryCardTempItemEO.setCountryCardTempId(countryCardTempId); + countryCardTempItemEO.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); + }); + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(CountryCardTempItemEO::getCountryCardTempId,countryCardTempId); + this.baseMapper.delete(deleteWrapper); + + this.saveBatch(countryCardTempItemEOList); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java new file mode 100644 index 000000000..a4b61ebfa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseBrowsingHistoryEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseBrowsingHistoryEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库浏览历史表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseBrowsingHistoryEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + Date now = new Date(); + problemKnowledgeBaseBrowsingHistoryEO.setCreateTime(now); + problemKnowledgeBaseBrowsingHistoryEO.setUpdateTime(now); + save(problemKnowledgeBaseBrowsingHistoryEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseBrowsingHistoryEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) { + Date now = new Date(); + problemKnowledgeBaseBrowsingHistoryEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseBrowsingHistoryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseBrowsingHistoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java new file mode 100644 index 000000000..1c473bc11 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库-分类表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseClassifyEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + Date now = new Date(); + problemKnowledgeBaseClassifyEO.setCreateTime(now); + problemKnowledgeBaseClassifyEO.setUpdateTime(now); + save(problemKnowledgeBaseClassifyEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseClassifyEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) { + Date now = new Date(); + problemKnowledgeBaseClassifyEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseClassifyEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseClassifyEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java new file mode 100644 index 000000000..f78a039f3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCollectEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库收藏表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBaseCollectEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseCollectEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + Date now = new Date(); + problemKnowledgeBaseCollectEO.setCreateTime(now); + problemKnowledgeBaseCollectEO.setUpdateTime(now); + save(problemKnowledgeBaseCollectEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseCollectEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) { + Date now = new Date(); + problemKnowledgeBaseCollectEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseCollectEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseCollectEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java new file mode 100644 index 000000000..4414a118e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCommentEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库评论表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseCommentEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + Date now = new Date(); + problemKnowledgeBaseCommentEO.setCreateTime(now); + problemKnowledgeBaseCommentEO.setUpdateTime(now); + save(problemKnowledgeBaseCommentEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseCommentEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) { + Date now = new Date(); + problemKnowledgeBaseCommentEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseCommentEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseCommentEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java new file mode 100644 index 000000000..a32d7ac4e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + Date now = new Date(); + problemKnowledgeBaseEO.setCreateTime(now); + problemKnowledgeBaseEO.setUpdateTime(now); + save(problemKnowledgeBaseEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { + Date now = new Date(); + problemKnowledgeBaseEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java new file mode 100644 index 000000000..d35a8fa58 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBasePraiseEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBasePraiseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库点赞表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBasePraiseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBasePraiseEOService { + + /** + * 保存 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @Override + public void add(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + Date now = new Date(); + problemKnowledgeBasePraiseEO.setCreateTime(now); + problemKnowledgeBasePraiseEO.setUpdateTime(now); + save(problemKnowledgeBasePraiseEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBasePraiseEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) { + Date now = new Date(); + problemKnowledgeBasePraiseEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBasePraiseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBasePraiseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java new file mode 100644 index 000000000..f5f56bd8e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java @@ -0,0 +1,92 @@ +package com.jero.modules.problemKnowledgeBase.service.impl; + +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseUserEOMapper; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 问题知识库展示权限表 + * @Author: jero-boot + * @Date: 2022-08-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseUserEOService { + + /** + * 保存 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @Override + public void add(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + Date now = new Date(); + problemKnowledgeBaseUserEO.setCreateTime(now); + problemKnowledgeBaseUserEO.setUpdateTime(now); + save(problemKnowledgeBaseUserEO); + } + + /** + * 更新 + * + * @param problemKnowledgeBaseUserEO + * @return + */ + @Override + public void editById(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) { + Date now = new Date(); + problemKnowledgeBaseUserEO.setUpdateTime(now); + saveOrUpdate(problemKnowledgeBaseUserEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProblemKnowledgeBaseUserEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 50a9a67e3..6de8959a8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -116,6 +116,8 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl timeNodeVOS = new ArrayList<>(); + + // 清单确认 if(ObjectUtils.isNotEmpty(projectTaskPlanning.getListConfirmation())) { listConfirmationVO = new TimeNodeVO(); @@ -137,6 +139,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl edit(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { lawsMonthlyReportTitleTemplateEOService.editById(lawsMonthlyReportTitleTemplateEO); return Result.OK("编辑成功!"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 2dd8d1757..339832758 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -103,6 +103,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); return pageInfo; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 151bfe9d2..c2c35988f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO; import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -30,6 +33,8 @@ import java.util.stream.Collectors; @Service public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportTitleTemplateEOService { + @Autowired + private LawsMonthlyReportWriteEOServiceImpl lawsMonthlyReportWriteEOService; /** * 保存 * @@ -98,7 +103,22 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + //标题下存在内容或子标题时不能删除 + //1. 判断是否存在子标题 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids); + List list = this.list(wrapper); + if(list.size() != 0){ + throw new JeroBootException("该标题下存在子标题,不能删除"); + } + //2. 判断是否存在内容 memories_chapter + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids); + List lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper); + if(lawsMonthlyReportWriteEOS.size() != 0){ + throw new JeroBootException("该标题下存在新增内容,不能删除"); + } + removeByIds(ids); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 8a2229740..4401d668d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; @@ -29,11 +30,14 @@ import com.jero.modules.report.service.INewStandardTemplateEOService; import com.jero.modules.report.util.WordUtil; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.ProjectRoleEnum; +import com.jero.modules.system.service.impl.SysBaseApiImpl; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.shiro.SecurityUtils; import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -81,6 +85,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + //管理员查看全部数据,其余人只能查看自己的数据 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); + if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ + queryWrapper.in("create_by",currentUser.getUsername()); + } Page page = new Page(pageNo, pageSize); Page pageInfo = this.page(page, queryWrapper); //法规月报id @@ -522,6 +536,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl +
+
+ +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + +
+ +
+
+
+
+ +
+
+
+ + + + {{ item.label }} + + + +
+
+
+ +
+
+
+ + + + {{ item.label }} + + + +
+
+
+ +
+
+
+ + {{ (item.dataValue === 'null' || item.dataValue === '' || + item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+
+ + + + {{ itemin.label }} + + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + + + {{ item.label }} + + + +
+
+
+ +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (item.dataValue === 'null' || item.dataValue === '' || + item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+
+ + + + {{ itemin.label }} + + + +
+
+ + {{ (item.dataValue === 'null' || item.dataValue === '' || + item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+
+ + + + {{ item.label }} + + + +
+
+ + {{ (item.dataValue === 'null' || item.dataValue === '' || + item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+
+ + + + {{ itemin.label }} + + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (item.dataValue === 'null' || item.dataValue === '' || + item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+
+ +
+ + + + + diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index f64e2d323..537bd69ab 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -240,7 +240,7 @@ export default { let postDate = { paramsInfoPublishEOList: this.selectedRowKeysDate, paramsManifestId: this.paramsManifest.id, - projectId: this.$route.query.id + projectId: this.$route.query.projectId } postAction(`params/collectManifest/add`, postDate).then(res => { if (res.success) { diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 59a15eb92..476db1404 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -15,6 +15,7 @@
diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index c8f892d6d..30a85b887 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -68,6 +68,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -91,6 +92,7 @@ export default { editId: '', visibleoperationFailed:false, newVisible: false, + textLoading:false, NotSelectedRowKeysValue:[], labelCol: { xs: { span: 24 }, @@ -220,6 +222,7 @@ export default { // _this.$message.success(this.$t('OperationSuccessful')) if(res.data.result.length == 0){ this.visibleoperationFailed = false + this.textLoading = false _this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleTaskCutOffTimeflag', false) this.$emit('GetgetTableList') @@ -227,6 +230,7 @@ export default { }else{ this.NotSelectedRowKeysValue = res.data.result this.visibleoperationFailed = true + this.textLoading = false } // this.$emit('areaVisibleTaskCutOffTimeflag', false) diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue index 4a2538ec0..57802326e 100644 --- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue +++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue @@ -69,6 +69,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -223,10 +224,12 @@ export default { _this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleTaskCutOffTimeAll', false) this.$emit('GetgetTableList') + this.textLoading = false }else{ this.NotSelectedRowKeysValue = res.data.result this.visibleoperationFailed = true + this.textLoading = false } // this.$emit('areaVisibleTaskCutOffTime', false) diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 1b353803e..cd59122b3 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -1,36 +1,36 @@ @@ -85,4 +219,132 @@ } } } + + .box-text { + display: flex; + justify-content: space-between; + height: 60px; + line-height: 40px; + + .header-text { + font-size: 16px; + font-weight: 400; + color: #000F16; + } + } + + .content-text { + width: 100%; + display: flex; + flex-wrap: wrap; + + .text-field { + width: 33%; + margin-bottom: 8px; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + margin-top: 10px; + } + } + } + + .content { + font-size: 16px; + color: #040B29; + font-weight: 400; + } + + .content-icon { + height: 40px; + line-height: 40px; + font-size: 16px; + color: #040B29; + font-weight: 400; + text-align: right; + margin-top: 20px; + } + + .content-icon-text { + display: inline-block; + padding: 0 20px; + cursor: pointer; + line-height: 40px; + } + + .content-icon-text .icon { + font-size: 24px; + color: #3b4249 !important; + } + + .content-icon-text span { + display: inline-block; + margin-left: 4px; + } + + .box-title-text { + line-height: 1.4; + display: flex; + /*align-items: center;*/ + } + + .title-text { + width: 88px; + text-align: right; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 48px; + color: #000F16; + } + + .box-input { + display: inline-block; + height: 38px; + width: 100%; + } + + .itemModel { + width: 100%; + display: inline-block; + margin-top: 2px; + margin-bottom: 12px; + } + + .content-button { + text-align: right; + } + + .header-btn { + height: 38px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index ca1b2926e..04c9f615a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -185,7 +185,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index b10d4c466..a6b3cc5e1 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -44,7 +44,7 @@ :columns="columns" > - {{text == 1?$t('chinese'):$t('English')}} + {{text == 1?$t('simplifiedChinese'):$t('English')}} {{text}} @@ -151,7 +151,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 240, scopedSlots: { customRender: 'operation' } } ] @@ -179,7 +179,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -220,9 +220,9 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else { - if (item.createBy == this.userInfo().username){ + if (item.createBy == this.userInfo().username) { downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username }) - }else{ + } else { this.$message.warning(this.$t('theDoesNotSupportPreview')) } } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 23ffd3f15..3ccb0896f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -249,11 +249,11 @@ + v-model="formInline.lawsContactName"/> @@ -382,6 +382,12 @@ } else { this.formInline.technologyTerritory = [] } + if (!this.formInline.useMethod) { + this.formInline.useMethod = undefined + } + if (!this.formInline.state) { + this.formInline.state = undefined + } this.formInline = { ...this.formInline } } else { this.formInline = {} @@ -443,6 +449,12 @@ formInline[res] = formInline[res].join(',') } }) + if (!formInline.state || formInline.state == '' || formInline.state == 'null') { + formInline.state = '' + } + if (!formInline.useMethod || formInline.useMethod == '' || formInline.useMethod == 'null') { + formInline.useMethod = '' + } callback && callback(formInline) } }) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index a93e3f426..df745bf88 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -97,7 +97,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 280, scopedSlots: { customRender: 'operation' } } ] diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index 15940fc5e..51b79e4d2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -51,6 +51,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear + :disabled="isParentId" v-model="formInline.parentId"> { + this.isParentId = false this.formInline = {} this.$refs.ruleForm.clearValidate() }) @@ -139,8 +142,13 @@ this.title = this.$t('edit') this.visible = true this.getParent() + this.isParentId = false this.$nextTick(() => { this.formInline = row + if (!row.parentId) { + this.formInline.parentId = undefined + this.isParentId = true + } this.$refs.ruleForm.clearValidate() }) }, diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue index 9fb30c097..2fdbfc14e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue @@ -38,7 +38,6 @@ @@ -61,7 +60,8 @@ {{$t('submit')}} - + @@ -95,7 +95,7 @@ visible: false, languageList: [ { - text: this.$t('chinese'), + text: this.$t('simplifiedChinese'), value: 1 }, { @@ -275,7 +275,7 @@ .button-text { height: 38px; - width: calc(100% - 100px); + width: 100%; line-height: 38px; background: #fff; border: 1px #00B3BE solid; diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 63c70236c..08db600d4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -250,12 +250,14 @@ align: 'center', dataIndex: 'serial_number', width: 170, + ellipsis: true, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170, scopedSlots: { customRender: 'titleName' } }, @@ -335,7 +337,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue index e5eb0a45a..5b98162df 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue @@ -101,7 +101,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 3c1a9f42c..f9b4e5c45 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -306,7 +306,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index cd12fa778..b5caea42c 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -18,7 +18,7 @@
- {{$t('Push')}} + {{$t('share')}}
diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index cdf207ef6..c229dafa3 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -27,7 +27,7 @@
-
+
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 598de53c0..bdcd92593 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -47,7 +47,7 @@ size="middle" :loading="loadingLeft" :pagination="false" - :scroll="{x: '100%',y:400}" + :scroll="{x: '100%',y:340}" rowKey="id" :data-source="dataSourceLeft" :row-selection="{ selectedRowKeys: selectedRowKeysLeft, onChange: onSelectChangeLeft,columnTitle:' ' }" @@ -111,7 +111,7 @@ size="middle" :loading="loadingRight" :pagination="false" - :scroll="{x: '100%',y:400}" + :scroll="{x: '100%',y:340}" rowKey="id" :data-source="dataSourceRight" :row-selection="{ selectedRowKeys: selectedRowKeysRight, onChange: onSelectChangeRight,columnTitle:' ' }" @@ -324,6 +324,7 @@ if (res.success) { this.loading = false this.$message.success(this.$t('OperationSuccessful')) + } else { this.loading = false this.$message.warning(this.$t('operationFailed')) @@ -425,8 +426,7 @@ padding: 24px 32px; box-sizing: border-box; border-bottom: 2px #EFF1F3 solid; - min-height: 400px; - max-height: 672px; + height:610px; } .detail-content-right { @@ -435,8 +435,7 @@ padding: 24px 32px; box-sizing: border-box; border-bottom: 2px #EFF1F3 solid; - min-height: 400px; - max-height: 672px; + height: 610px; } .page { diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 246dcc425..934c99acc 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -26,19 +26,10 @@
{{$t('releaseSituation')}}
- - - - {{ item.name }} - - - +
@@ -219,7 +210,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index c13dbc0ca..4298fc61f 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -94,7 +94,7 @@ - +
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 2a35ee4cc..f1882ee91 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -249,7 +249,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index ed60ad494..046a35993 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -66,7 +66,7 @@ :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}
- + {{$t('nonjoinder')}} @@ -82,11 +82,11 @@
- * + * {{$t('MergeSeparator')}}
- + ?:"{}|,.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/, + message: this.$t('punctuationmark'), + trigger: 'blur' + } ], certCategory:[ { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' }, @@ -161,6 +166,11 @@ export default { }, mounted() { this.getNameList() + if(this.formInline.combineFlag == '1'){ + this.required = false + }else{ + this.required = true + } }, methods: { uploadSuccess(data) { @@ -188,9 +198,9 @@ export default { flagChange(value){ console.log(value.target.value) if(value.target.value == 2){ - this.required = true - }else{ this.required = false + }else{ + this.required = true } }, getNameList() { diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 47bc18363..703ffe5b8 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -62,7 +62,7 @@ {{$t('sdt')}}
+ +
+ + {{$t('preservation')}} +
- + {{$t('ConventionalExport')}}
- + {{$t('CustomExport')}}
@@ -134,6 +139,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -159,6 +165,7 @@ export default { columns:[], selectedRowKeys: [], formInline: {}, + textLoading:false, url: { tableHeader: 'report/detail/getHeader', tableList: 'report/detail/list', @@ -286,6 +293,59 @@ export default { this.formInline[value] = id this.formInline = { ...this.formInline } }, + // 保存 + handlePreservation(num) { + let _this = this + let postDate = [] + let data = JSON.parse(JSON.stringify(this.dataSource)) + let selectedRowKeysValue = [] + data.forEach(res => { + selectedRowKeysValue.push(res) + }) + console.log(selectedRowKeysValue) + for (let i = 0; i < selectedRowKeysValue.length; i++) { + let postDateobj = {} + let itemIn = Object.keys(selectedRowKeysValue[i]) + console.log(itemIn) + for (let j = 0; j < itemIn.length; j++) { + if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + } + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + } + } + } + } + } + postDateobj.id = selectedRowKeysValue[i].id + postDate.push(postDateobj) + } + let configDataList = { configDataList: postDate } + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + this.textLoading = true + let query = { + ...configDataList, + paramsManifestId: this.$route.query.id + } + postAction('/report/detail/save', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + this.$refs.CollectionTabel.getTableList() + this.textLoading = false + } else { + _this.$message.warning(_this.$t('operationFailed')) + this.textLoading = false + } + }) + } else { + } + }, getTableList() { // console.log('this.searchParmestable',this.searchParmes) let pageNo = JSON.parse(JSON.stringify(this.pageNo)) @@ -319,70 +379,6 @@ export default { getDataSource(data) { this.dataSource = data }, - handlePreservation(num) { - let _this = this - let postDate = [] - let data = JSON.parse(JSON.stringify(this.dataSource)) - let selectedRowKeysValue = [] - data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写') { - selectedRowKeysValue.push(res) - } - }) - for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt') { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - } - } - } - } - } - postDateobj.id = selectedRowKeysValue[i].id - postDate.push(postDateobj) - } - let configDataList = { configDataList: postDate } - if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { - if (num && num == 1) { - this.textLoading = true - } - let query = { - ...configDataList, - paramsManifestId: this.paramsManifest.id - } - postAction('/params/collectManifest/save', query).then((res) => { - if (res.success) { - if (num && num == 1) { - _this.$message.success(_this.$t('OperationSuccessful')) - this.textLoading = false - } - setTimeout(() => { - if (this.currentPersonRole == 'dre') { - this.handlePreservation() - } - }, 10000) - } else { - if (num && num == 1) { - _this.$message.warning(_this.$t('operationFailed')) - this.textLoading = false - } - } - }) - } else { - if (num && num == 1) { - this.$message.warning(this.$t('theCurrentListSaved')) - } - } - }, LoginUserType(val, currentPersonRole, userType) { this.RoleType = [] if (this.currentPersonRole == '') { diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index c3bf52f65..046e8655d 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -376,7 +376,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, { - pattern: /^[0-9a-zA-Z-/. ]{1,}$/, + pattern: /^[0-9a-zA-Z-/ ]{1,}$/, message: this.$t('onlyThree'), trigger: 'blur' } diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 8c7c98df8..b237e6c53 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -5,7 +5,7 @@ {{title}}
-
+
@@ -41,18 +41,15 @@
- * - {{$t('questionsSuggestions')}} + {{$t('enclosure')}}
- - + + + {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || + item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} +
@@ -63,26 +60,30 @@
{{$t('reason')}}
- - + +
- {{$t('enclosure')}} + * + {{$t('questionsSuggestions')}}
- - - {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || - item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - + +
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 84a15c57f..44ddc7ec6 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -9,7 +9,8 @@
-
+
{{item.title}} {{ $t('viewFile') }} - {{queryForm[item.value]}} @@ -58,14 +58,14 @@ type: Object, default: {} }, - title:{ - type:String, - default:'', - }, - isConfirmationDeadline:{ - type:Boolean, - default:false, + title: { + type: String, + default: '' }, + isConfirmationDeadline: { + type: Boolean, + default: false + } }, components: { viewFileModel @@ -77,6 +77,7 @@ }, mounted() { this.queryForm = this.standardContentQuery + this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方；公开地方领导反馈给东丽的反馈给管库给的给' }, methods: { urlClick(val) { @@ -147,5 +148,40 @@ cursor: pointer; } } + + .text-content-button-one { + width: 100%; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + float: left; + margin-top: 3px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: pre-wrap; + overflow: visible; + float: left; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + } + } } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 29935870b..503b8409d 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -88,7 +88,8 @@ {}, { title: this.$t('taskDescription'), - value: 'taskExplain' + value: 'taskExplain', + type:4, } // { // title: this.$t('remarks'), diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 57d5c035c..4786177ce 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -219,6 +219,8 @@ html += params[i].marker + params[i].seriesName + ":" + params[i].value; if (_this.queryParam.value == 1) { html += "%" + "
"; + }else{ + html +="
"; } } return html; diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index fc24c69e0..d8debd3ca 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -64,6 +64,15 @@ v-model="formInline.dre">
+ +
+
+ {{$t('sdt')}} +
+ +
+ @@ -424,6 +433,7 @@