合并分支 'dev_2nd_LCYH' 到 'master'
Dev 2nd lcyh 查看合并请求 laws-nio/laws-weilai!301
This commit is contained in:
高嵩
@@ -202,6 +202,30 @@ ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AF
|
||||
-- 上报库-参数项查看页表头 责任领域更新为展示列表sql 2023-02-17 已同步生产环境
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492';
|
||||
|
||||
-- 文档库-分阶段实施详情表 2023-02-22 未同步生产环境
|
||||
CREATE TABLE `phased_implementation_details` (
|
||||
`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 '所属部门',
|
||||
`buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id',
|
||||
`stand_number_or_clause` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规编号/条款',
|
||||
`implementation_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实施类型',
|
||||
`implementation_date` datetime NULL DEFAULT NULL COMMENT '实施日期',
|
||||
`remarks` 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 = '文档库-分阶段实施详情表' ROW_FORMAT = Dynamic;
|
||||
|
||||
-- 标签内容管理 新增实施类型标签（在产车/新车形） 2023-02-22 未同步生产环境
|
||||
INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1628227874969300994', '实施类型', 'shi2_shi1_lei4_xing2', '文档库-分阶段实施详情-实施类型', 0, 'admin', '2023-02-22 10:59:11', NULL, NULL, NULL, NULL, 1, 0, '1', 1);
|
||||
INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228171473039361', '1628227874969300994', '在产车', '34e90bd6a000471bbdcd0ff325898740', NULL, 1, 1, 'admin', '2023-02-22 11:00:22', NULL, NULL, 1, NULL, NULL, '0', 'Car in production');
|
||||
INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228101830815745', '1628227874969300994', '新车型', '2148610ff06641849106321531656bfc', NULL, 2, 1, 'admin', '2023-02-22 11:00:05', 'admin', '2023-02-22 11:00:27', 1, NULL, NULL, '0', 'New car model');
|
||||
|
||||
-- 文档库-分阶段实施详情表-增加排序号字段 2023-02-23 未同步生产环境
|
||||
ALTER TABLE `phased_implementation_details` ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `remarks`;
|
||||
|
||||
-- 任务清单-初始化 认证进度状态sql 2023-02-20 已同步生产环境
|
||||
UPDATE `laws_weilai`.`project_task_inventory`
|
||||
SET `certification_progress` = 'Not start'
|
||||
@@ -210,3 +234,218 @@ WHERE
|
||||
SELECT id as temp_id FROM `laws_weilai`.`project_task_inventory` WHERE certification_progress IS NULL
|
||||
) temp
|
||||
);
|
||||
|
||||
|
||||
-- 认证虚拟清单基础表 2023-03-03 未同步生产环境
|
||||
CREATE TABLE `auth_dummy_inventory_base` (
|
||||
`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 '所属部门',
|
||||
`name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '虚拟清单名称',
|
||||
`use_explain` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '使用说明',
|
||||
`state` varchar(32) 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;
|
||||
|
||||
-- 认证虚拟清单详情表 2023-03-03 未同步生产环境
|
||||
CREATE TABLE `auth_dummy_inventory_info` (
|
||||
`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 '所属部门',
|
||||
`category` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别',
|
||||
`inspection_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检验项目',
|
||||
`config_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项',
|
||||
`wvta_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID',
|
||||
`serial_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号',
|
||||
`duty_territory` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域',
|
||||
`deliverable` varchar(500) 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',
|
||||
`auth_dummy_inventory_base_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;
|
||||
|
||||
-- 项目库-认证清单表 2023-03-03 未同步生产环境
|
||||
CREATE TABLE `project_certification_inventory` (
|
||||
`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 '所属部门',
|
||||
`category` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别',
|
||||
`inspection_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检验项目',
|
||||
`config_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项',
|
||||
`wvta_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID',
|
||||
`serial_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号',
|
||||
`duty_territory` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域',
|
||||
`deliverable` varchar(500) 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',
|
||||
`sdt` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工程接口人',
|
||||
`duty_person` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任人',
|
||||
`deliverable_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物类型',
|
||||
`deliverable_template` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板',
|
||||
`delivery_result` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付结果',
|
||||
`end_time` datetime NULL DEFAULT NULL COMMENT '截止日期',
|
||||
`flow_status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程状态',
|
||||
`report_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报告编号',
|
||||
`product_model` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '产品型号',
|
||||
`production_enterprise_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '生产企业名称',
|
||||
`certification_progress` varchar(64) 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;
|
||||
|
||||
|
||||
-- 标签管理-增加认证虚拟清单状态数据。 2023-03-06 未同步生产环境
|
||||
INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1632552252162908162', '认证虚拟清单状态', 'ren4_zheng4_xu1_ni3_qing1_dan1_zhuang4_tai4', '认证虚拟清单状态', 0, 'admin', '2023-03-06 09:22:43', NULL, NULL, NULL, NULL, 1, 0, '1', 1);
|
||||
|
||||
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1632552514273353729', '1632552252162908162', '草稿', '2', '草稿', 2, 1, 'admin', '2023-03-06 09:23:45', NULL, NULL, 1, NULL, NULL, '0', 'Draft');
|
||||
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1632552455762812930', '1632552252162908162', '已发布', '1', '已发布', 1, 1, 'admin', '2023-03-06 09:23:31', NULL, NULL, 1, NULL, NULL, '0', 'Issue');
|
||||
|
||||
|
||||
-- 项目库-认证清单表-增加项目库id 2023-03-06 未同步生产环境
|
||||
ALTER TABLE `project_certification_inventory`
|
||||
ADD COLUMN `project_library_id` varchar(64) NULL COMMENT '项目库id' AFTER `certification_progress`;
|
||||
|
||||
-- 项目库-项目与角色关系表-增加模块类型（标识）字段 2023-03-06 未同步生产环境
|
||||
ALTER TABLE `project_library_role_rel`
|
||||
ADD COLUMN `model_type` varchar(64) NULL COMMENT '模块类型，对应系统中枚举类 RoleRelModelTypeEnum ' AFTER `role_code`;
|
||||
|
||||
-- 初始化历史数据
|
||||
update project_library_role_rel set model_type = 'Laws inventory';
|
||||
|
||||
-- 项目库-认证清单表-增加认证进度备注 2023-03-08 未同步生产环境
|
||||
ALTER TABLE `project_certification_inventory`
|
||||
ADD COLUMN `certification_progress_remark` varchar(2000) NULL COMMENT '认证进度备注' AFTER `certification_progress`;
|
||||
-- 将之前的任务清单-认证进度，修改为 认证清单-认证进度 2023-03-08 未同步生产环境
|
||||
UPDATE `sys_dict` SET `dict_name` = '认证清单-认证进度', `description` = '认证清单-认证进度' WHERE `id` = '1524311122804346881';
|
||||
-- 认证虚拟清单订阅表 2023-03-10 未同步生产环境
|
||||
CREATE TABLE `auth_dummy_read` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`auth_dummy_inventory_base_id` varchar(32) DEFAULT NULL COMMENT '虚拟认证清单基础表id',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
-- 认证虚拟清单系统维护表 2023-03-10 未同步生产环境
|
||||
CREATE TABLE `auth_dummy_content_change` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`connect_id` varchar(32) DEFAULT NULL COMMENT '虚拟认证清单基础表id或虚拟认证清单详情表中的baseId',
|
||||
`parent_id` varchar(32) DEFAULT NULL COMMENT '父id',
|
||||
`content_json` longtext COMMENT '内容',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 标签管理 增加认证清单-配置项数据 2023-03-13 未同步生产环境 （由于需求确认 认证清单-配置项为输入框，此数据暂时不用了。）
|
||||
-- INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635093263477002242', '认证清单-配置项', 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4', '认证清单-配置项', 0, 'admin', '2023-03-13 09:39:47', NULL, NULL, NULL, NULL, 1, 0, '1', 1);
|
||||
--
|
||||
-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093344389320705', '1635093263477002242', '配置1', '46c10455e29e4855bb7e5d653b11a51d', '开发环境假数据', 1, 1, 'admin', '2023-03-13 09:40:07', 'admin', '2023-03-13 09:40:46', 1, NULL, NULL, '0', 'pz1');
|
||||
-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093406049783810', '1635093263477002242', '配置2', '4718f8eef0434d079b970834a2b9dd69', '开发环境假数据', 2, 1, 'admin', '2023-03-13 09:40:21', 'admin', '2023-03-13 09:40:43', 1, NULL, NULL, '0', 'Pz2');
|
||||
-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093480922304513', '1635093263477002242', '配置3', 'd3dd928d93d74e07ad8fa31bffea9641', '开发环境假数据', 3, 1, 'admin', '2023-03-13 09:40:39', NULL, NULL, 1, NULL, NULL, '0', 'Pz3');
|
||||
|
||||
-- 认证虚拟清单明细表 增加字段 交付物类型 2023-03-13 未同步生产环境
|
||||
ALTER TABLE `auth_dummy_inventory_info`
|
||||
ADD COLUMN `deliverable_type` varchar(255) NULL COMMENT '交付物类型' AFTER `deliverable`;
|
||||
|
||||
-- 项目库-认证清单 修改交付物类型字段长度 2023-03-13 未同步生产环境
|
||||
ALTER TABLE `project_certification_inventory`
|
||||
MODIFY COLUMN `deliverable_type` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物类型' AFTER `duty_person`;
|
||||
|
||||
-- 项目库-认证清单-修改历史表 2023-03-13 未同步生产环境
|
||||
CREATE TABLE `project_certification_inventory_log` (
|
||||
`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 '所属部门',
|
||||
`content_cn` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-中文',
|
||||
`content_en` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-英文',
|
||||
`operator_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作类型',
|
||||
`project_certification_inventory_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;
|
||||
|
||||
-- 分类字典表增加字段，认证清单-交付物类型使用 2023-03-14 未同步生产环境
|
||||
ALTER TABLE `sys_category`
|
||||
ADD COLUMN `value_type` varchar(255) NULL COMMENT '值类型:值对应SysCategoryValueTypeEnum枚举类' AFTER `sort_order`;
|
||||
|
||||
-- 增加标签管理数据 认证-交付物类型 2023-03-14 未同步生产环境
|
||||
INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635543933669818369', '认证-交付物类型', 'ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2', NULL, 0, 'admin', '2023-03-14 15:30:35', NULL, NULL, NULL, NULL, 1, 0, '2', 30);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635544016406659074', '0', 'testCn1', NULL, 'admin', '2023-03-14 15:30:55', 'admin', '2023-03-14 15:35:09', 'A01', '1635543933669818369', NULL, 'testEn1', NULL, 1, NULL, NULL, 1, NULL, 2);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545079494950913', '0', '强检报告(附件)Cn', NULL, 'admin', '2023-03-14 15:35:09', 'admin', '2023-03-14 15:36:01', 'A01', '1635543933669818369', NULL, '强检报告(附件)En', NULL, 1, NULL, NULL, 0, NULL, 3);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545194746036225', '0', 'CCC证书(附件)Cn', NULL, 'admin', '2023-03-14 15:35:36', NULL, NULL, 'A01', '1635543933669818369', NULL, 'CCC证书(附件)En', NULL, 1, NULL, NULL, 0, NULL, 1);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545299360366594', '0', 'E-Mark(附件)Cn', NULL, 'admin', '2023-03-14 15:36:01', NULL, NULL, 'A01', '1635543933669818369', NULL, 'E-Mark(附件)En', NULL, 1, NULL, NULL, 0, NULL, 2);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545372836184066', '0', '自我声明Cn', NULL, 'admin', '2023-03-14 15:36:19', NULL, NULL, 'A01', '1635543933669818369', NULL, '自我生命En', NULL, 1, NULL, NULL, 0, NULL, 4);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545471297470465', '0', '自愿认证Cn', NULL, 'admin', '2023-03-14 15:36:42', NULL, NULL, 'A01', '1635543933669818369', NULL, '自愿认证En', NULL, 1, NULL, NULL, 0, NULL, 5);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545540197302273', '0', '摸底报告Cn', NULL, 'admin', '2023-03-14 15:36:58', 'admin', '2023-03-14 15:37:20', 'A01', '1635543933669818369', NULL, '摸底报告En', NULL, 1, NULL, NULL, 0, NULL, 7);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545630152540161', '0', '工程评估（文本）Cn', NULL, 'admin', '2023-03-14 15:37:20', NULL, NULL, 'A01', '1635543933669818369', NULL, '工程评估（文本）En', NULL, 1, NULL, NULL, 0, NULL, 6);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545748968783874', '0', 'N/A不填Cn', NULL, 'admin', '2023-03-14 15:37:48', NULL, NULL, 'A01', '1635543933669818369', NULL, 'N/A不填En', NULL, 1, NULL, NULL, 0, NULL, 8);
|
||||
|
||||
-- 法规清单表 增加字段 设计、验证符合性确认-流程状态 2023-03-17 未同步生产环境
|
||||
ALTER TABLE `project_laws_inventory`
|
||||
ADD COLUMN `design_flow_status` varchar(255) NULL COMMENT '设计符合性确认-流程状态' AFTER `design_due_date`,
|
||||
ADD COLUMN `verify_flow_status` varchar(255) NULL COMMENT '验证符合性确认-流程状态' AFTER `verify_due_date`;
|
||||
|
||||
-- 认证虚拟清单log表 2023-03-17 未同步生产环境
|
||||
CREATE TABLE `auth_dummy_log` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`auth_dummy_inventory_base_id` varchar(32) DEFAULT NULL COMMENT '虚拟认证清单基础表id',
|
||||
`log_content` varchar(5000) DEFAULT NULL COMMENT 'log内容',
|
||||
`is_en_log` varchar(50) DEFAULT NULL COMMENT 'log语言类别,cn中文,en英文',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
-- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境
|
||||
ALTER TABLE `laws_weilai`.`params_config_data`
|
||||
ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`;
|
||||
|
||||
-- 上报库参数配置数据表，增加排序号字段sql 2023-2-1 未同步生产环境
|
||||
ALTER TABLE `laws_weilai`.`params_report_config_data`
|
||||
ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`;
|
||||
|
||||
-- 流程历史表，增加字段 附件id 2023-3-20 未同步生产环境
|
||||
ALTER TABLE `process_history`
|
||||
ADD COLUMN `approval_file` varchar(2000) NULL COMMENT '附件id，多个之间使用英文逗号分隔' AFTER `project_laws_inventory_id`;
|
||||
|
||||
-- 项目库-相关人员维护表，增加字段 工程接口人法规工程师设置,工程接口人认证工程师设置 2023-3-22 未同步生产环境
|
||||
ALTER TABLE `project_related_personnel`
|
||||
ADD COLUMN `engineer_law_set` varchar(500) NULL COMMENT '工程接口人法规工程师设置' AFTER `law_engineer`;
|
||||
ADD COLUMN `engineer_att_set` varchar(500) NULL COMMENT '工程接口人认证工程师设置' AFTER `certification_engineer`;
|
||||
|
||||
-- 项目库-法规/认证任务计划 (各阶段确认进度) 表，增加字段 认证提交 2023-3-23 未同步生产环境
|
||||
ALTER TABLE `project_task_planning`
|
||||
ADD COLUMN `certification_submission` datetime(0) NULL COMMENT '认证提交' AFTER `attestation_start_time`;
|
||||
|
||||
-- 项目库-认证清单-认证目录 说明字段长度修改 2023-3-30 未同步生产环境
|
||||
ALTER TABLE `project_certification_directory`
|
||||
MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
|
||||
|
||||
-- 项目库-法规清单-定版表增加字段 2023-3-30 未同步生产环境
|
||||
ALTER TABLE `project_version_info`
|
||||
MODIFY COLUMN `inventory_affirm_status` varchar(100) CHARACTER SET utf32 NULL DEFAULT NULL COMMENT '清单确认状态' AFTER `task_affirm_status`,
|
||||
ADD COLUMN `design_flow_status` varchar(255) NULL COMMENT '设计符合性确认-流程状态' AFTER `inventory_affirm_status`,
|
||||
ADD COLUMN `verify_flow_status` varchar(255) NULL COMMENT '验证符合性确认-流程状态' AFTER `design_flow_status`;
|
||||
|
||||
-- 项目库-法规清单-定版表增加字段 2023-3-30 未同步生产环境
|
||||
ALTER TABLE `project_version_info`
|
||||
ADD COLUMN `project_laws_inventory_id` varchar(255) NULL COMMENT '法规清单数据id' AFTER `verify_flow_status`;
|
||||
ALTER TABLE `project_version_info`
|
||||
ADD COLUMN `applicable_supplement` varchar(255) NULL COMMENT '适用增补件' AFTER `project_laws_inventory_id`;
|
||||
+2
-1
@@ -13,7 +13,8 @@ public enum MessageType2Enum {
|
||||
VALIDATION_COMPLIANCE_CONFIRMATION("Validation Compliance Confirmation","验证符合性确认"),
|
||||
REGULATION_OPINION_COLLECTION("Regulation Opinion Collection","法规意见收集"),
|
||||
REGULATION_TECHNICAL_ASSESSMENT("Regulation Technical Assessment","法规技术评估"),
|
||||
HOMO_PARAMETER_COLLECTION("Homo Parameter Collection","认证参数收集");
|
||||
HOMO_PARAMETER_COLLECTION("Homo Parameter Collection","认证参数收集"),
|
||||
CERTIFICATION_LIST_CONFIRMATION("Certification List Confirmation","认证清单确认");
|
||||
|
||||
String en;
|
||||
String cn;
|
||||
|
||||
+24
@@ -1,5 +1,6 @@
|
||||
package com.jero.common.util;
|
||||
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.beans.PropertyEditorSupport;
|
||||
@@ -8,6 +9,7 @@ import java.text.DateFormat;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 类描述：时间操作定义类
|
||||
@@ -614,6 +616,28 @@ public class DateUtils extends PropertyEditorSupport {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 日期数据转换字符串
|
||||
* @param dateList
|
||||
* @return
|
||||
*/
|
||||
public static String formatDateList(List<Date> dateList) {
|
||||
StringBuilder strSb = new StringBuilder();
|
||||
|
||||
if(CollectionUtils.isNotEmpty(dateList)){
|
||||
dateList = dateList.stream().distinct().sorted().collect(Collectors.toList());
|
||||
for (Date date : dateList) {
|
||||
strSb.append(date_sdf.get().format(date)).append(",");
|
||||
}
|
||||
}
|
||||
|
||||
String result = "";
|
||||
if(!StringUtils.isEmpty(strSb.toString())){
|
||||
result = strSb.substring(0,strSb.length()-1);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd
|
||||
* HH:mm:ss“ * @param text String类型的时间值
|
||||
|
||||
+10
@@ -603,4 +603,14 @@ public class SysCategoryController {
|
||||
String flag = "evaluation_method";
|
||||
return Result.OK(sysCategoryService.getSysCategoryTree(flag));
|
||||
}
|
||||
|
||||
/**
|
||||
* 只查询交付物类型的树形数据字典
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getCertificationDeliverableTree")
|
||||
public Result getCertificationDeliverableTree() {
|
||||
String flag = "ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2";
|
||||
return Result.OK(sysCategoryService.getSysCategoryTree(flag));
|
||||
}
|
||||
}
|
||||
|
||||
+12
@@ -33,6 +33,7 @@ import com.jero.modules.utils.HanYuPinYinUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
@@ -186,6 +187,17 @@ public class SysDictController {
|
||||
ls = sysDictService.queryDictItemsByCode(dictCode);
|
||||
}
|
||||
|
||||
// 将结果集进行排序
|
||||
if (CollectionUtils.isNotEmpty(ls)) {
|
||||
// 匿名比较器排序
|
||||
Collections.sort(ls, new Comparator<DictModel>() {
|
||||
@Override
|
||||
public int compare(DictModel p1, DictModel p2) {
|
||||
return p1.getText().compareTo(p2.getText());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
result.setSuccess(true);
|
||||
result.setResult(ls);
|
||||
log.debug(result.toString());
|
||||
|
||||
+1
@@ -659,6 +659,7 @@ public class SysPermissionController {
|
||||
flowTypeList.add("3");
|
||||
flowTypeList.add("4");
|
||||
flowTypeList.add("10");
|
||||
flowTypeList.add("21");
|
||||
params.put("flowTypeList",flowTypeList);
|
||||
//存在待办任务标识，true为有
|
||||
boolean existTaskFlag = false;
|
||||
|
||||
+5
@@ -96,6 +96,11 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
|
||||
@Dict(dicCode = "attribute_type")
|
||||
private java.lang.String attributeType;
|
||||
|
||||
// 值对应SysCategoryValueTypeEnum枚举类
|
||||
@ApiModelProperty(value = "值类型 1附件 2文本 3不用填")
|
||||
@Dict(dicCode = "value_type")
|
||||
private java.lang.String valueType;
|
||||
|
||||
/**逻辑删除标识*/
|
||||
@TableLogic
|
||||
public Integer delFlag;
|
||||
|
||||
+17
@@ -1,5 +1,7 @@
|
||||
package com.jero.modules.system.enums;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
/**
|
||||
* 项目角色枚举类
|
||||
*/
|
||||
@@ -12,6 +14,12 @@ public enum ProjectRoleEnum {
|
||||
ADMIN("系统管理员","12","admin"),
|
||||
VIEWER("Viewer","13","Viewer"),
|
||||
BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator"),
|
||||
//法规清单使用
|
||||
INTERFACE_PERSON1("工程接口人","30","Interface person"),
|
||||
PERSON_LIABLE1("责任人","31","Person liable"),
|
||||
// 项目库-认证清单使用。
|
||||
INTERFACE_PERSON("工程接口人","20","Interface person"),
|
||||
PERSON_LIABLE("责任人","21","Person liable"),
|
||||
;
|
||||
|
||||
String name;
|
||||
@@ -24,6 +32,15 @@ public enum ProjectRoleEnum {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public static ProjectRoleEnum getByValue(String value) {
|
||||
for (ProjectRoleEnum projectRoleEnum : ProjectRoleEnum.values()) {
|
||||
if(StringUtils.equals(value,projectRoleEnum.getValue())){
|
||||
return projectRoleEnum;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.jero.modules.system.enums;
|
||||
|
||||
public enum SysCategoryValueTypeEnum {
|
||||
|
||||
FILE("附件","file"),
|
||||
TEXT("文本","text"),
|
||||
SELECT("选择","select"),
|
||||
NA("不用填","N/A"),
|
||||
;
|
||||
|
||||
String name;
|
||||
String value;
|
||||
|
||||
private SysCategoryValueTypeEnum(String name, String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
}
|
||||
+2
@@ -153,4 +153,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
|
||||
List<SysUser> getPPEmployeeList(@Param("thirdType") String thirdType);
|
||||
|
||||
void updateByIdPP (SysUser sysUser);
|
||||
|
||||
List<SysUser> getListUserName();
|
||||
}
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
|
||||
<select id="queryByList" resultType="com.jero.modules.system.entity.SysCategory">
|
||||
select create_by,create_time,sys_org_code,update_by,update_time,attribute_type,code,sort_order,
|
||||
del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id
|
||||
del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id,value_type
|
||||
from sys_category
|
||||
where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} and del_flag=0
|
||||
<!--搜索条件:标签名称包含%,单独搜索-->
|
||||
|
||||
+4
@@ -222,4 +222,8 @@
|
||||
id = #{id}
|
||||
</update>
|
||||
|
||||
<select id="getListUserName" resultType="com.jero.modules.system.entity.SysUser">
|
||||
select * from sys_user
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
+12
@@ -34,4 +34,16 @@ public interface ISysDictItemService extends IService<SysDictItem> {
|
||||
void setAddOrderNum(SysDictItem sysDictItem);
|
||||
|
||||
void setEditOrderNum(SysDictItem sysDictItem);
|
||||
|
||||
String disposeShowDictItemValue(List<SysDictItem> sysDictItems,String fieldValues,String cut,String dicCode);
|
||||
|
||||
/**
|
||||
* 导入时将item_text处置为item_value存入
|
||||
* @param sysDictItems
|
||||
* @param fieldTexts
|
||||
* @param cut
|
||||
* @param dicCode
|
||||
* @return
|
||||
*/
|
||||
String disposeShowDictItemText(List<SysDictItem> sysDictItems,String fieldTexts,String cut,String dicCode);
|
||||
}
|
||||
|
||||
+17
@@ -304,4 +304,21 @@ public interface ISysUserService extends IService<SysUser> {
|
||||
|
||||
boolean isViewer(String userId);
|
||||
|
||||
/**
|
||||
* 根据用户id，获取用户的飞书id
|
||||
* @param sysUserList
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
String getUserThirdIdByUserId(List<SysUser> sysUserList, String userId);
|
||||
|
||||
/**
|
||||
* 根据用户id，获取用户名
|
||||
* @param sysUserList
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
String getUsernameByUserId(List<SysUser> sysUserList, String userId);
|
||||
|
||||
List<SysUser> querySysUserByUserNameList(List<String> userNameList);
|
||||
}
|
||||
|
||||
+2
@@ -275,6 +275,8 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
|
||||
dictId = sysCategoryMapper.getDictId("deliverable_template");
|
||||
}else if("evaluation_method".equals(flag)){
|
||||
dictId = sysCategoryMapper.getDictId("evaluation_method");
|
||||
}else if("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2".equals(flag)){
|
||||
dictId = sysCategoryMapper.getDictId("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2");
|
||||
}else{
|
||||
dictId = sysCategoryMapper.getFieldInfo("technology_territory");
|
||||
}
|
||||
|
||||
+92
@@ -3,12 +3,16 @@ package com.jero.modules.system.service.impl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.modules.system.entity.SysDictItem;
|
||||
import com.jero.modules.system.mapper.SysDictItemMapper;
|
||||
import com.jero.modules.system.service.ISysDictItemService;
|
||||
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.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -139,4 +143,92 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String disposeShowDictItemValue(List<SysDictItem> sysDictItems, String fieldValues, String cut, String dicCode) {
|
||||
String result = "";
|
||||
List<SysDictItem> sysDictItemList = sysDictItems.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
if(StringUtils.equals(e.getDictCode(),dicCode)){
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).distinct().collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(sysDictItemList)){
|
||||
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
result = sysDictItemList.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
List<String> fieldValueStrList = Arrays.asList(fieldValues.split(","));
|
||||
for (String fieldValueStr : fieldValueStrList) {
|
||||
if(StringUtils.equals(fieldValueStr,e.getItemValue())){
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).map(SysDictItem::getItemText).collect(Collectors.joining(","));
|
||||
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
result = sysDictItemList.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
List<String> fieldValueStrList = Arrays.asList(fieldValues.split(","));
|
||||
for (String fieldValueStr : fieldValueStrList) {
|
||||
if(StringUtils.equals(fieldValueStr,e.getItemValue())){
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).map(SysDictItem::getEnName).collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入时将item_text处置为item_value存入
|
||||
* @param sysDictItems
|
||||
* @param fieldTexts
|
||||
* @param cut
|
||||
* @param dicCode
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String disposeShowDictItemText(List<SysDictItem> sysDictItems, String fieldTexts, String cut, String dicCode) {
|
||||
String result = "";
|
||||
List<SysDictItem> sysDictItemList = sysDictItems.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
if(StringUtils.equals(e.getDictCode(),dicCode)){
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).distinct().collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(sysDictItemList)){
|
||||
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
result = sysDictItemList.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
List<String> fieldTextStrList = Arrays.asList(fieldTexts.split(","));
|
||||
for (String fieldTextStr : fieldTextStrList) {
|
||||
if(StringUtils.equals(fieldTextStr,e.getItemText())){
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).map(SysDictItem::getItemValue).collect(Collectors.joining(","));
|
||||
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
result = sysDictItemList.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
List<String> fieldTextStrList = Arrays.asList(fieldTexts.split(","));
|
||||
for (String fieldTextStr : fieldTextStrList) {
|
||||
if(StringUtils.equals(fieldTextStr,e.getItemText())){
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).map(SysDictItem::getItemValue).collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -443,7 +443,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
||||
@Override
|
||||
public String queryDictItemByValue(String code, String itemValue, String cut) {
|
||||
|
||||
String dictItemValue= sysDictMapper.queryDictTextByKey(code,itemValue);
|
||||
String dictItemValue= sysDictMapper.queryDictKeyByText(code,itemValue);
|
||||
return dictItemValue;
|
||||
|
||||
}
|
||||
|
||||
+43
@@ -767,4 +767,47 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
||||
}
|
||||
return boo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUserThirdIdByUserId(List<SysUser> sysUserList, String userId) {
|
||||
String result = "";
|
||||
if(CollectionUtils.isNotEmpty(sysUserList)){
|
||||
result = sysUserList.stream().filter(userInfo -> {
|
||||
boolean flag = false;
|
||||
if(StringUtils.equals(userId,userInfo.getId())){
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).collect(Collectors.toList()).get(0).getThirdId();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsernameByUserId(List<SysUser> sysUserList, String userId) {
|
||||
String result = "";
|
||||
if(CollectionUtils.isNotEmpty(sysUserList)){
|
||||
result = sysUserList.stream().filter(user -> {
|
||||
boolean flag = false;
|
||||
if (org.apache.commons.lang3.StringUtils.equals(userId, user.getId())) {
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).map(SysUser::getUsername).collect(Collectors.joining(","));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysUser> querySysUserByUserNameList(List<String> userNameList) {
|
||||
List<SysUser> result = new ArrayList<>();
|
||||
if(CollectionUtils.isNotEmpty(userNameList)){
|
||||
userNameList = userNameList.stream().distinct().collect(Collectors.toList());
|
||||
|
||||
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.lambda().in(SysUser::getUsername,userNameList);
|
||||
result = this.list(queryWrapper);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
package com.jero.modules.authDummy.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.authDummy.entity.AuthDummyContentChangeEO;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyContentChangeEOService;
|
||||
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: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="虚拟认证清单系统维护表")
|
||||
@RestController
|
||||
@RequestMapping("/com.jero.modules.authDummy/authDummyContentChangeEO")
|
||||
@Slf4j
|
||||
public class AuthDummyContentChangeEOController extends JeroController<AuthDummyContentChangeEO, IAuthDummyContentChangeEOService> {
|
||||
@Autowired
|
||||
private IAuthDummyContentChangeEOService authDummyContentChangeEOService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单系统维护表-分页列表查询")
|
||||
@ApiOperation(value="虚拟认证清单系统维护表-分页列表查询", notes="虚拟认证清单系统维护表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(AuthDummyContentChangeEO authDummyContentChangeEO,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<AuthDummyContentChangeEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyContentChangeEO, req.getParameterMap());
|
||||
Page<AuthDummyContentChangeEO> page = new Page<AuthDummyContentChangeEO>(pageNo, pageSize);
|
||||
IPage<AuthDummyContentChangeEO> pageList = authDummyContentChangeEOService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单系统维护表-列表查询")
|
||||
@ApiOperation(value="虚拟认证清单系统维护表-列表查询", notes="虚拟认证清单系统维护表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<AuthDummyContentChangeEO>> queryList() {
|
||||
List<AuthDummyContentChangeEO> list = authDummyContentChangeEOService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单系统维护表-添加")
|
||||
@ApiOperation(value="虚拟认证清单系统维护表-添加", notes="虚拟认证清单系统维护表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody AuthDummyContentChangeEO authDummyContentChangeEO) {
|
||||
authDummyContentChangeEOService.add(authDummyContentChangeEO);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单系统维护表-编辑")
|
||||
@ApiOperation(value="虚拟认证清单系统维护表-编辑", notes="虚拟认证清单系统维护表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody AuthDummyContentChangeEO authDummyContentChangeEO) {
|
||||
authDummyContentChangeEOService.editById(authDummyContentChangeEO);
|
||||
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) {
|
||||
authDummyContentChangeEOService.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.authDummyContentChangeEOService.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) {
|
||||
AuthDummyContentChangeEO authDummyContentChangeEO = authDummyContentChangeEOService.queryById(id);
|
||||
if(authDummyContentChangeEO==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(authDummyContentChangeEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param authDummyContentChangeEO
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, AuthDummyContentChangeEO authDummyContentChangeEO) {
|
||||
return super.exportXls(request, authDummyContentChangeEO, AuthDummyContentChangeEO.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, AuthDummyContentChangeEO.class);
|
||||
}
|
||||
|
||||
}
|
||||
+247
@@ -0,0 +1,247 @@
|
||||
package com.jero.modules.authDummy.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
|
||||
import com.jero.modules.dummy.enums.InventoryStateEnum;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
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: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="认证虚拟清单基础表")
|
||||
@RestController
|
||||
@RequestMapping("/authDummy/authDummyInventoryBaseEO")
|
||||
@Slf4j
|
||||
public class AuthDummyInventoryBaseEOController extends JeroController<AuthDummyInventoryBaseEO, IAuthDummyInventoryBaseEOService> {
|
||||
@Autowired
|
||||
private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单基础表-分页列表查询")
|
||||
@ApiOperation(value="认证虚拟清单基础表-分页列表查询", notes="认证虚拟清单基础表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(AuthDummyInventoryBaseEO authDummyInventoryBaseEO,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@RequestParam(name="cut", defaultValue="cn") String cut,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<AuthDummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryBaseEO, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
|
||||
Page<AuthDummyInventoryBaseEO> page = new Page<AuthDummyInventoryBaseEO>(pageNo, pageSize);
|
||||
IPage<AuthDummyInventoryBaseEO> pageList = authDummyInventoryBaseEOService.getPageInfo(page, queryWrapper);
|
||||
// this.authDummyInventoryBaseEOService.disposeData(page.getRecords(),cut);
|
||||
return Result.OK(authDummyInventoryBaseEO.getCut(),pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单基础表-列表查询")
|
||||
@ApiOperation(value="认证虚拟清单基础表-列表查询", notes="认证虚拟清单基础表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<AuthDummyInventoryBaseEO>> queryList() {
|
||||
List<AuthDummyInventoryBaseEO> list = authDummyInventoryBaseEOService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单基础表-添加")
|
||||
@ApiOperation(value="认证虚拟清单基础表-添加", notes="认证虚拟清单基础表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody AuthDummyInventoryBaseEO authDummyInventoryBaseEO) {
|
||||
authDummyInventoryBaseEOService.add(authDummyInventoryBaseEO);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单基础表-编辑")
|
||||
@ApiOperation(value="认证虚拟清单基础表-编辑", notes="认证虚拟清单基础表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody AuthDummyInventoryBaseEO authDummyInventoryBaseEO) {
|
||||
authDummyInventoryBaseEOService.editById(authDummyInventoryBaseEO);
|
||||
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) {
|
||||
authDummyInventoryBaseEOService.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.authDummyInventoryBaseEOService.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) {
|
||||
AuthDummyInventoryBaseEO authDummyInventoryBaseEO = authDummyInventoryBaseEOService.queryById(id);
|
||||
if(authDummyInventoryBaseEO==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(authDummyInventoryBaseEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param authDummyInventoryBaseEO
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, AuthDummyInventoryBaseEO authDummyInventoryBaseEO) {
|
||||
return super.exportXls(request, authDummyInventoryBaseEO, AuthDummyInventoryBaseEO.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, AuthDummyInventoryBaseEO.class);
|
||||
}
|
||||
|
||||
@AutoLog(value = "认证虚拟清单基础表-批量发布或撤回")
|
||||
@ApiOperation(value="认证虚拟清单基础表-批量发布或撤回", notes="认证虚拟清单基础表-批量发布或撤回")
|
||||
@PostMapping(value = "/batchIssueOrWithdraw")
|
||||
public Result<?> batchIssueOrWithdraw(@RequestBody JSONObject json) {
|
||||
return this.authDummyInventoryBaseEOService.batchIssueOrWithdraw(json);
|
||||
}
|
||||
|
||||
@AutoLog(value = "订阅")
|
||||
@ApiOperation(value="订阅", notes="订阅")
|
||||
@GetMapping(value = "/read")
|
||||
// @RequiresPermissions("dummyInventoryBase:read")
|
||||
public Result<?> read(@RequestParam(name="id",required=true) String id){
|
||||
try {
|
||||
authDummyInventoryBaseEOService.read(id);
|
||||
} catch (Exception e) {
|
||||
return Result.OK("订阅失败");
|
||||
}
|
||||
return Result.OK("订阅成功");
|
||||
}
|
||||
|
||||
@AutoLog(value = "取消订阅")
|
||||
@ApiOperation(value="取消订阅", notes="取消订阅")
|
||||
@GetMapping(value = "/cancelRead")
|
||||
// @RequiresPermissions("dummyInventoryBase:cancelRead")
|
||||
public Result<?> cancelRead(String id){
|
||||
try {
|
||||
authDummyInventoryBaseEOService.cancelRead(id);
|
||||
} catch (Exception e) {
|
||||
return Result.OK("取消订阅失败");
|
||||
}
|
||||
return Result.OK("取消订阅成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 发布
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "发布")
|
||||
@ApiOperation(value="发布", notes="发布")
|
||||
@PostMapping(value = "/issue")
|
||||
// @RequiresPermissions("dummyInventoryBase:issue")
|
||||
public Result<?> issue(@Validated @RequestBody AuthDummyInventoryBaseEO authDummyInventoryBaseEO) {
|
||||
try {
|
||||
authDummyInventoryBaseEOService.issue(authDummyInventoryBaseEO);
|
||||
} catch (Exception e) {
|
||||
if(CutEnum.CN.getValue().equals(authDummyInventoryBaseEO.getCut())){
|
||||
return Result.error("发布失败");
|
||||
}else{
|
||||
return Result.error("Post failure!");
|
||||
}
|
||||
}
|
||||
if(InventoryStateEnum.ISSUE.getValue().equals(authDummyInventoryBaseEO.getState())) {
|
||||
if (CutEnum.CN.getValue().equals(authDummyInventoryBaseEO.getCut())) {
|
||||
return Result.OK().success("发布成功");
|
||||
} else {
|
||||
return Result.OK().success("Release success!");
|
||||
}
|
||||
}else {
|
||||
if (CutEnum.CN.getValue().equals(authDummyInventoryBaseEO.getCut())) {
|
||||
return Result.OK().success("撤回成功");
|
||||
} else {
|
||||
return Result.OK().success("Withdrawal succeeded!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+241
@@ -0,0 +1,241 @@
|
||||
package com.jero.modules.authDummy.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="认证虚拟清单详情表")
|
||||
@RestController
|
||||
@RequestMapping("/authDummy/authDummyInventoryInfoEO")
|
||||
@Slf4j
|
||||
public class AuthDummyInventoryInfoEOController extends JeroController<AuthDummyInventoryInfoEO, IAuthDummyInventoryInfoEOService> {
|
||||
@Autowired
|
||||
private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单详情表-分页列表查询")
|
||||
@ApiOperation(value="认证虚拟清单详情表-分页列表查询", notes="认证虚拟清单详情表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<AuthDummyInventoryInfoEO> page = new Page<AuthDummyInventoryInfoEO>(pageNo, pageSize);
|
||||
IPage<AuthDummyInventoryInfoEO> pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper);
|
||||
this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut());
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单详情表-列表查询")
|
||||
@ApiOperation(value="认证虚拟清单详情表-列表查询", notes="认证虚拟清单详情表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<AuthDummyInventoryInfoEO>> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) {
|
||||
List<AuthDummyInventoryInfoEO> list = this.authDummyInventoryInfoEOService.queryList(authDummyInventoryInfoEO,req);
|
||||
this.authDummyInventoryInfoEOService.disposeData(list,authDummyInventoryInfoEO.getCut());
|
||||
return Result.OK(authDummyInventoryInfoEO.getCut(),list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单详情表-添加")
|
||||
@ApiOperation(value="认证虚拟清单详情表-添加", notes="认证虚拟清单详情表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
|
||||
authDummyInventoryInfoEOService.add(authDummyInventoryInfoEO);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "认证虚拟清单详情表-编辑")
|
||||
@ApiOperation(value="认证虚拟清单详情表-编辑", notes="认证虚拟清单详情表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
|
||||
authDummyInventoryInfoEOService.editById(authDummyInventoryInfoEO);
|
||||
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) {
|
||||
authDummyInventoryInfoEOService.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.authDummyInventoryInfoEOService.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) {
|
||||
AuthDummyInventoryInfoEO authDummyInventoryInfoEO = authDummyInventoryInfoEOService.queryById(id);
|
||||
if(authDummyInventoryInfoEO==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(authDummyInventoryInfoEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param authDummyInventoryInfoEO
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
|
||||
return super.exportXls(request, authDummyInventoryInfoEO, AuthDummyInventoryInfoEO.class, "认证虚拟清单详情表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出数据
|
||||
* @param response
|
||||
* @param request
|
||||
* @param authDummyInventoryInfoEO
|
||||
*/
|
||||
@ApiOperation(value="认证虚拟清单详情表-导出数据",notes="认证虚拟清单详情表-导出数据",produces = "application/octet-stream")
|
||||
@RequestMapping(value = "/exportData",method = RequestMethod.GET)
|
||||
// @Require@RequestMapping(value = "/exportData",method = RequestMethod.GET)sPermissions("authDummyInventoryInfoEO:exportData")
|
||||
public void exportData(HttpServletResponse response,
|
||||
HttpServletRequest request,
|
||||
AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
|
||||
authDummyInventoryInfoEOService.exportData(response,request, authDummyInventoryInfoEO);
|
||||
}
|
||||
/**
|
||||
* 导入数据
|
||||
* @param file
|
||||
* @param authDummyInventoryInfoEO
|
||||
*/
|
||||
@ApiOperation(value="认证虚拟清单详情表-导入数据",notes="认证虚拟清单详情表-导入数据",produces = "application/octet-stream")
|
||||
@RequestMapping(value = "/importData",method = RequestMethod.POST)
|
||||
// @RequiresPermiss/certificationListMaintenanceions("authDummyInventoryInfoEO:exportData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
|
||||
authDummyInventoryInfoEOService.importData(file, authDummyInventoryInfoEO);
|
||||
return Result.OK("导入成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, AuthDummyInventoryInfoEO.class);
|
||||
}
|
||||
|
||||
|
||||
@AutoLog(value = "认证虚拟清单详情表-复制")
|
||||
@ApiOperation(value="认证虚拟清单详情表-复制", notes="认证虚拟清单详情表-复制")
|
||||
@GetMapping(value = "/copyInfoByIds")
|
||||
public Result<?> copyInfoByIds(@RequestParam(name="ids",required=true) String ids,
|
||||
@RequestParam(name="cut",required=true) String cut) {
|
||||
return this.authDummyInventoryInfoEOService.copyInfoByIds(ids,cut);
|
||||
}
|
||||
|
||||
@AutoLog(value = "认证虚拟清单详情表-批量设置")
|
||||
@ApiOperation(value="认证虚拟清单详情表-批量设置", notes="认证虚拟清单详情表-批量设置")
|
||||
@PostMapping(value = "/setBatch")
|
||||
public Result<?> setBatch(@RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
|
||||
return this.authDummyInventoryInfoEOService.setBatch(authDummyInventoryInfoEO);
|
||||
}
|
||||
|
||||
@AutoLog(value = "认证虚拟清单详情表-批量添加")
|
||||
@ApiOperation(value="认证虚拟清单详情表-批量添加", notes="认证虚拟清单详情表-批量添加")
|
||||
@PostMapping(value = "/batchAdd")
|
||||
public Result<?> batchAdd(@RequestBody JSONObject json) {
|
||||
return this.authDummyInventoryInfoEOService.batchAdd(json);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("authDummyInventoryInfo:exportTemplate")
|
||||
public void exportTemplate(AuthDummyInventoryInfoEO authDummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
authDummyInventoryInfoEOService.exportTemplate(authDummyInventoryInfoEO,response,request);
|
||||
}
|
||||
|
||||
@AutoLog(value = "认证虚拟清单调取认证虚拟清单添加数据")
|
||||
@ApiOperation(value="认证虚拟清单调取认证虚拟清单添加数据", notes="认证虚拟清单调取认证虚拟清单添加数据")
|
||||
@PostMapping(value = "/acquireAdd")
|
||||
public Result<?> acquireAdd(@RequestBody JSONObject json) {
|
||||
return this.authDummyInventoryInfoEOService.acquireAdd(json);
|
||||
}
|
||||
}
|
||||
+173
@@ -0,0 +1,173 @@
|
||||
package com.jero.modules.authDummy.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.authDummy.entity.AuthDummyLog;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyLogService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.modules.dummy.entity.DummyLogEO;
|
||||
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: 虚拟认证清单log表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="虚拟认证清单log表")
|
||||
@RestController
|
||||
@RequestMapping("/authDummy/authDummyLog")
|
||||
@Slf4j
|
||||
public class AuthDummyLogController extends JeroController<AuthDummyLog, IAuthDummyLogService> {
|
||||
@Autowired
|
||||
private IAuthDummyLogService authDummyLogService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-分页列表查询")
|
||||
@ApiOperation(value="虚拟认证清单log表-分页列表查询", notes="虚拟认证清单log表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(AuthDummyLog authDummyLog,String cut,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<AuthDummyLog> queryWrapper = QueryGenerator.initQueryWrapper(authDummyLog, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time").eq("is_en_log",cut);
|
||||
Page<AuthDummyLog> page = new Page<AuthDummyLog>(pageNo, pageSize);
|
||||
IPage<AuthDummyLog> pageList = authDummyLogService.page(page, queryWrapper);
|
||||
IPage<AuthDummyLog> disposeLogList = authDummyLogService.disposeLog(pageList,cut);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-列表查询")
|
||||
@ApiOperation(value="虚拟认证清单log表-列表查询", notes="虚拟认证清单log表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<AuthDummyLog>> queryList() {
|
||||
List<AuthDummyLog> list = authDummyLogService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-添加")
|
||||
@ApiOperation(value="虚拟认证清单log表-添加", notes="虚拟认证清单log表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody AuthDummyLog authDummyLog) {
|
||||
authDummyLogService.add(authDummyLog);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-编辑")
|
||||
@ApiOperation(value="虚拟认证清单log表-编辑", notes="虚拟认证清单log表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody AuthDummyLog authDummyLog) {
|
||||
authDummyLogService.editById(authDummyLog);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-通过id删除")
|
||||
@ApiOperation(value="虚拟认证清单log表-通过id删除", notes="虚拟认证清单log表-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
authDummyLogService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-批量删除")
|
||||
@ApiOperation(value="虚拟认证清单log表-批量删除", notes="虚拟认证清单log表-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.authDummyLogService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单log表-通过id查询")
|
||||
@ApiOperation(value="虚拟认证清单log表-通过id查询", notes="虚拟认证清单log表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
AuthDummyLog authDummyLog = authDummyLogService.queryById(id);
|
||||
if(authDummyLog==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(authDummyLog);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param authDummyLog
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, AuthDummyLog authDummyLog) {
|
||||
return super.exportXls(request, authDummyLog, AuthDummyLog.class, "虚拟认证清单log表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, AuthDummyLog.class);
|
||||
}
|
||||
|
||||
}
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
package com.jero.modules.authDummy.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.authDummy.entity.AuthDummyReadEO;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyReadEOService;
|
||||
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: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="虚拟认证清单订阅表")
|
||||
@RestController
|
||||
@RequestMapping("/com.jero.modules.authDummy.entity/authDummyReadEO")
|
||||
@Slf4j
|
||||
public class AuthDummyReadEOController extends JeroController<AuthDummyReadEO, IAuthDummyReadEOService> {
|
||||
@Autowired
|
||||
private IAuthDummyReadEOService authDummyReadEOService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单订阅表-分页列表查询")
|
||||
@ApiOperation(value="虚拟认证清单订阅表-分页列表查询", notes="虚拟认证清单订阅表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(AuthDummyReadEO authDummyReadEO,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<AuthDummyReadEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyReadEO, req.getParameterMap());
|
||||
Page<AuthDummyReadEO> page = new Page<AuthDummyReadEO>(pageNo, pageSize);
|
||||
IPage<AuthDummyReadEO> pageList = authDummyReadEOService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单订阅表-列表查询")
|
||||
@ApiOperation(value="虚拟认证清单订阅表-列表查询", notes="虚拟认证清单订阅表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<AuthDummyReadEO>> queryList() {
|
||||
List<AuthDummyReadEO> list = authDummyReadEOService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单订阅表-添加")
|
||||
@ApiOperation(value="虚拟认证清单订阅表-添加", notes="虚拟认证清单订阅表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody AuthDummyReadEO authDummyReadEO) {
|
||||
authDummyReadEOService.add(authDummyReadEO);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "虚拟认证清单订阅表-编辑")
|
||||
@ApiOperation(value="虚拟认证清单订阅表-编辑", notes="虚拟认证清单订阅表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody AuthDummyReadEO authDummyReadEO) {
|
||||
authDummyReadEOService.editById(authDummyReadEO);
|
||||
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) {
|
||||
authDummyReadEOService.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.authDummyReadEOService.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) {
|
||||
AuthDummyReadEO authDummyReadEO = authDummyReadEOService.queryById(id);
|
||||
if(authDummyReadEO==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(authDummyReadEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param authDummyReadEO
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, AuthDummyReadEO authDummyReadEO) {
|
||||
return super.exportXls(request, authDummyReadEO, AuthDummyReadEO.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, AuthDummyReadEO.class);
|
||||
}
|
||||
|
||||
}
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
package com.jero.modules.authDummy.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: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("auth_dummy_content_change")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="auth_dummy_content_change对象", description="虚拟认证清单系统维护表")
|
||||
public class AuthDummyContentChangeEO 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或虚拟认证清单详情表中的baseId*/
|
||||
@Excel(name = "虚拟认证清单基础表id或虚拟认证清单详情表中的baseId", width = 15)
|
||||
@ApiModelProperty(value = "虚拟认证清单基础表id或虚拟认证清单详情表中的baseId")
|
||||
private java.lang.String connectId;
|
||||
|
||||
/**父id*/
|
||||
@Excel(name = "父id", width = 15)
|
||||
@ApiModelProperty(value = "父id")
|
||||
private java.lang.String parentId;
|
||||
|
||||
/**内容*/
|
||||
@Excel(name = "内容", width = 15)
|
||||
@ApiModelProperty(value = "内容")
|
||||
private java.lang.String contentJson;
|
||||
|
||||
}
|
||||
+87
@@ -0,0 +1,87 @@
|
||||
package com.jero.modules.authDummy.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigDecimal;
|
||||
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: 认证虚拟清单基础表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("auth_dummy_inventory_base")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="auth_dummy_inventory_base对象", description="认证虚拟清单基础表")
|
||||
public class AuthDummyInventoryBaseEO 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 name;
|
||||
|
||||
/**使用说明*/
|
||||
@Excel(name = "使用说明", width = 15)
|
||||
@ApiModelProperty(value = "使用说明")
|
||||
private java.lang.String useExplain;
|
||||
|
||||
/**状态*/
|
||||
@Excel(name = "状态", width = 15)
|
||||
@ApiModelProperty(value = "状态")
|
||||
@Dict(dicCode = "ren4_zheng4_xu1_ni3_qing1_dan1_zhuang4_tai4")
|
||||
private java.lang.String state;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
/**订阅标识*/
|
||||
@TableField(exist = false)
|
||||
private String readFlag;
|
||||
}
|
||||
+137
@@ -0,0 +1,137 @@
|
||||
package com.jero.modules.authDummy.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigDecimal;
|
||||
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: 认证虚拟清单详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("auth_dummy_inventory_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="auth_dummy_inventory_info对象", description="认证虚拟清单详情表")
|
||||
public class AuthDummyInventoryInfoEO 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 category;
|
||||
|
||||
/**检验项目*/
|
||||
@Excel(name = "*检验项目", width = 15)
|
||||
@ApiModelProperty(value = "检验项目")
|
||||
private java.lang.String inspectionItem;
|
||||
|
||||
/**配置项*/
|
||||
@Excel(name = "*配置项", width = 15)
|
||||
@ApiModelProperty(value = "配置项")
|
||||
private java.lang.String configItem;
|
||||
|
||||
/**WVTA ID*/
|
||||
@Excel(name = "*WVTA ID", width = 15)
|
||||
@ApiModelProperty(value = "WVTA ID")
|
||||
private java.lang.String wvtaId;
|
||||
|
||||
/**标准编号*/
|
||||
@Excel(name = "*编号", width = 15)
|
||||
@ApiModelProperty(value = "编号")
|
||||
private java.lang.String serialNumber;
|
||||
|
||||
/**责任领域*/
|
||||
@ApiModelProperty(value = "责任领域")
|
||||
private java.lang.String dutyTerritory;
|
||||
@Excel(name = "*责任领域", width = 15)
|
||||
@TableField(exist = false)
|
||||
// 责任领域名称
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**交付物*/
|
||||
// @Excel(name = "交付物", width = 15)
|
||||
@ApiModelProperty(value = "交付物")
|
||||
private java.lang.String deliverable;
|
||||
|
||||
/**交付物类型*/
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private String deliverableType;
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "*交付物类型", width = 15)
|
||||
// 交付物类型名称
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**文档库id*/
|
||||
// @Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private java.lang.String bussDocumentLibraryId;
|
||||
|
||||
/**认证虚拟清单基础表id*/
|
||||
// @Excel(name = "认证虚拟清单基础表id", width = 15)
|
||||
@ApiModelProperty(value = "认证虚拟清单基础表id")
|
||||
private java.lang.String authDummyInventoryBaseId;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ids;
|
||||
|
||||
/**值类型，对应SysCategoryValueTypeEnum中value**/
|
||||
@TableField(exist = false)
|
||||
private String valueType;
|
||||
}
|
||||
+134
@@ -0,0 +1,134 @@
|
||||
package com.jero.modules.authDummy.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 认证虚拟清单详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("auth_dummy_inventory_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="auth_dummy_inventory_info对象", description="认证虚拟清单详情表")
|
||||
public class AuthDummyInventoryInfoEOEn implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**类别*/
|
||||
@Excel(name = "*Category", width = 15)
|
||||
@ApiModelProperty(value = "类别")
|
||||
private String category;
|
||||
|
||||
/**检验项目*/
|
||||
@Excel(name = "*Inspection Items", width = 15)
|
||||
@ApiModelProperty(value = "检验项目")
|
||||
private String inspectionItem;
|
||||
|
||||
/**配置项*/
|
||||
@Excel(name = "*Configuration Item", width = 15)
|
||||
@ApiModelProperty(value = "配置项")
|
||||
private String configItem;
|
||||
|
||||
/**WVTA ID*/
|
||||
@Excel(name = "*WVTA ID", width = 15)
|
||||
@ApiModelProperty(value = "WVTA ID")
|
||||
private String wvtaId;
|
||||
|
||||
/**标准编号*/
|
||||
@Excel(name = "*Number", width = 15)
|
||||
@ApiModelProperty(value = "标准编号")
|
||||
private String serialNumber;
|
||||
|
||||
/**责任领域*/
|
||||
@ApiModelProperty(value = "责任领域")
|
||||
private String dutyTerritory;
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "*Responsible Field", width = 15)
|
||||
// 责任领域名称
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**交付物*/
|
||||
// @Excel(name = "Deliverables", width = 15)
|
||||
@ApiModelProperty(value = "交付物")
|
||||
private String deliverable;
|
||||
|
||||
/**交付物类型*/
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private String deliverableType;
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "*Deliverable Type", width = 15)
|
||||
// 交付物类型名称
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**文档库id*/
|
||||
// @Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private String bussDocumentLibraryId;
|
||||
|
||||
/**认证虚拟清单基础表id*/
|
||||
// @Excel(name = "认证虚拟清单基础表id", width = 15)
|
||||
@ApiModelProperty(value = "认证虚拟清单基础表id")
|
||||
private String authDummyInventoryBaseId;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ids;
|
||||
|
||||
/**值类型，对应SysCategoryValueTypeEnum中value**/
|
||||
@TableField(exist = false)
|
||||
private String valueType;
|
||||
}
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
package com.jero.modules.authDummy.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: 虚拟认证清单log表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("auth_dummy_log")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="auth_dummy_log对象", description="虚拟认证清单log表")
|
||||
public class AuthDummyLog 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 authDummyInventoryBaseId;
|
||||
|
||||
/**log内容*/
|
||||
@Excel(name = "log内容", width = 15)
|
||||
@ApiModelProperty(value = "log内容")
|
||||
private java.lang.String logContent;
|
||||
|
||||
/**log语言类别,cn中文,en英文*/
|
||||
@Excel(name = "log语言类别,cn中文,en英文", width = 15)
|
||||
@ApiModelProperty(value = "log语言类别,cn中文,en英文")
|
||||
private java.lang.String isEnLog;
|
||||
|
||||
}
|
||||
+69
@@ -0,0 +1,69 @@
|
||||
package com.jero.modules.authDummy.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: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("auth_dummy_read")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="auth_dummy_read对象", description="虚拟认证清单订阅表")
|
||||
public class AuthDummyReadEO 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 authDummyInventoryBaseId;
|
||||
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.jero.modules.authDummy.enums;
|
||||
|
||||
public enum StateEnum {
|
||||
ISSUE("已发布","1"),
|
||||
DRAFT("草稿","2");
|
||||
|
||||
String name;
|
||||
String value;
|
||||
|
||||
private StateEnum(String name, String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.jero.modules.authDummy.mapper;
|
||||
|
||||
import com.jero.modules.authDummy.entity.AuthDummyContentChangeEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单系统维护表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface AuthDummyContentChangeEOMapper extends BaseMapper<AuthDummyContentChangeEO> {
|
||||
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.jero.modules.authDummy.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 认证虚拟清单基础表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface AuthDummyInventoryBaseEOMapper extends BaseMapper<AuthDummyInventoryBaseEO> {
|
||||
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.jero.modules.authDummy.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 认证虚拟清单详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface AuthDummyInventoryInfoEOMapper extends BaseMapper<AuthDummyInventoryInfoEO> {
|
||||
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.jero.modules.authDummy.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyLog;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单log表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface AuthDummyLogMapper extends BaseMapper<AuthDummyLog> {
|
||||
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.jero.modules.authDummy.mapper;
|
||||
|
||||
import com.jero.modules.authDummy.entity.AuthDummyReadEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单订阅表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface AuthDummyReadEOMapper extends BaseMapper<AuthDummyReadEO> {
|
||||
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.authDummy.mapper.AuthDummyContentChangeEOMapper">
|
||||
<resultMap id="AuthDummyContentChangeEOResultMap" type="com.jero.modules.authDummy.entity.AuthDummyContentChangeEO">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="connect_id" property="connectId" />
|
||||
<result column="parent_id" property="parentId" />
|
||||
<result column="content_json" property="contentJson" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.authDummy.mapper.AuthDummyInventoryBaseEOMapper">
|
||||
<resultMap id="AuthDummyInventoryBaseEOResultMap" type="com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="name" property="name" />
|
||||
<result column="use_explain" property="useExplain" />
|
||||
<result column="state" property="state" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.authDummy.mapper.AuthDummyInventoryInfoEOMapper">
|
||||
<resultMap id="AuthDummyInventoryInfoEOResultMap" type="com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="category" property="category" />
|
||||
<result column="inspection_item" property="inspectionItem" />
|
||||
<result column="config_item" property="configItem" />
|
||||
<result column="wvta_id" property="wvtaId" />
|
||||
<result column="serial_number" property="serialNumber" />
|
||||
<result column="duty_territory" property="dutyTerritory" />
|
||||
<result column="deliverable" property="deliverable" />
|
||||
<result column="buss_document_library_id" property="bussDocumentLibraryId" />
|
||||
<result column="auth_dummy_inventory_base_id" property="authDummyInventoryBaseId" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.authDummy.mapper.AuthDummyLogMapper">
|
||||
<resultMap id="AuthDummyLogResultMap" type="com.jero.modules.authDummy.entity.AuthDummyLog">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="auth_dummy_inventory_base_id" property="authDummyInventoryBaseId" />
|
||||
<result column="log_content" property="logContent" />
|
||||
<result column="is_en_log" property="isEnLog" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.authDummy.mapper.AuthDummyReadEOMapper">
|
||||
<resultMap id="AuthDummyReadEOResultMap" type="com.jero.modules.authDummy.entity.AuthDummyReadEO">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="auth_dummy_inventory_base_id" property="authDummyInventoryBaseId" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
package com.jero.modules.authDummy.service;
|
||||
|
||||
import com.jero.modules.authDummy.entity.AuthDummyContentChangeEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单系统维护表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IAuthDummyContentChangeEOService extends IService<AuthDummyContentChangeEO> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @return
|
||||
*/
|
||||
void add(AuthDummyContentChangeEO authDummyContentChangeEO);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @return
|
||||
*/
|
||||
void editById(AuthDummyContentChangeEO authDummyContentChangeEO);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
AuthDummyContentChangeEO queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<AuthDummyContentChangeEO> queryList();
|
||||
}
|
||||
+106
@@ -0,0 +1,106 @@
|
||||
package com.jero.modules.authDummy.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 认证虚拟清单基础表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IAuthDummyInventoryBaseEOService extends IService<AuthDummyInventoryBaseEO> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
void add(AuthDummyInventoryBaseEO authDummyInventoryBaseEO);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
void editById(AuthDummyInventoryBaseEO authDummyInventoryBaseEO);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
AuthDummyInventoryBaseEO queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<AuthDummyInventoryBaseEO> queryList();
|
||||
|
||||
/**
|
||||
* 发布或撤回
|
||||
* @param json
|
||||
* @return
|
||||
*/
|
||||
Result<?> batchIssueOrWithdraw(JSONObject json);
|
||||
|
||||
/**
|
||||
* 处理数据
|
||||
* @param datas
|
||||
* @param cut
|
||||
*/
|
||||
void disposeData(List<AuthDummyInventoryBaseEO> datas, String cut);
|
||||
|
||||
/**
|
||||
* 订阅
|
||||
* @param dummyId
|
||||
*/
|
||||
void read(String dummyId);
|
||||
|
||||
/**
|
||||
* 取消订阅
|
||||
* @param dummyId
|
||||
*/
|
||||
void cancelRead(String dummyId);
|
||||
|
||||
/**
|
||||
* 发布
|
||||
* @param authDummyInventoryBaseEO
|
||||
*/
|
||||
void issue(AuthDummyInventoryBaseEO authDummyInventoryBaseEO)throws Exception;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
* @param page
|
||||
* @param queryWrapper
|
||||
* @return
|
||||
*/
|
||||
IPage<AuthDummyInventoryBaseEO> getPageInfo(Page<AuthDummyInventoryBaseEO> page, QueryWrapper<AuthDummyInventoryBaseEO> queryWrapper);
|
||||
}
|
||||
+148
@@ -0,0 +1,148 @@
|
||||
package com.jero.modules.authDummy.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
||||
import com.jero.modules.system.entity.SysCategory;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 认证虚拟清单详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IAuthDummyInventoryInfoEOService extends IService<AuthDummyInventoryInfoEO> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @return
|
||||
*/
|
||||
void add(AuthDummyInventoryInfoEO authDummyInventoryInfoEO);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @return
|
||||
*/
|
||||
void editById(AuthDummyInventoryInfoEO authDummyInventoryInfoEO);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
AuthDummyInventoryInfoEO queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<AuthDummyInventoryInfoEO> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req);
|
||||
|
||||
/**
|
||||
* 复制
|
||||
* @param ids
|
||||
* @param cut
|
||||
* @return
|
||||
*/
|
||||
Result<?> copyInfoByIds(String ids, String cut);
|
||||
|
||||
/**
|
||||
* 批量设置
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @return
|
||||
*/
|
||||
Result<?> setBatch(AuthDummyInventoryInfoEO authDummyInventoryInfoEO);
|
||||
|
||||
/**
|
||||
* 导出数据
|
||||
* @param response
|
||||
* @param request
|
||||
* @param authDummyInventoryInfoEO
|
||||
*/
|
||||
void exportData(HttpServletResponse response, HttpServletRequest request, AuthDummyInventoryInfoEO authDummyInventoryInfoEO);
|
||||
|
||||
/**
|
||||
* 数据导入
|
||||
* @param file
|
||||
* @param authDummyInventoryInfoEO
|
||||
*/
|
||||
void importData(MultipartFile file, AuthDummyInventoryInfoEO authDummyInventoryInfoEO);
|
||||
Result<?> batchAdd(JSONObject json);
|
||||
|
||||
/**
|
||||
* 模板下载
|
||||
* @param authDummyInventoryInfoEO
|
||||
* @param response
|
||||
* @param request
|
||||
*/
|
||||
void exportTemplate(AuthDummyInventoryInfoEO authDummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request);
|
||||
|
||||
/**
|
||||
* 处理数据
|
||||
* @param datas
|
||||
* @param cut
|
||||
*/
|
||||
void disposeData(List<AuthDummyInventoryInfoEO> datas, String cut);
|
||||
|
||||
/**
|
||||
* 获取责任领域名称
|
||||
* @param cut
|
||||
* @param categoryList
|
||||
* @param technologyTerritoryList
|
||||
* @return
|
||||
*/
|
||||
String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
|
||||
|
||||
/**
|
||||
* 数据导入时的数据处理
|
||||
* @param datas
|
||||
* @param cut
|
||||
*/
|
||||
void importDisposeData(List<AuthDummyInventoryInfoEO> datas, String cut);
|
||||
String getTreeNameImport(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
|
||||
|
||||
/**
|
||||
* 翻译为中文名
|
||||
* @param infoList
|
||||
*/
|
||||
void disposeDataToCn(List<AuthDummyInventoryInfoEO> infoList);
|
||||
|
||||
/**
|
||||
* 翻译为英文
|
||||
* @param infoListCopy
|
||||
*/
|
||||
void disposeDataToEn(List<AuthDummyInventoryInfoEO> infoListCopy);
|
||||
|
||||
Result<?> acquireAdd(JSONObject json);
|
||||
|
||||
List<AuthDummyInventoryInfoEO> dataUniqueCheck(List<AuthDummyInventoryInfoEO> addList, String cut, List<String> result, String authDummyInventoryBaseId);
|
||||
}
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
package com.jero.modules.authDummy.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyLog;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单log表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IAuthDummyLogService extends IService<AuthDummyLog> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @return
|
||||
*/
|
||||
void add(AuthDummyLog authDummyLog);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @return
|
||||
*/
|
||||
void editById(AuthDummyLog authDummyLog);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
AuthDummyLog queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<AuthDummyLog> queryList();
|
||||
|
||||
//翻译log数据
|
||||
IPage<AuthDummyLog> disposeLog(IPage<AuthDummyLog> pageList, String cut);
|
||||
|
||||
/**
|
||||
* 设置更新log
|
||||
* @param contentLog
|
||||
* @param authDummyInventoryBaseId
|
||||
* @param value
|
||||
*/
|
||||
void updateLog(String contentLog, String authDummyInventoryBaseId, String value);
|
||||
}
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
package com.jero.modules.authDummy.service;
|
||||
|
||||
import com.jero.modules.authDummy.entity.AuthDummyReadEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单订阅表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IAuthDummyReadEOService extends IService<AuthDummyReadEO> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @return
|
||||
*/
|
||||
void add(AuthDummyReadEO authDummyReadEO);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @return
|
||||
*/
|
||||
void editById(AuthDummyReadEO authDummyReadEO);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
AuthDummyReadEO queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<AuthDummyReadEO> queryList();
|
||||
|
||||
/**查询订阅虚拟清单的用户*/
|
||||
List<String> queryReadUserInfo(String authDummyInventoryBaseId);
|
||||
}
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
package com.jero.modules.authDummy.service.impl;
|
||||
|
||||
import com.jero.modules.authDummy.entity.AuthDummyContentChangeEO;
|
||||
import com.jero.modules.authDummy.mapper.AuthDummyContentChangeEOMapper;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyContentChangeEOService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单系统维护表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class AuthDummyContentChangeEOServiceImpl extends ServiceImpl<AuthDummyContentChangeEOMapper, AuthDummyContentChangeEO> implements IAuthDummyContentChangeEOService {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(AuthDummyContentChangeEO authDummyContentChangeEO) {
|
||||
Date now = new Date();
|
||||
authDummyContentChangeEO.setCreateTime(now);
|
||||
authDummyContentChangeEO.setUpdateTime(now);
|
||||
save(authDummyContentChangeEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyContentChangeEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(AuthDummyContentChangeEO authDummyContentChangeEO) {
|
||||
Date now = new Date();
|
||||
authDummyContentChangeEO.setUpdateTime(now);
|
||||
saveOrUpdate(authDummyContentChangeEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(List<String> ids) {
|
||||
removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AuthDummyContentChangeEO queryById(String id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<AuthDummyContentChangeEO> queryList() {
|
||||
return list();
|
||||
}
|
||||
}
|
||||
+476
@@ -0,0 +1,476 @@
|
||||
package com.jero.modules.authDummy.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.constant.enums.MessageTypeEnum;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyContentChangeEO;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyReadEO;
|
||||
import com.jero.modules.authDummy.mapper.AuthDummyInventoryBaseEOMapper;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyContentChangeEOService;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyReadEOService;
|
||||
import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
|
||||
import com.jero.modules.dummy.entity.DummyContentChangeEO;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
|
||||
import com.jero.modules.dummy.entity.DummyReadEO;
|
||||
import com.jero.modules.dummy.enums.InventoryStateEnum;
|
||||
import com.jero.modules.dummy.enums.ReadFlagEnum;
|
||||
import com.jero.modules.feishu.service.IFeishuService;
|
||||
import com.jero.modules.feishu.vo.FeishuMsgVo;
|
||||
import com.jero.modules.system.entity.SysAnnouncement;
|
||||
import com.jero.modules.system.service.ISysAnnouncementService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import me.zhyd.oauth.utils.StringUtils;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
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.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @Description: 认证虚拟清单基础表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-02
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyInventoryBaseEOMapper, AuthDummyInventoryBaseEO> implements IAuthDummyInventoryBaseEOService {
|
||||
|
||||
@Autowired
|
||||
private IAuthDummyReadEOService authDummyReadEOService;
|
||||
|
||||
@Autowired
|
||||
private AuthDummyInventoryBaseEOMapper authDummyInventoryBaseEOMapper;
|
||||
|
||||
@Autowired
|
||||
private IAuthDummyContentChangeEOService iAuthDummyContentChangeEOService;
|
||||
|
||||
@Autowired
|
||||
private IAuthDummyInventoryInfoEOService iAuthDummyInventoryInfoEOService;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Autowired
|
||||
private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
|
||||
|
||||
@Autowired
|
||||
private ISysAnnouncementService sysAnnouncementService;
|
||||
|
||||
@Autowired
|
||||
private IAuthDummyReadEOService iAuthDummyReadEOService;
|
||||
|
||||
@Value(value = "${jero.backUrl}")
|
||||
private String backUrl;
|
||||
|
||||
@Resource
|
||||
private IFeishuService iFeishuService;
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(AuthDummyInventoryBaseEO authDummyInventoryBaseEO) {
|
||||
Date now = new Date();
|
||||
authDummyInventoryBaseEO.setCreateTime(now);
|
||||
authDummyInventoryBaseEO.setUpdateTime(now);
|
||||
authDummyInventoryBaseEO.setState(InventoryStateEnum.DRAFT.getValue());
|
||||
save(authDummyInventoryBaseEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(AuthDummyInventoryBaseEO authDummyInventoryBaseEO) {
|
||||
Date now = new Date();
|
||||
authDummyInventoryBaseEO.setUpdateTime(now);
|
||||
saveOrUpdate(authDummyInventoryBaseEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(List<String> ids) {
|
||||
removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AuthDummyInventoryBaseEO queryById(String id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<AuthDummyInventoryBaseEO> queryList() {
|
||||
return list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> batchIssueOrWithdraw(JSONObject json) {
|
||||
String cut = json.getString("cut");
|
||||
String state = json.getString("state");
|
||||
String ids = json.getString("ids");
|
||||
if(StringUtils.isEmpty(ids)){
|
||||
throw new JeroBootException("至少选择一条数据进行操作！");
|
||||
}
|
||||
|
||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
|
||||
LambdaUpdateWrapper<AuthDummyInventoryBaseEO> authDummyUpdateWrap = new LambdaUpdateWrapper<>();
|
||||
authDummyUpdateWrap.set(AuthDummyInventoryBaseEO::getState,state);
|
||||
|
||||
if(InventoryStateEnum.ISSUE.getValue().equals(state)){
|
||||
authDummyUpdateWrap.set(AuthDummyInventoryBaseEO::getUpdateBy,currentUser.getUsername());
|
||||
authDummyUpdateWrap.set(AuthDummyInventoryBaseEO::getUpdateTime,new Date());
|
||||
}
|
||||
|
||||
authDummyUpdateWrap.in(AuthDummyInventoryBaseEO::getId,idList);
|
||||
this.update(authDummyUpdateWrap);
|
||||
|
||||
if(InventoryStateEnum.ISSUE.getValue().equals(state)) {
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
return Result.OK().success("发布成功");
|
||||
} else {
|
||||
return Result.OK().success("Release success!");
|
||||
}
|
||||
}else {
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
return Result.OK().success("撤回成功");
|
||||
} else {
|
||||
return Result.OK().success("Withdrawal succeeded!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disposeData(List<AuthDummyInventoryBaseEO> datas, String cut) {
|
||||
if(CollectionUtils.isNotEmpty(datas)){
|
||||
for (AuthDummyInventoryBaseEO data : datas) {
|
||||
// TODO 处理数据，对接时再详细处理。
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 订阅
|
||||
* @param dummyId
|
||||
*/
|
||||
@Override
|
||||
public void read(String dummyId) {
|
||||
AuthDummyReadEO authDummyReadEO = new AuthDummyReadEO();
|
||||
authDummyReadEO.setAuthDummyInventoryBaseId(dummyId);
|
||||
authDummyReadEOService.add(authDummyReadEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消订阅
|
||||
* @param dummyId
|
||||
*/
|
||||
@Override
|
||||
public void cancelRead(String dummyId) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
LambdaQueryWrapper<AuthDummyReadEO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(AuthDummyReadEO::getAuthDummyInventoryBaseId, dummyId).in(AuthDummyReadEO::getCreateBy, sysUser.getUsername());
|
||||
authDummyReadEOService.remove(wrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发布
|
||||
* @param authDummyInventoryBaseEO
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public void issue(AuthDummyInventoryBaseEO authDummyInventoryBaseEO) throws Exception {
|
||||
// 增加创建者校验
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
String loginUserName = sysUser.getUsername();
|
||||
|
||||
AuthDummyInventoryBaseEO baseEO = queryById(authDummyInventoryBaseEO.getId());
|
||||
List<String> createByNameList =new ArrayList<>();
|
||||
Date now = new Date();
|
||||
UpdateWrapper<AuthDummyInventoryBaseEO> baseWrapper=new UpdateWrapper<>();
|
||||
baseWrapper.set("state",authDummyInventoryBaseEO.getState());
|
||||
|
||||
if(InventoryStateEnum.ISSUE.getValue().equals(authDummyInventoryBaseEO.getState())){
|
||||
baseWrapper.set("update_by",sysUser.getUsername())
|
||||
.set("update_time",now);
|
||||
}
|
||||
baseWrapper.eq("id",authDummyInventoryBaseEO.getId());
|
||||
authDummyInventoryBaseEOMapper.update(null,baseWrapper);
|
||||
|
||||
if(InventoryStateEnum.ISSUE.getValue().equals(authDummyInventoryBaseEO.getState())){
|
||||
//先判断第一次发布的时候是否保存过数据
|
||||
LambdaQueryWrapper<AuthDummyContentChangeEO> wrapper =new LambdaQueryWrapper<>();
|
||||
wrapper.in(AuthDummyContentChangeEO::getConnectId,authDummyInventoryBaseEO.getId());
|
||||
List<AuthDummyContentChangeEO> authDummyContentChangeEOList = iAuthDummyContentChangeEOService.list(wrapper);
|
||||
//详情数据
|
||||
LambdaQueryWrapper<AuthDummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
lambdaQueryWrapper.in(AuthDummyInventoryInfoEO::getAuthDummyInventoryBaseId,authDummyInventoryBaseEO.getId());
|
||||
List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = iAuthDummyInventoryInfoEOService.list(lambdaQueryWrapper);
|
||||
String contentLog = "The "+ baseEO.getName()+" virtual authentication list you subscribed to has been updated as follows：" + "</br>";
|
||||
String contentLogFeishu = "The "+ baseEO.getName()+" virtual authentication list you subscribed to has been updated as follows：" + " ";
|
||||
String contentLogFeishuTemp = "The "+ baseEO.getName()+" virtual authentication list you subscribed to has been updated as follows：" + " ";
|
||||
|
||||
if(authDummyContentChangeEOList.size() == 0){
|
||||
//没有添加过需要进行第一次添加
|
||||
Date thisTime = new Date();
|
||||
List<AuthDummyContentChangeEO> list = new ArrayList<>();
|
||||
if(authDummyInventoryInfoEOList.size() != 0){
|
||||
String info = JSONArray.toJSONString(authDummyInventoryInfoEOList);
|
||||
AuthDummyContentChangeEO authDummyContentChangeEOInfo = new AuthDummyContentChangeEO();
|
||||
authDummyContentChangeEOInfo.setParentId(authDummyInventoryBaseEO.getId());
|
||||
authDummyContentChangeEOInfo.setConnectId(authDummyInventoryBaseEO.getId());
|
||||
authDummyContentChangeEOInfo.setContentJson(info);
|
||||
authDummyContentChangeEOInfo.setUpdateTime(thisTime);
|
||||
list.add(authDummyContentChangeEOInfo);
|
||||
}
|
||||
if(list.size() != 0){
|
||||
iAuthDummyContentChangeEOService.saveBatch(list);
|
||||
}
|
||||
}else{
|
||||
//2. 查询之前保存过的详情数据
|
||||
LambdaQueryWrapper<AuthDummyContentChangeEO> wrapperInfo =new LambdaQueryWrapper<>();
|
||||
wrapperInfo.in(AuthDummyContentChangeEO::getParentId,authDummyInventoryBaseEO.getId());
|
||||
List<AuthDummyContentChangeEO> dummyContentChangeEOInfoList = iAuthDummyContentChangeEOService.list(wrapperInfo);
|
||||
if(dummyContentChangeEOInfoList.size() != 0){
|
||||
String contentJson = dummyContentChangeEOInfoList.get(0).getContentJson();
|
||||
List<AuthDummyInventoryInfoEO> baseCJList = JSONArray.parseArray(contentJson, AuthDummyInventoryInfoEO.class);
|
||||
List<String> serialNumberOldList = baseCJList.stream().map(AuthDummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
|
||||
//变更后的数据
|
||||
if(authDummyInventoryInfoEOList.size() != 0){
|
||||
List<String> serialNumberNewList = authDummyInventoryInfoEOList.stream().map(AuthDummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
|
||||
//新增的法规
|
||||
List<AuthDummyInventoryInfoEO> collectAdd = authDummyInventoryInfoEOList.stream()
|
||||
.filter(e -> !serialNumberOldList.contains(e.getSerialNumber())).collect(Collectors.toList());
|
||||
|
||||
List<String> serialNumberAddList = serialNumberNewList.stream().filter(e->!serialNumberOldList.contains(e)).collect(Collectors.toList());
|
||||
//删除的法规
|
||||
List<AuthDummyInventoryInfoEO> collectDelete = baseCJList.stream()
|
||||
.filter(e -> !serialNumberNewList.contains(e.getSerialNumber())).collect(Collectors.toList());
|
||||
List<String> serialNumberDeleteList = serialNumberOldList.stream().filter(e->!serialNumberNewList.contains(e)).collect(Collectors.toList());
|
||||
|
||||
//发消息
|
||||
int count = 1;
|
||||
List<String> hrefListAdd = new ArrayList<>();
|
||||
if(serialNumberAddList.size() != 0){
|
||||
|
||||
for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : collectAdd) {
|
||||
String href = "<a href='/docManage/library/detail?id=" + authDummyInventoryInfoEO.getBussDocumentLibraryId() +
|
||||
// "&title=" + authDummyInventoryInfoEO.getTitle() +
|
||||
"&serial_number=" + authDummyInventoryInfoEO.getSerialNumber() + "'" + " target='_blank'>" + authDummyInventoryInfoEO.getSerialNumber() + "</a>";
|
||||
hrefListAdd.add(href);
|
||||
}
|
||||
contentLog += count+". New regulations: " + org.apache.commons.lang3.StringUtils.join(hrefListAdd,",") + "</br>";
|
||||
contentLogFeishu += count+". New regulations: " + org.apache.commons.lang3.StringUtils.join(serialNumberAddList,",") + " ";
|
||||
count++;
|
||||
}
|
||||
List<String> hrefListDelete = new ArrayList<>();
|
||||
if(serialNumberDeleteList.size() != 0){
|
||||
for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : collectDelete) {
|
||||
String href = "<a href='/docManage/library/detail?id=" + authDummyInventoryInfoEO.getBussDocumentLibraryId() +
|
||||
// "&title=" + authDummyInventoryInfoEO.getTitle() +
|
||||
"&serial_number=" + authDummyInventoryInfoEO.getSerialNumber() + "'" + " target='_blank'>" + authDummyInventoryInfoEO.getSerialNumber() + "</a>";
|
||||
hrefListDelete.add(href);
|
||||
}
|
||||
contentLog += count + ". Remove regulations: " + org.apache.commons.lang3.StringUtils.join(hrefListDelete,",") + "</br>";
|
||||
contentLogFeishu += count + ". Remove regulations: " + org.apache.commons.lang3.StringUtils.join(serialNumberDeleteList,",") + " ";
|
||||
}
|
||||
|
||||
if(serialNumberAddList.size() != 0 || serialNumberDeleteList.size() != 0){
|
||||
int countNo = 1;
|
||||
StringBuilder sbContentNo = new StringBuilder();
|
||||
if(ObjectUtils.isNotEmpty(serialNumberAddList)){
|
||||
sbContentNo.append(countNo+". New regulations: "+ org.apache.commons.lang3.StringUtils.join(serialNumberAddList,",")+", ");
|
||||
countNo ++;
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(serialNumberDeleteList)){
|
||||
sbContentNo.append(countNo+". Remove regulations: "+ org.apache.commons.lang3.StringUtils.join(serialNumberDeleteList,","));
|
||||
}
|
||||
|
||||
int countYes = 1;
|
||||
StringBuilder sbContentYes = new StringBuilder();
|
||||
if(ObjectUtils.isNotEmpty(serialNumberAddList)){
|
||||
sbContentYes.append(countYes+". New regulations: "+ org.apache.commons.lang3.StringUtils.join(hrefListAdd,",")+"</br>");
|
||||
countYes ++;
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(serialNumberDeleteList)){
|
||||
sbContentYes.append(countYes+". Remove regulations: "+ org.apache.commons.lang3.StringUtils.join(hrefListDelete,","));
|
||||
}
|
||||
String hrefTemp = "<a href='/virtualAuthenticationListDetails?id=" + authDummyInventoryBaseEO.getId() +
|
||||
"&useExplain="+baseEO.getUseExplain()+
|
||||
"&name=" + baseEO.getName() + "'" + " target='_blank'>" + baseEO.getName() + "</a>";
|
||||
|
||||
//消息英文--不带标签
|
||||
String contentNo = "The "+ baseEO.getName()+" virtual authentication list you subscribed to has been updated as follows：" + sbContentNo;
|
||||
//消息英文--带标签
|
||||
String contentYes = "The "+ hrefTemp+" virtual authentication list you subscribed to has been updated as follows："+ "</br>" + sbContentYes;;
|
||||
|
||||
int countInfoNo = 1;
|
||||
StringBuilder sbContentINfoNo = new StringBuilder();
|
||||
if(ObjectUtils.isNotEmpty(serialNumberAddList)){
|
||||
sbContentINfoNo.append(countInfoNo+". 新增文档: "+ org.apache.commons.lang3.StringUtils.join(serialNumberAddList,",")+", ");
|
||||
countInfoNo ++;
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(serialNumberDeleteList)){
|
||||
sbContentINfoNo.append(countInfoNo+". 删除文档: "+ org.apache.commons.lang3.StringUtils.join(serialNumberDeleteList,","));
|
||||
}
|
||||
|
||||
int countInfoYes = 1;
|
||||
StringBuilder sbContentInfoYes = new StringBuilder();
|
||||
if(ObjectUtils.isNotEmpty(serialNumberAddList)){
|
||||
sbContentInfoYes.append(countInfoYes+". 新增文档: "+ org.apache.commons.lang3.StringUtils.join(hrefListAdd,",")+"</br>");
|
||||
countInfoYes ++;
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(serialNumberDeleteList)){
|
||||
sbContentInfoYes.append(countInfoYes+". 删除文档: "+ org.apache.commons.lang3.StringUtils.join(hrefListDelete,","));
|
||||
}
|
||||
|
||||
//消息中文--不带标签
|
||||
String contentInfoNo = "您所订阅的"+baseEO.getName()+"虚拟认证清单已更新,更新内容如下:"+sbContentINfoNo;
|
||||
//消息中文--带标签
|
||||
String contentInfoYes = "您所订阅的"+hrefTemp+"虚拟认证清单已更新,更新内容如下:"+"</br>"+sbContentInfoYes;
|
||||
|
||||
List<String> userNameList = authDummyReadEOService.queryReadUserInfo(authDummyInventoryBaseEO.getId());
|
||||
List<String> thirdIdList = new ArrayList<>();
|
||||
if(userNameList.size() != 0){
|
||||
List<String> userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList());
|
||||
thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList());
|
||||
if(userIdList.size() != 0){
|
||||
//封装消息的实体类
|
||||
String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated.";
|
||||
SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList,
|
||||
title,
|
||||
contentNo,
|
||||
contentYes,
|
||||
MessageTypeEnum.READ.getValue(),
|
||||
MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(),
|
||||
contentInfoNo,
|
||||
contentInfoYes);
|
||||
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
|
||||
bussDocumentLibraryEOService.sendWebsocket(authDummyInventoryBaseEO.getId(), title);
|
||||
}
|
||||
}
|
||||
//飞书
|
||||
if(thirdIdList.size() != 0){
|
||||
String href = backUrl + "/virtualAuthenticationListDetails?name=" + baseEO.getName() + "&useExplain=" + baseEO.getUseExplain() +"&id=" + baseEO.getId() +"&title=维护虚拟清单";
|
||||
try {
|
||||
String contentInfoFeiCn = "您所订阅的"+baseEO.getName()+"虚拟认证清单已更新,更新内容如下:";
|
||||
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
|
||||
feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName());
|
||||
feishuMsgVo.setUrl(href);
|
||||
feishuMsgVo.setContentEn(contentLogFeishuTemp);
|
||||
feishuMsgVo.setContent(contentInfoFeiCn);
|
||||
|
||||
iFeishuService.sendCardMsgVirtua(thirdIdList.toArray(new String[]{}),feishuMsgVo,serialNumberAddList,serialNumberDeleteList);
|
||||
// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentLogFeishu, MessageTypeEnum.PUSH.getName(), href);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//删除之前保存的变更的数据
|
||||
iAuthDummyContentChangeEOService.deleteById(dummyContentChangeEOInfoList.get(0).getId());
|
||||
|
||||
//重新保存
|
||||
AuthDummyContentChangeEO authDummyContentChangeEOInfo = new AuthDummyContentChangeEO();
|
||||
String contentJsonTemp = JSONArray.toJSONString(authDummyInventoryInfoEOList);
|
||||
authDummyContentChangeEOInfo.setParentId(authDummyInventoryBaseEO.getId());
|
||||
authDummyContentChangeEOInfo.setConnectId(authDummyInventoryBaseEO.getId());
|
||||
authDummyContentChangeEOInfo.setContentJson(contentJsonTemp);
|
||||
authDummyContentChangeEOInfo.setUpdateTime(new Date());
|
||||
iAuthDummyContentChangeEOService.save(authDummyContentChangeEOInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<AuthDummyInventoryBaseEO> getPageInfo(Page<AuthDummyInventoryBaseEO> page, QueryWrapper<AuthDummyInventoryBaseEO> queryWrapper) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
IPage<AuthDummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
|
||||
if (pageList.getRecords().size() != 0) {
|
||||
List<AuthDummyInventoryBaseEO> records = pageList.getRecords();
|
||||
//订阅标识
|
||||
List<String> ids = records.stream().map(AuthDummyInventoryBaseEO::getId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<AuthDummyReadEO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(AuthDummyReadEO::getAuthDummyInventoryBaseId, ids).in(AuthDummyReadEO::getCreateBy,sysUser.getUsername());
|
||||
List<AuthDummyReadEO> authDummyReadEOS = iAuthDummyReadEOService.list(wrapper);
|
||||
List<String> authDummyReadIdList = authDummyReadEOS.stream().map(AuthDummyReadEO::getAuthDummyInventoryBaseId).collect(Collectors.toList());
|
||||
for (AuthDummyInventoryBaseEO record : pageList.getRecords()) {
|
||||
//订阅标识
|
||||
if(authDummyReadIdList.contains(record.getId())){
|
||||
record.setReadFlag(ReadFlagEnum.READ.getValue());
|
||||
}else{
|
||||
record.setReadFlag(ReadFlagEnum.CANCEL_READ.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return pageList;
|
||||
}
|
||||
}
|
||||
+1643
File diff suppressed because it is too large
Load Diff
+174
@@ -0,0 +1,174 @@
|
||||
package com.jero.modules.authDummy.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyLog;
|
||||
import com.jero.modules.authDummy.mapper.AuthDummyLogMapper;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyLogService;
|
||||
import com.jero.modules.dummy.entity.DummyLogEO;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单log表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class AuthDummyLogServiceImpl extends ServiceImpl<AuthDummyLogMapper, AuthDummyLog> implements IAuthDummyLogService {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(AuthDummyLog authDummyLog) {
|
||||
Date now = new Date();
|
||||
authDummyLog.setCreateTime(now);
|
||||
authDummyLog.setUpdateTime(now);
|
||||
save(authDummyLog);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyLog
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(AuthDummyLog authDummyLog) {
|
||||
Date now = new Date();
|
||||
authDummyLog.setUpdateTime(now);
|
||||
saveOrUpdate(authDummyLog);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(List<String> ids) {
|
||||
removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AuthDummyLog queryById(String id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<AuthDummyLog> queryList() {
|
||||
return list();
|
||||
}
|
||||
|
||||
//翻译log数据
|
||||
@Override
|
||||
public IPage<AuthDummyLog> disposeLog(IPage<AuthDummyLog> pageList, String cut) {
|
||||
for(AuthDummyLog authDummyLog : pageList.getRecords()){
|
||||
if(CutEnum.EN.getValue().equals(cut)){
|
||||
//添加
|
||||
//String contentLog = username+"向清单中添加了标准“"+serialNumber+"”";
|
||||
if(authDummyLog.getLogContent().contains("向清单中添加了标准")){
|
||||
String replaceLog = authDummyLog.getLogContent().replace("向清单中添加了标准"," added the standard ")
|
||||
.replace("”","” to the list.");
|
||||
authDummyLog.setLogContent(replaceLog);
|
||||
System.out.println(authDummyLog);
|
||||
}
|
||||
//编辑
|
||||
//String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”标准:";
|
||||
else if(authDummyLog.getLogContent().contains("编辑了清单中的")){
|
||||
String replaceLog = authDummyLog.getLogContent().replace("编辑了清单中的"," edited the ")
|
||||
.replace("”标准","” standard in the list");
|
||||
// replaceLog = transData(replaceLog);
|
||||
authDummyLog.setLogContent(replaceLog);
|
||||
System.out.println(authDummyLog);
|
||||
}
|
||||
//删除
|
||||
//String contentLog = username+"删除了清单中的“"+serialNumber+"”标准";
|
||||
else if(authDummyLog.getLogContent().contains("删除了清单中的")){
|
||||
String replaceLog = authDummyLog.getLogContent().replace("删除了清单中的"," deleted the ")
|
||||
.replace("”标准","” standard from the list");
|
||||
authDummyLog.setLogContent(replaceLog);
|
||||
System.out.println(authDummyLog);
|
||||
}
|
||||
//导入
|
||||
//String contentLog = username+"向清单中导入了“"+serialNumber+"”标准";
|
||||
/*else if(dummyLogEO.getLogContent().contains("向清单中导入了")){
|
||||
String replaceLog = dummyLogEO.getLogContent().replace("向清单中添加了标准"," imported ")
|
||||
.replace("”","” standard into the list.");
|
||||
dummyLogEO.setLogContent(replaceLog);
|
||||
System.out.println(dummyLogEO);
|
||||
}*/
|
||||
/*//复制
|
||||
//String contentLog = username+"复制了“"+serialNumber+"”";
|
||||
else if(dummyLogEO.getLogContent().contains("复制了")){
|
||||
String replaceLog = dummyLogEO.getLogContent().replace("复制了"," copied ")
|
||||
.replace("”","” to the list.");
|
||||
dummyLogEO.setLogContent(replaceLog);
|
||||
System.out.println(dummyLogEO);
|
||||
}*/
|
||||
/* //批量设置
|
||||
//XXX批量设置了“标准号1:'字段名'由XXX改为了XXX ,标准号2:"字段名'由XXX改为了xXX”。
|
||||
//XXX batch set "standard number 1:' field name' changed from XXX to XXX, standard number 2:' field name' changed from XXX to XXX".
|
||||
else if(dummyLogEO.getLogContent().contains("批量设置了")){
|
||||
String replaceLog = dummyLogEO.getLogContent().replace("批量设置了"," batch set ");
|
||||
////////
|
||||
dummyLogEO.setLogContent(replaceLog);
|
||||
System.out.println(dummyLogEO);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
return pageList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置更新log
|
||||
* @param contentLog
|
||||
* @param authDummyInventoryBaseId
|
||||
* @param value
|
||||
*/
|
||||
@Override
|
||||
public void updateLog(String contentLog, String authDummyInventoryBaseId, String value) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if (StringUtils.isNotBlank(contentLog)) {
|
||||
AuthDummyLog authDummyLog = new AuthDummyLog();
|
||||
authDummyLog.setAuthDummyInventoryBaseId(authDummyInventoryBaseId);
|
||||
authDummyLog.setLogContent(contentLog);
|
||||
authDummyLog.setCreateBy(sysUser.getUsername());
|
||||
authDummyLog.setIsEnLog(value);
|
||||
add(authDummyLog);
|
||||
}
|
||||
}
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
package com.jero.modules.authDummy.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.modules.authDummy.entity.AuthDummyReadEO;
|
||||
import com.jero.modules.authDummy.mapper.AuthDummyReadEOMapper;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyReadEOService;
|
||||
import com.jero.modules.dummy.entity.DummyReadEO;
|
||||
import me.zhyd.oauth.utils.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 虚拟认证清单订阅表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-10
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class AuthDummyReadEOServiceImpl extends ServiceImpl<AuthDummyReadEOMapper, AuthDummyReadEO> implements IAuthDummyReadEOService {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(AuthDummyReadEO authDummyReadEO) {
|
||||
Date now = new Date();
|
||||
authDummyReadEO.setCreateTime(now);
|
||||
authDummyReadEO.setUpdateTime(now);
|
||||
save(authDummyReadEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authDummyReadEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(AuthDummyReadEO authDummyReadEO) {
|
||||
Date now = new Date();
|
||||
authDummyReadEO.setUpdateTime(now);
|
||||
saveOrUpdate(authDummyReadEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(List<String> ids) {
|
||||
removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AuthDummyReadEO queryById(String id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<AuthDummyReadEO> queryList() {
|
||||
return list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> queryReadUserInfo(String authDummyInventoryBaseId) {
|
||||
|
||||
//获取订阅该虚拟清单的所有用户信息
|
||||
if(StringUtils.isNotEmpty(authDummyInventoryBaseId)){
|
||||
QueryWrapper<AuthDummyReadEO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.select("create_by").eq("auth_dummy_inventory_base_id",authDummyInventoryBaseId);
|
||||
List<String> readUserList = list(queryWrapper).stream().map(e -> e.getCreateBy()).distinct().collect(Collectors.toList());
|
||||
return readUserList;
|
||||
}else{
|
||||
throw new JeroBootException("The virtual authentication inventory is not subscribed.");//该虚拟认证清单未被订阅
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
@@ -88,4 +88,6 @@ public class ParamsConfigDataEO implements Serializable {
|
||||
@ApiModelProperty(value = "参数收集清单id")
|
||||
private String paramsCollectManifestId;
|
||||
|
||||
/**排序号**/
|
||||
private Integer orderNum;
|
||||
}
|
||||
|
||||
+9
@@ -56,6 +56,15 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
|
||||
*/
|
||||
ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param paramsConfigId
|
||||
* @param paramsCollectManifestId
|
||||
* @return
|
||||
*/
|
||||
List<ParamsConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
|
||||
+5888
-5275
File diff suppressed because it is too large
Load Diff
+15
@@ -99,6 +99,21 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
|
||||
return getOne(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param paramsConfigId
|
||||
* @param paramsCollectManifestId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<ParamsConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
|
||||
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId);
|
||||
queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
|
||||
return this.list(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
|
||||
+19
-14
@@ -43,6 +43,7 @@ import com.jero.modules.system.enums.DicCodeEnum;
|
||||
import com.jero.modules.system.mapper.SysDictMapper;
|
||||
import com.jero.modules.system.service.ISysDictService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -700,23 +701,27 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
|
||||
|
||||
// 配置数据： nio编号，控件类型，控件备选值，控件校验 均一致时 将清单参数项项复制到模板参数项，否则不复制
|
||||
for (ParamsConfigEO configEO : paramsConfigEOList) {
|
||||
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
// ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
if (ObjectUtil.isNotEmpty(configDataEO)) {
|
||||
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
|
||||
List<ParamsConfigDataEO> configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
if(CollectionUtils.isNotEmpty(configDataEOList)){
|
||||
for (ParamsConfigDataEO configDataEO : configDataEOList) {
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
if (ObjectUtil.isNotEmpty(configDataEO)) {
|
||||
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
|
||||
|
||||
addConfigDataEO.setId(null);
|
||||
addConfigDataEO.setCreateBy(null);
|
||||
addConfigDataEO.setCreateTime(null);
|
||||
addConfigDataEO.setUpdateBy(null);
|
||||
addConfigDataEO.setUpdateTime(null);
|
||||
addConfigDataEO.setSysOrgCode(null);
|
||||
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
|
||||
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
addConfigDataEO.setId(null);
|
||||
addConfigDataEO.setCreateBy(null);
|
||||
addConfigDataEO.setCreateTime(null);
|
||||
addConfigDataEO.setUpdateBy(null);
|
||||
addConfigDataEO.setUpdateTime(null);
|
||||
addConfigDataEO.setSysOrgCode(null);
|
||||
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
|
||||
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -22,6 +22,8 @@ public interface IParamsReportConfigDataEOService extends IService<ParamsReportC
|
||||
*/
|
||||
ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
|
||||
|
||||
List<ParamsReportConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
|
||||
|
||||
List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId);
|
||||
|
||||
/**
|
||||
|
||||
+16
@@ -35,6 +35,22 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsRepor
|
||||
return getOne(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param paramsConfigId
|
||||
* @param paramsCollectManifestId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<ParamsReportConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
|
||||
LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId);
|
||||
queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
|
||||
queryWrapper.orderByDesc(ParamsReportConfigDataEO::getOrderNum);
|
||||
return this.list(queryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId) {
|
||||
return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId);
|
||||
|
||||
+429
-179
@@ -210,12 +210,38 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
|
||||
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
|
||||
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
|
||||
Map<String, Object> configMap = new HashMap<>();
|
||||
/*Map<String, Object> configMap = new HashMap<>();
|
||||
String paramsConfigId = paramsConfigEO.getId();
|
||||
ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
|
||||
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
|
||||
configMap.put("controlType", controlType);
|
||||
configMap.put("list", paramsConfigDataVOList);
|
||||
manifestMap.put(paramsConfigEO.getId(), configMap);*/
|
||||
|
||||
Map<String,Object> paramsConfigDataVO = new HashMap<>();
|
||||
Map<String, Object> configMap = new HashMap<>();
|
||||
|
||||
String paramsConfigId = paramsConfigEO.getId();
|
||||
List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
|
||||
if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){
|
||||
// 匿名比较器排序
|
||||
Collections.sort(paramsConfigDataEOList, new Comparator<ParamsReportConfigDataEO>() {
|
||||
@Override
|
||||
public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) {
|
||||
if(p2.getOrderNum() == null || p1.getOrderNum() == null){
|
||||
return 0;
|
||||
}
|
||||
return p1.getOrderNum().compareTo(p2.getOrderNum());
|
||||
}
|
||||
});
|
||||
for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) {
|
||||
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
|
||||
paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList);
|
||||
}
|
||||
}
|
||||
|
||||
configMap.put("paramsConfigData", paramsConfigDataVO);
|
||||
configMap.put("controlType", controlType);
|
||||
manifestMap.put(paramsConfigEO.getId(), configMap);
|
||||
|
||||
configIdList.add(paramsConfigEO.getId());
|
||||
@@ -1319,42 +1345,57 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
if (ControlTypeEnum.Title.getValue().equals(controlType)) {
|
||||
record1.put(paramsConfigEO.getId(), titleDefaultValue);
|
||||
} else {
|
||||
String paramsConfigId = paramsConfigEO.getId();
|
||||
ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
|
||||
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
|
||||
configDataBuilder.append(paramsConfigDataEO.getPullData()).append("#");
|
||||
}
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
|
||||
configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#");
|
||||
}
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
|
||||
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
|
||||
if (CollectionUtil.isNotEmpty(ossFileList)) {
|
||||
// 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件
|
||||
String fileName = ossFileList.get(0).getFileName();
|
||||
String newFileName = isRepeat(fileListAll, ossFileList.get(0));
|
||||
if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同
|
||||
configDataBuilder.append(newFileName).append("#");
|
||||
ossFileList.get(0).setFileName(newFileName);
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
|
||||
} else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同
|
||||
configDataBuilder.append(fileName).append("#");
|
||||
fileList.addAll(ossFileList);
|
||||
}else {
|
||||
configDataBuilder.append(fileName).append("#");
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
String paramsConfigId = paramsConfigEO.getId();
|
||||
List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
|
||||
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
|
||||
if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){
|
||||
for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) {
|
||||
|
||||
StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
|
||||
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
|
||||
configDataBuilderTemp.append(paramsConfigDataEO.getPullData()).append("#");
|
||||
}
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
|
||||
configDataBuilderTemp.append(paramsConfigDataEO.getTextData()).append("#");
|
||||
}
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
|
||||
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
|
||||
if (CollectionUtil.isNotEmpty(ossFileList)) {
|
||||
// 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件
|
||||
String fileName = ossFileList.get(0).getFileName();
|
||||
String newFileName = isRepeat(fileListAll, ossFileList.get(0));
|
||||
if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同
|
||||
configDataBuilderTemp.append(newFileName).append("#");
|
||||
ossFileList.get(0).setFileName(newFileName);
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
|
||||
} else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同
|
||||
configDataBuilderTemp.append(fileName).append("#");
|
||||
fileList.addAll(ossFileList);
|
||||
} else {
|
||||
configDataBuilderTemp.append(fileName).append("#");
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String configData = configDataBuilderTemp.toString();
|
||||
if (configData.contains("#")) {
|
||||
configData = configData.substring(0, configData.lastIndexOf("#"));
|
||||
}
|
||||
|
||||
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
String configData = configDataBuilder.toString();
|
||||
if (configData.contains("#")) {
|
||||
configData = configData.substring(0, configData.lastIndexOf("#"));
|
||||
if (configData.contains(paramsReportDetailVO.getSeparator())) {
|
||||
configData = configData.substring(0, configData.lastIndexOf(paramsReportDetailVO.getSeparator()));
|
||||
}
|
||||
|
||||
record1.put(paramsConfigEO.getId(), configData);
|
||||
@@ -1368,66 +1409,53 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
} else {
|
||||
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
|
||||
|
||||
String textDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getTextData()))
|
||||
.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
|
||||
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
|
||||
|
||||
String pullDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getPullData()))
|
||||
.map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
|
||||
for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
|
||||
StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
|
||||
|
||||
List<String> fileNameList = new ArrayList<>();
|
||||
for(ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOS) {
|
||||
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
|
||||
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId());
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
|
||||
configDataBuilderTemp.append(paramsConfigDataEO.getPullData()).append("#");
|
||||
}
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
|
||||
configDataBuilderTemp.append(paramsConfigDataEO.getTextData()).append("#");
|
||||
}
|
||||
if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
|
||||
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
|
||||
if (CollectionUtil.isNotEmpty(ossFileList)) {
|
||||
// 合并导出时 验证文件名是否相同，相同进一步验证文件内容是否形同，不同时重命名文件
|
||||
// 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件
|
||||
String fileName = ossFileList.get(0).getFileName();
|
||||
String newFileName = isRepeat(fileListAll, ossFileList.get(0));
|
||||
if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同
|
||||
// 判断 新文件名是不是当前参数下 配置间的 重复
|
||||
int count = (int) fileList.stream().filter(e->newFileName.equals(e.getFileName())).count();
|
||||
if (count <= 0) { // 不是 （如果是，不做任何操作）
|
||||
fileNameList.add(newFileName);
|
||||
ossFileList.get(0).setFileName(newFileName);
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
}
|
||||
configDataBuilderTemp.append(newFileName).append("#");
|
||||
ossFileList.get(0).setFileName(newFileName);
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
|
||||
} else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同
|
||||
|
||||
// 判断这种重复是不是当前参数下 配置间的
|
||||
int count = (int) fileList.stream().filter(e->fileName.equals(e.getFileName())).count();
|
||||
if (count <= 0) { // 不是 （如果是，不做任何操作）
|
||||
fileNameList.add(fileName);
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
}
|
||||
|
||||
}else { // 文件名称不重复
|
||||
fileNameList.add(fileName);
|
||||
configDataBuilderTemp.append(fileName).append("#");
|
||||
fileList.addAll(ossFileList);
|
||||
} else {
|
||||
configDataBuilderTemp.append(fileName).append("#");
|
||||
fileList.addAll(ossFileList);
|
||||
fileListAll.addAll(ossFileList);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
configData = configDataBuilderTemp.toString();
|
||||
if (configData.contains("#")) {
|
||||
configData = configData.substring(0, configData.lastIndexOf("#"));
|
||||
}
|
||||
|
||||
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
|
||||
}
|
||||
|
||||
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
|
||||
if (StringUtils.isNotEmpty(pullDatas)) {
|
||||
configDataBuilder.append(pullDatas).append("#");
|
||||
String configDataStr = configDataBuilder.toString();
|
||||
if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
|
||||
configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
|
||||
}
|
||||
if (StringUtils.isNotEmpty(textDatas)) {
|
||||
configDataBuilder.append(textDatas).append("#");
|
||||
}
|
||||
if (CollectionUtil.isNotEmpty(fileNameList)) {
|
||||
// fileNameList = fileNameList.stream().distinct().collect(Collectors.toList());
|
||||
configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("#");
|
||||
}
|
||||
configData = configDataBuilder.toString();
|
||||
if (configData.contains("#")) {
|
||||
configData = configData.substring(0, configData.lastIndexOf("#"));
|
||||
}
|
||||
record1.put("params_value", configData);
|
||||
record1.put("params_value", configDataStr);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1473,6 +1501,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
String configData = "";
|
||||
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
|
||||
|
||||
// 匿名比较器排序
|
||||
Collections.sort(paramsReportConfigDataEOS, new Comparator<ParamsReportConfigDataEO>() {
|
||||
@Override
|
||||
public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) {
|
||||
if(p2.getOrderNum() == null || p1.getOrderNum() == null){
|
||||
return 0;
|
||||
}
|
||||
// 倒序
|
||||
return p2.getOrderNum().compareTo(p1.getOrderNum());
|
||||
}
|
||||
});
|
||||
|
||||
String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData()))
|
||||
.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); // 整合文本数据
|
||||
|
||||
@@ -1753,11 +1793,28 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
// 操作记录
|
||||
StringBuilder logCnContent = new StringBuilder();
|
||||
StringBuilder logEnContent = new StringBuilder();
|
||||
logCnContent.append(loginUser.getUsername()).append("将");
|
||||
logEnContent.append(loginUser.getUsername()).append(" set ");
|
||||
logCnContent.append(loginUser.getUsername());
|
||||
logEnContent.append(loginUser.getUsername());
|
||||
|
||||
// 删除操作记录
|
||||
StringBuilder deleteLogCnContent = new StringBuilder();
|
||||
StringBuilder deleteLogEnContent = new StringBuilder();
|
||||
deleteLogCnContent.append(loginUser.getUsername());
|
||||
deleteLogEnContent.append(loginUser.getUsername());
|
||||
|
||||
|
||||
// 添加操作记录
|
||||
StringBuilder addLogCnContent = new StringBuilder();
|
||||
StringBuilder addLogEnContent = new StringBuilder();
|
||||
addLogCnContent.append(loginUser.getUsername());
|
||||
addLogEnContent.append(loginUser.getUsername());
|
||||
|
||||
// 变更标识
|
||||
boolean changeFlag = false;
|
||||
// 删除标识
|
||||
boolean deleteFlag = false;
|
||||
// 新增标识
|
||||
boolean addFlag = false;
|
||||
|
||||
String configNameCn = "";
|
||||
String configNameEn = "";
|
||||
@@ -1777,135 +1834,295 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
continue;
|
||||
}
|
||||
|
||||
ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO();
|
||||
// 取值
|
||||
String paramsReportConfigEOId = entry.getKey();
|
||||
ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(paramsReportConfigEOId);
|
||||
Map<String, Object> paramsReportConfigDataMap = (Map<String, Object>) entry.getValue();
|
||||
// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
|
||||
List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsReportConfigDataMap.get("list");
|
||||
// List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsReportConfigDataMap.get("list");
|
||||
|
||||
logCnContent.append("将");
|
||||
logEnContent.append(" set ");
|
||||
|
||||
// 判断是新增还是修改
|
||||
ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList);
|
||||
if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
|
||||
paramsReportConfigDataEO.setId(oldConfigDataEO.getId());
|
||||
}
|
||||
//******************配置2被添加了**********************
|
||||
logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
|
||||
logEnContent.append(paramsReportConfigEO.getConfigName());
|
||||
configNameCn = paramsReportConfigEO.getConfigName()+"的";
|
||||
configNameEn = paramsReportConfigEO.getConfigName();
|
||||
|
||||
paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
|
||||
paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
|
||||
if (CollectionUtil.isNotEmpty(configDataVOList)) {
|
||||
for (Map<String, Object> paramsConfigDataVO : configDataVOList) {
|
||||
String type = (String) paramsConfigDataVO.get("type");
|
||||
String dataValue = (String) paramsConfigDataVO.get("dataValue");
|
||||
Map<String, Object> paramsConfigDataVOMap = (Map<String, Object>) paramsReportConfigDataMap.get("paramsConfigData");
|
||||
|
||||
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
|
||||
paramsReportConfigDataEO.setTextData(dataValue);
|
||||
if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
for (Map.Entry<String, Object> paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) {
|
||||
String configDataId = paramsConfigDataMap.getKey();
|
||||
List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.getValue();
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
if (CollectionUtil.isNotEmpty(configDataVOList)) {
|
||||
Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum");
|
||||
|
||||
ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO();
|
||||
paramsReportConfigDataEO.setOrderNum(orderNum);
|
||||
for (Map<String, Object> paramsConfigDataVO : configDataVOList) {
|
||||
String type = (String) paramsConfigDataVO.get("type");
|
||||
String dataValue = "";
|
||||
if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){
|
||||
dataValue = String.valueOf(paramsConfigDataVO.get("dataValue"));
|
||||
}
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
|
||||
|| type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
|
||||
paramsReportConfigDataEO.setPullData(dataValue);
|
||||
// 判断是新增还是修改
|
||||
ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList,configDataId);
|
||||
if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
|
||||
paramsReportConfigDataEO.setId(oldConfigDataEO.getId());
|
||||
|
||||
if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
|
||||
// paramsReportConfigDataEO.setTextData(dataValue);
|
||||
if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
}
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
|
||||
String newFileNames = "";
|
||||
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码
|
||||
// 处理文件connectId
|
||||
String[] fileIdList = dataValue.split(",");
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]);
|
||||
if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
List<OSSFile> 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);
|
||||
changeFlag = true;
|
||||
}
|
||||
ossFileService.updateBatchById(updateFileList);
|
||||
dataValue = connectId;
|
||||
newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
}
|
||||
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
|
||||
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
//修改文件表关联信息connect_id
|
||||
List<OSSFile> oSSFileList = new ArrayList<>();
|
||||
for (String fileId : dataValue.split(",")) {
|
||||
OSSFile ossFile = new OSSFile();
|
||||
ossFile.setId(fileId);
|
||||
ossFile.setConnectId(connectId);
|
||||
oSSFileList.add(ossFile);
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
|
||||
|| type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
|
||||
// paramsReportConfigDataEO.setPullData(dataValue);
|
||||
|
||||
if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) {
|
||||
logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
}
|
||||
ossFileService.updateFileInfo(oSSFileList);
|
||||
dataValue = connectId;
|
||||
newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
|
||||
String newFileNames = "";
|
||||
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码
|
||||
// 处理文件connectId
|
||||
String[] fileIdList = dataValue.split(",");
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]);
|
||||
if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
List<OSSFile> 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;
|
||||
newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
}
|
||||
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
|
||||
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
//修改文件表关联信息connect_id
|
||||
List<OSSFile> 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;
|
||||
newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
// paramsReportConfigDataEO.setFileConnectId(dataValue);
|
||||
if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) {
|
||||
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) {
|
||||
logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
paramsReportConfigDataEO.setFileConnectId(dataValue);
|
||||
if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) {
|
||||
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
||||
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) {
|
||||
logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，");
|
||||
logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
|
||||
|
||||
changeFlag = true;
|
||||
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())) {
|
||||
String newFileNames = "";
|
||||
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码
|
||||
// 处理文件connectId
|
||||
String[] fileIdList = dataValue.split(",");
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]);
|
||||
if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
List<OSSFile> 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;
|
||||
newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
}
|
||||
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
|
||||
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
//修改文件表关联信息connect_id
|
||||
List<OSSFile> 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;
|
||||
newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
|
||||
paramsReportConfigDataEO.setFileConnectId(dataValue);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
|
||||
paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
|
||||
|
||||
newConfigDataEOList.add(paramsReportConfigDataEO);
|
||||
}
|
||||
//
|
||||
// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
|
||||
// logEnContent.append(paramsReportConfigEO.getConfigName());
|
||||
|
||||
}
|
||||
|
||||
QueryWrapper<ParamsReportConfigDataEO> prcdQueryWrap = new QueryWrapper<>();
|
||||
prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId);
|
||||
prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId);
|
||||
List<ParamsReportConfigDataEO> prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap);
|
||||
if(CollectionUtils.isNotEmpty(prcdEoList)){
|
||||
List<String> paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).distinct().collect(Collectors.toList());
|
||||
|
||||
List<String> newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> {
|
||||
boolean flag = false;
|
||||
// 如果key的长度是16位，则是新添加的
|
||||
if (e.length() == 16) {
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).distinct().collect(Collectors.toList());
|
||||
|
||||
if(CollectionUtils.isNotEmpty(newAddPcdDataIdList)){
|
||||
StringBuilder dataValueSb = new StringBuilder();
|
||||
for (String newAddPcdDataId : newAddPcdDataIdList) {
|
||||
List<Map<String,Object>> configDataVOList = (List<Map<String, Object>>) paramsConfigDataVOMap.get(newAddPcdDataId);
|
||||
for (Map<String, Object> paramsConfigDataVO : configDataVOList) {
|
||||
String type = (String) paramsConfigDataVO.get("type");
|
||||
|
||||
String dataValue = "";
|
||||
if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){
|
||||
dataValue = String.valueOf(paramsConfigDataVO.get("dataValue"));
|
||||
}
|
||||
// 如果是附件 单独处理
|
||||
if(StringUtils.equals(type,ConfigDataTypeEnum.FILE.getValue())){
|
||||
|
||||
}
|
||||
dataValueSb.append("\"").append(dataValue).append("\",");
|
||||
}
|
||||
}
|
||||
|
||||
String dataValue = "";
|
||||
if(StringUtils.isNotBlank(dataValueSb.toString())){
|
||||
dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1);
|
||||
}
|
||||
|
||||
addLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append("，");
|
||||
addLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(",");
|
||||
|
||||
addFlag = true;
|
||||
}
|
||||
|
||||
// 判断有没有被减掉的（删除的）
|
||||
List<ParamsReportConfigDataEO> deletePrcdEoList = prcdEoList.stream().filter(prcdEo -> {
|
||||
boolean flag = true;
|
||||
for (String paramsConfigDataId : paramsConfigDataIdList) {
|
||||
if(StringUtils.equals(prcdEo.getId(),paramsConfigDataId)){
|
||||
flag = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
// 如果有被删的数据 增加log记录
|
||||
if(CollectionUtils.isNotEmpty(deletePrcdEoList)){
|
||||
StringBuilder dataValueSb = new StringBuilder();
|
||||
for (ParamsReportConfigDataEO paramsReportConfigDataEO : deletePrcdEoList) {
|
||||
if(StringUtils.isNotBlank(paramsReportConfigDataEO.getTextData())){
|
||||
dataValueSb.append("\"").append(paramsReportConfigDataEO.getTextData()).append("\",");
|
||||
}
|
||||
if(StringUtils.isNotBlank(paramsReportConfigDataEO.getPullData())){
|
||||
dataValueSb.append("\"").append(paramsReportConfigDataEO.getPullData()).append("\",");
|
||||
}
|
||||
if(StringUtils.isNotBlank(paramsReportConfigDataEO.getFileConnectId())){
|
||||
dataValueSb.append("\"").append(paramsReportConfigDataEO.getFileConnectId()).append("\",");
|
||||
}
|
||||
}
|
||||
String dataValue = "";
|
||||
if(StringUtils.isNotBlank(dataValueSb.toString())){
|
||||
dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1);
|
||||
}
|
||||
deleteLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append("，");
|
||||
deleteLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(",");
|
||||
|
||||
deleteFlag = true;
|
||||
}
|
||||
}
|
||||
newConfigDataEOList.add(paramsReportConfigDataEO);
|
||||
|
||||
|
||||
QueryWrapper<ParamsReportConfigDataEO> removeConfigDataWrap = new QueryWrapper<>();
|
||||
removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId);
|
||||
removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId);
|
||||
this.paramsReportConfigDataEOService.remove(removeConfigDataWrap);
|
||||
|
||||
//******************这里是当前配置的循环结束了******************
|
||||
//判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字
|
||||
@@ -1928,7 +2145,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
}
|
||||
}
|
||||
|
||||
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
|
||||
|
||||
/*if (logCnContent.toString().endsWith("，")) {
|
||||
String ramarks = "";
|
||||
if(map.get("remarks") != null){
|
||||
@@ -1942,6 +2159,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
insertLogEOList.add(insertLogEO);
|
||||
}*/
|
||||
if(changeFlag){
|
||||
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
|
||||
String ramarks = "";
|
||||
if(map.get("remarks") != null){
|
||||
ramarks = map.get("remarks").toString();
|
||||
@@ -1957,6 +2175,39 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
insertLogEO.setRemarks(ramarks);
|
||||
insertLogEOList.add(insertLogEO);
|
||||
}
|
||||
|
||||
if(deleteFlag){
|
||||
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
|
||||
String ramarks = "";
|
||||
if(map.get("remarks") != null){
|
||||
ramarks = map.get("remarks").toString();
|
||||
}
|
||||
insertLogEO.setLogCnContent(deleteLogCnContent.toString().substring(0, deleteLogCnContent.lastIndexOf("，")));
|
||||
insertLogEO.setLogEnContent(deleteLogEnContent.toString().substring(0, deleteLogEnContent.lastIndexOf(",")));
|
||||
|
||||
insertLogEO.setParamsReportId(paramsManifestId);
|
||||
insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
|
||||
insertLogEO.setRemarks(ramarks);
|
||||
insertLogEOList.add(insertLogEO);
|
||||
}
|
||||
|
||||
if(addFlag){
|
||||
|
||||
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
|
||||
String ramarks = "";
|
||||
if(map.get("remarks") != null){
|
||||
ramarks = map.get("remarks").toString();
|
||||
}
|
||||
insertLogEO.setLogCnContent(addLogCnContent.toString().substring(0, addLogCnContent.lastIndexOf("，")));
|
||||
insertLogEO.setLogEnContent(addLogEnContent.toString().substring(0, addLogEnContent.lastIndexOf(",")));
|
||||
|
||||
insertLogEO.setParamsReportId(paramsManifestId);
|
||||
insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
|
||||
insertLogEO.setRemarks(ramarks);
|
||||
insertLogEOList.add(insertLogEO);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// 批量更新
|
||||
@@ -1966,14 +2217,13 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
if (CollectionUtil.isNotEmpty(insertLogEOList)) {
|
||||
paramsReportDetailLogEOService.saveBatch(insertLogEOList);
|
||||
}
|
||||
return paramsReportConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
|
||||
return paramsReportConfigDataEOService.saveBatch(newConfigDataEOList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsReportConfigDataEO> paramsReportConfigDataEOList) {
|
||||
private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsReportConfigDataEO> paramsReportConfigDataEOList,String configDataId) {
|
||||
List<ParamsReportConfigDataEO> configDataEOList = paramsReportConfigDataEOList.stream()
|
||||
.filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId()))
|
||||
.filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId()) && StringUtils.equals(configDataId,e.getId()))
|
||||
.collect(Collectors.toList());
|
||||
if (CollectionUtil.isNotEmpty(configDataEOList)) {
|
||||
return configDataEOList.get(0);
|
||||
|
||||
+66
@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -55,6 +56,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
|
||||
@Autowired
|
||||
private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService;
|
||||
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
@@ -338,4 +340,68 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
|
||||
return paramsInfoEOService.importParamsInfo(file, cut, paramsTemplateId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 自动添加测试数据接口
|
||||
* @param json
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(value = "/test/autoAddTestData")
|
||||
public Result<?> autoAddTestData(@RequestBody JSONObject json) {
|
||||
//TODO 测试接口
|
||||
String certCategory = json.getString("certCategory");
|
||||
String certCategoryType = json.getString("certCategoryType"); // gg、3c、yy、hb
|
||||
String controlType = json.getString("controlType");
|
||||
String controlVerify = json.getString("controlVerify");
|
||||
String cut = json.getString("cut");
|
||||
String dutyTerritory = json.getString("dutyTerritory");
|
||||
String isMust = json.getString("isMust");
|
||||
String nioNumber = json.getString("nioNumber");
|
||||
String paramsBatch = json.getString("paramsBatch");
|
||||
String paramsName = json.getString("paramsName");
|
||||
String paramsTemplateId = json.getString("paramsTemplateId");
|
||||
if (StringUtils.isEmpty(certCategory)) {
|
||||
return Result.error("认证类别不能为空！");
|
||||
}
|
||||
boolean isSuccess = false;
|
||||
|
||||
Integer startIndex = json.getInteger("startIndex");
|
||||
Integer endIndex = json.getInteger("endIndex");
|
||||
for (Integer i = 0; i < endIndex; i++) {
|
||||
ParamsInfoEO paramsInfoEO = new ParamsInfoEO();
|
||||
paramsInfoEO.setNioNumber(nioNumber + "-" + String.format("%04d",startIndex + i));
|
||||
paramsInfoEO.setParamsName(paramsName + "-" + String.format("%04d",startIndex + i) + "名称");
|
||||
paramsInfoEO.setCertCategory(certCategory);
|
||||
paramsInfoEO.setControlType(controlType);
|
||||
paramsInfoEO.setControlVerify(controlVerify);
|
||||
paramsInfoEO.setCut(cut);
|
||||
paramsInfoEO.setDutyTerritory(dutyTerritory);
|
||||
paramsInfoEO.setIsMust(isMust);
|
||||
paramsInfoEO.setParamsBatch(paramsBatch);
|
||||
paramsInfoEO.setParamsTemplateId(paramsTemplateId);
|
||||
|
||||
List<CertCategoryParamsInfoEO> certCategoryParamsInfoEOList = new ArrayList<>();
|
||||
CertCategoryParamsInfoEO certCategoryParamsInfoEO = new CertCategoryParamsInfoEO();
|
||||
certCategoryParamsInfoEO.setCertCategory(certCategory);
|
||||
certCategoryParamsInfoEO.setParamsName(paramsName + "-" + String.format("%04d",startIndex + i) + "-" + certCategoryType + "-" + "name");
|
||||
certCategoryParamsInfoEO.setParamsNumber(nioNumber + "-" + String.format("%04d",startIndex + i) + "-" + certCategoryType);
|
||||
certCategoryParamsInfoEOList.add(certCategoryParamsInfoEO);
|
||||
paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList);
|
||||
|
||||
isSuccess = paramsInfoEOService.add(paramsInfoEO);
|
||||
|
||||
if(!isSuccess){
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (isSuccess) {
|
||||
return Result.OK("添加成功！");
|
||||
} else {
|
||||
return Result.error("添加失败！");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@ public class ParamsInfoEO implements Serializable {
|
||||
private String certCategory;
|
||||
|
||||
/**控件类型*/
|
||||
@Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10","标题_11"})
|
||||
@Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","下拉单选+文本_5","下拉多选+文本_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","下拉单选+文本+附件_10","标题_11"})
|
||||
@ApiModelProperty(value = "控件类型")
|
||||
private String controlType;
|
||||
|
||||
|
||||
+3
-3
@@ -15,12 +15,12 @@ public enum ControlTypeEnum {
|
||||
PULL_SINGLE("下拉单选","Pull single","2"),
|
||||
PULL_MORE("下拉多选","Pull more","3"),
|
||||
FILE("附件","File","4"),
|
||||
TEXT_PULL_SINGLE("文本+下拉单选","Text+Pull single","5"),
|
||||
TEXT_PULL_MORE("文本+下拉多选","Text+Pull more","6"),
|
||||
TEXT_PULL_SINGLE("下拉单选+文本","Pull single+Text","5"),
|
||||
TEXT_PULL_MORE("下拉多选+文本","Pull more+Text","6"),
|
||||
TEXT_FILE("文本+附件","Text+File","7"),
|
||||
PULL_SINGLE_FILE("下拉单选+附件","Pull single+File","8"),
|
||||
PULL_MORE_FILE("下拉多选+附件","Pull more+File","9"),
|
||||
TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10"),
|
||||
TEXT_PULL_SINGLE_FILE("下拉单选+文本+附件","Pull single+Text+File","10"),
|
||||
Title("标题","Title","11");
|
||||
|
||||
String name;
|
||||
|
||||
+172
@@ -0,0 +1,172 @@
|
||||
package com.jero.modules.document.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.document.entity.PhasedImplementationDetailsEO;
|
||||
import com.jero.modules.document.service.IPhasedImplementationDetailsEOService;
|
||||
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: 2023-02-22
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="文档库-分阶段实施详情表")
|
||||
@RestController
|
||||
@RequestMapping("/document/phasedImplementationDetailsEO")
|
||||
@Slf4j
|
||||
public class PhasedImplementationDetailsEOController extends JeroController<PhasedImplementationDetailsEO, IPhasedImplementationDetailsEOService> {
|
||||
@Autowired
|
||||
private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "文档库-分阶段实施详情表-分页列表查询")
|
||||
@ApiOperation(value="文档库-分阶段实施详情表-分页列表查询", notes="文档库-分阶段实施详情表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(PhasedImplementationDetailsEO phasedImplementationDetailsEO,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@RequestParam(name="cut", defaultValue="cn") String cut,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PhasedImplementationDetailsEO> queryWrapper = QueryGenerator.initQueryWrapper(phasedImplementationDetailsEO, req.getParameterMap());
|
||||
Page<PhasedImplementationDetailsEO> page = new Page<PhasedImplementationDetailsEO>(pageNo, pageSize);
|
||||
IPage<PhasedImplementationDetailsEO> pageList = phasedImplementationDetailsEOService.page(page, queryWrapper);
|
||||
this.phasedImplementationDetailsEOService.disposeData(pageList.getRecords(),cut);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "文档库-分阶段实施详情表-列表查询")
|
||||
@ApiOperation(value="文档库-分阶段实施详情表-列表查询", notes="文档库-分阶段实施详情表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<PhasedImplementationDetailsEO>> queryList() {
|
||||
List<PhasedImplementationDetailsEO> list = phasedImplementationDetailsEOService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "文档库-分阶段实施详情表-添加")
|
||||
@ApiOperation(value="文档库-分阶段实施详情表-添加", notes="文档库-分阶段实施详情表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody PhasedImplementationDetailsEO phasedImplementationDetailsEO) {
|
||||
phasedImplementationDetailsEOService.add(phasedImplementationDetailsEO);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "文档库-分阶段实施详情表-编辑")
|
||||
@ApiOperation(value="文档库-分阶段实施详情表-编辑", notes="文档库-分阶段实施详情表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody PhasedImplementationDetailsEO phasedImplementationDetailsEO) {
|
||||
phasedImplementationDetailsEOService.editById(phasedImplementationDetailsEO);
|
||||
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) {
|
||||
phasedImplementationDetailsEOService.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.phasedImplementationDetailsEOService.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) {
|
||||
PhasedImplementationDetailsEO phasedImplementationDetailsEO = phasedImplementationDetailsEOService.queryById(id);
|
||||
if(phasedImplementationDetailsEO==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(phasedImplementationDetailsEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param phasedImplementationDetailsEO
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PhasedImplementationDetailsEO phasedImplementationDetailsEO) {
|
||||
return super.exportXls(request, phasedImplementationDetailsEO, PhasedImplementationDetailsEO.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, PhasedImplementationDetailsEO.class);
|
||||
}
|
||||
|
||||
}
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
package com.jero.modules.document.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
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 io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 文档库-分阶段实施详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-02-22
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("phased_implementation_details")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="phased_implementation_details对象", description="文档库-分阶段实施详情表")
|
||||
public class PhasedImplementationDetailsEO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**文档库id*/
|
||||
@Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private String bussDocumentLibraryId;
|
||||
|
||||
/**法规编号/条款*/
|
||||
@Excel(name = "法规编号/条款", width = 15)
|
||||
@ApiModelProperty(value = "法规编号/条款")
|
||||
private String standNumberOrClause;
|
||||
|
||||
/**实施类型*/
|
||||
@Excel(name = "实施类型", width = 15)
|
||||
@ApiModelProperty(value = "实施类型")
|
||||
private String implementationType;
|
||||
|
||||
/**实施类型展示文本**/
|
||||
@TableField(exist = false)
|
||||
private String implementationTypeText;
|
||||
|
||||
/**实施日期*/
|
||||
@Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "实施日期")
|
||||
private Date implementationDate;
|
||||
|
||||
/**备注*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remarks;
|
||||
|
||||
/**排序号*/
|
||||
@Excel(name = "排序号", width = 15)
|
||||
@ApiModelProperty(value = "排序号")
|
||||
private Integer orderNum;
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.jero.modules.document.enums;
|
||||
|
||||
/**
|
||||
* 实施类型枚举类
|
||||
*/
|
||||
public enum ImplementationTypeEnum {
|
||||
CAR_IN_PRODUCTION("1628228171473039361","在产车","Car in production","34e90bd6a000471bbdcd0ff325898740"),
|
||||
NEW_CAR_MODEL("1628228101830815745","新车型","New car model","2148610ff06641849106321531656bfc");
|
||||
|
||||
String id;
|
||||
String nameCn;
|
||||
String nameEn;
|
||||
String itemValue;
|
||||
|
||||
private ImplementationTypeEnum(String id,String nameCn, String nameEn,String itemValue) {
|
||||
this.id = id;
|
||||
this.nameCn = nameCn;
|
||||
this.nameEn = nameEn;
|
||||
this.itemValue = itemValue;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getNameCn() {
|
||||
return nameCn;
|
||||
}
|
||||
|
||||
public void setNameCn(String nameCn) {
|
||||
this.nameCn = nameCn;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getItemValue() {
|
||||
return itemValue;
|
||||
}
|
||||
|
||||
public void setItemValue(String itemValue) {
|
||||
this.itemValue = itemValue;
|
||||
}
|
||||
}
|
||||
+2
@@ -99,5 +99,7 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
|
||||
@Param("id") String id );
|
||||
List<Map<String, Object>> queryListByIds(@Param("ids") String ids);
|
||||
|
||||
BussDocumentLibraryEO getBySerialNumber(@Param("serialNumber") String serialNumber);
|
||||
|
||||
|
||||
}
|
||||
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.jero.modules.document.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.jero.modules.document.entity.PhasedImplementationDetailsEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 文档库-分阶段实施详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-02-22
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PhasedImplementationDetailsEOMapper extends BaseMapper<PhasedImplementationDetailsEO> {
|
||||
|
||||
}
|
||||
+5
@@ -115,4 +115,9 @@
|
||||
#{item}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<select id="getBySerialNumber" resultType="com.jero.modules.document.entity.BussDocumentLibraryEO">
|
||||
select * from buss_document_library
|
||||
where serial_number =#{serialNumber}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper">
|
||||
<resultMap id="PhasedImplementationDetailsEOResultMap" type="com.jero.modules.document.entity.PhasedImplementationDetailsEO">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="buss_document_library_id" property="bussDocumentLibraryId" />
|
||||
<result column="stand_number_or_clause" property="standNumberOrClause" />
|
||||
<result column="implementation_type" property="implementationType" />
|
||||
<result column="implementation_date" property="implementationDate" />
|
||||
<result column="remarks" property="remarks" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+7
@@ -225,4 +225,11 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
|
||||
String sqlJoint(List<QueryConditionVO> queryConditionVOList);
|
||||
|
||||
int updateES();
|
||||
|
||||
/**
|
||||
* 根据serialNumber获取BussDumentLibrar对象
|
||||
* @param serialNumber
|
||||
* @return
|
||||
*/
|
||||
BussDocumentLibraryEO getBySerialNumber(String serialNumber);
|
||||
}
|
||||
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package com.jero.modules.document.service;
|
||||
|
||||
import com.jero.modules.document.entity.PhasedImplementationDetailsEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 文档库-分阶段实施详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-02-22
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPhasedImplementationDetailsEOService extends IService<PhasedImplementationDetailsEO> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @return
|
||||
*/
|
||||
void add(PhasedImplementationDetailsEO phasedImplementationDetailsEO);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @return
|
||||
*/
|
||||
void editById(PhasedImplementationDetailsEO phasedImplementationDetailsEO);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
PhasedImplementationDetailsEO queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<PhasedImplementationDetailsEO> queryList();
|
||||
|
||||
boolean insertBatch(List<PhasedImplementationDetailsEO> phasedImplDetailsEOList);
|
||||
|
||||
void disposeData(List<PhasedImplementationDetailsEO> datas, String cut);
|
||||
}
|
||||
+696
-312
File diff suppressed because it is too large
Load Diff
+150
@@ -0,0 +1,150 @@
|
||||
package com.jero.modules.document.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.modules.document.entity.PhasedImplementationDetailsEO;
|
||||
import com.jero.modules.document.enums.ImplementationTypeEnum;
|
||||
import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper;
|
||||
import com.jero.modules.document.service.IPhasedImplementationDetailsEOService;
|
||||
import me.zhyd.oauth.utils.StringUtils;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 文档库-分阶段实施详情表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-02-22
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl<PhasedImplementationDetailsEOMapper, PhasedImplementationDetailsEO> implements IPhasedImplementationDetailsEOService {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(PhasedImplementationDetailsEO phasedImplementationDetailsEO) {
|
||||
Date now = new Date();
|
||||
phasedImplementationDetailsEO.setCreateTime(now);
|
||||
phasedImplementationDetailsEO.setUpdateTime(now);
|
||||
save(phasedImplementationDetailsEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param phasedImplementationDetailsEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(PhasedImplementationDetailsEO phasedImplementationDetailsEO) {
|
||||
Date now = new Date();
|
||||
phasedImplementationDetailsEO.setUpdateTime(now);
|
||||
saveOrUpdate(phasedImplementationDetailsEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(List<String> ids) {
|
||||
removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public PhasedImplementationDetailsEO queryById(String id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<PhasedImplementationDetailsEO> queryList() {
|
||||
return list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertBatch(List<PhasedImplementationDetailsEO> phasedImplDetailsEOList) {
|
||||
boolean flag = true;
|
||||
if(CollectionUtils.isNotEmpty(phasedImplDetailsEOList)){
|
||||
try {
|
||||
this.saveBatch(phasedImplDetailsEOList);
|
||||
}catch (Exception ex){
|
||||
flag = false;
|
||||
ex.printStackTrace();
|
||||
log.error("批量添加分阶段实施详情信息失败：" + ex.getMessage());
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disposeData(List<PhasedImplementationDetailsEO> datas, String cut) {
|
||||
if(CollectionUtils.isNotEmpty(datas)){
|
||||
for (PhasedImplementationDetailsEO data : datas) {
|
||||
String implementationType = data.getImplementationType();
|
||||
if(StringUtils.isNotEmpty(implementationType)){
|
||||
String[] implementationTypeArr = implementationType.split(",");
|
||||
ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values();
|
||||
|
||||
String implementationTypeText = "";
|
||||
if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> {
|
||||
boolean flag = false;
|
||||
for (String type : implementationTypeArr) {
|
||||
if (org.apache.commons.lang3.StringUtils.equals(type, implementationTypeEnum.getItemValue())) {
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).map(ImplementationTypeEnum::getNameCn).collect(Collectors.joining(","));
|
||||
}else {
|
||||
implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> {
|
||||
boolean flag = false;
|
||||
for (String type : implementationTypeArr) {
|
||||
if (org.apache.commons.lang3.StringUtils.equals(type, implementationTypeEnum.getItemValue())) {
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}).map(ImplementationTypeEnum::getNameEn).collect(Collectors.joining(","));
|
||||
}
|
||||
data.setImplementationTypeText(implementationTypeText);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -215,7 +215,7 @@ public class DummyInventoryInfoEO implements Serializable {
|
||||
private java.lang.String designDeliverableTemplateName;
|
||||
|
||||
/**设计符合性确认-发起人*/
|
||||
@Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2")
|
||||
// @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2")
|
||||
@ApiModelProperty(value = "设计符合性确认-发起人")
|
||||
//@Dict(dicCode ="fa1_qi3_ren2")
|
||||
private java.lang.String designInitiator;
|
||||
@@ -235,7 +235,7 @@ public class DummyInventoryInfoEO implements Serializable {
|
||||
private String designRemark;
|
||||
|
||||
/**prehomo确认-交付物类型*/
|
||||
@Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template")
|
||||
// @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template")
|
||||
@ApiModelProperty(value = "prehomo确认-交付物类型")
|
||||
// @Dict(dicCode ="deliverable_template")
|
||||
private java.lang.String prehomoDeliverableType;
|
||||
@@ -253,7 +253,7 @@ public class DummyInventoryInfoEO implements Serializable {
|
||||
private java.lang.String prehomoDeliverableTemplateName;
|
||||
|
||||
/**prehomo确认-发起人*/
|
||||
@Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2")
|
||||
// @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2")
|
||||
@ApiModelProperty(value = "prehomo确认-发起人")
|
||||
//@Dict(dicCode ="fa1_qi3_ren2")
|
||||
private java.lang.String prehomoInitiator;
|
||||
@@ -261,7 +261,7 @@ public class DummyInventoryInfoEO implements Serializable {
|
||||
private String prehomoInitiator_dictText;
|
||||
|
||||
/**prehomo确认-责任人*/
|
||||
@Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2")
|
||||
// @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2")
|
||||
@ApiModelProperty(value = "prehomo确认-责任人")
|
||||
//@Dict(dicCode ="ze2_ren4_ren2")
|
||||
private java.lang.String prehomoDuty;
|
||||
@@ -269,7 +269,7 @@ public class DummyInventoryInfoEO implements Serializable {
|
||||
private String prehomoDuty_dictText;
|
||||
|
||||
//prehomo确认-交付物说明
|
||||
@Excel(name = "prehomo确认-交付物说明", width = 20)
|
||||
// @Excel(name = "prehomo确认-交付物说明", width = 20)
|
||||
private String prehomoRemark;
|
||||
|
||||
/**验证符合性确认-交付物类型*/
|
||||
@@ -290,7 +290,7 @@ public class DummyInventoryInfoEO implements Serializable {
|
||||
private java.lang.String verifyDeliverableTemplateName;
|
||||
|
||||
/**验证符合性确认-发起人*/
|
||||
@Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2")
|
||||
// @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2")
|
||||
@ApiModelProperty(value = "验证符合性确认-发起人")
|
||||
//@Dict(dicCode ="fa1_qi3_ren2")
|
||||
private java.lang.String verifyInitiator;
|
||||
|
||||
+3
-3
@@ -187,7 +187,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
|
||||
|
||||
|
||||
/**设计符合性确认-发起人*/
|
||||
@Excel(name = "Design Initiator", width = 30)
|
||||
// @Excel(name = "Design Initiator", width = 30)
|
||||
@ApiModelProperty(value = "设计符合性确认-发起人")
|
||||
@Dict(dicCode ="fa1_qi3_ren2")
|
||||
private String designInitiator;
|
||||
@@ -218,7 +218,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
|
||||
private String prehomoDeliverableTemplateName;
|
||||
|
||||
/**prehomo确认-发起人*/
|
||||
@Excel(name = "Prehomo Initiator", width = 30)
|
||||
// @Excel(name = "Prehomo Initiator", width = 30)
|
||||
@ApiModelProperty(value = "prehomo确认-发起人")
|
||||
@Dict(dicCode ="fa1_qi3_ren2")
|
||||
private String prehomoInitiator;
|
||||
@@ -248,7 +248,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
|
||||
private String verifyDeliverableTemplateName;
|
||||
|
||||
/**验证符合性确认-发起人*/
|
||||
@Excel(name = "Verify Initiator", width = 30)
|
||||
// @Excel(name = "Verify Initiator", width = 30)
|
||||
@ApiModelProperty(value = "验证符合性确认-发起人")
|
||||
@Dict(dicCode ="fa1_qi3_ren2")
|
||||
private String verifyInitiator;
|
||||
|
||||
+144
-24
@@ -16,8 +16,11 @@ import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.DateUtils;
|
||||
import com.jero.common.util.oss.CosBootUtil;
|
||||
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
||||
import com.jero.modules.document.entity.PhasedImplementationDetailsEO;
|
||||
import com.jero.modules.document.enums.ImplementationTypeEnum;
|
||||
import com.jero.modules.document.enums.LawsStateEnum;
|
||||
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
|
||||
import com.jero.modules.document.service.IPhasedImplementationDetailsEOService;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
|
||||
import com.jero.modules.dummy.entity.DummyInventoryInfoEOEn;
|
||||
@@ -98,6 +101,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
private DummyInventoryBaseEOServiceImpl dummyInventoryBaseEOService;
|
||||
@Autowired
|
||||
SysCategoryMapper sysCategoryMapper;
|
||||
@Autowired
|
||||
private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService;
|
||||
|
||||
@Override
|
||||
public IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
|
||||
@@ -401,6 +406,52 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
queryWrapper.orderByDesc("create_time","serial_number");
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTimeString())){
|
||||
String[] implementTimeArr = dummyInventoryInfoEO.getImplementTimeString().split(",");
|
||||
|
||||
QueryWrapper<PhasedImplementationDetailsEO> phasedDetailsQueryWrap = new QueryWrapper<>();
|
||||
phasedDetailsQueryWrap.lambda().like(PhasedImplementationDetailsEO::getImplementationType,ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue());
|
||||
phasedDetailsQueryWrap.lambda().ge(PhasedImplementationDetailsEO::getImplementationDate,implementTimeArr[0]);
|
||||
phasedDetailsQueryWrap.lambda().le(PhasedImplementationDetailsEO::getImplementationDate,implementTimeArr[1]);
|
||||
List<String> bussDocumentLibraryIdList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap)
|
||||
.stream().map(PhasedImplementationDetailsEO::getBussDocumentLibraryId).collect(Collectors.toList());
|
||||
|
||||
queryWrapper.and(query -> {
|
||||
query.and(q -> {
|
||||
q.lambda().ge(DummyInventoryInfoEO::getImplementTime,implementTimeArr[0]);
|
||||
q.lambda().le(DummyInventoryInfoEO::getImplementTime,implementTimeArr[1]);
|
||||
});
|
||||
|
||||
if(CollectionUtils.isNotEmpty(bussDocumentLibraryIdList)){
|
||||
query.or(q -> {
|
||||
q.lambda().in(DummyInventoryInfoEO::getBussDocumentLibraryId,bussDocumentLibraryIdList);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
if(StringUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())){
|
||||
String[] newCarTimeArr = dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().split(",");
|
||||
|
||||
QueryWrapper<PhasedImplementationDetailsEO> phasedDetailsQueryWrap = new QueryWrapper<>();
|
||||
phasedDetailsQueryWrap.lambda().like(PhasedImplementationDetailsEO::getImplementationType,ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue());
|
||||
phasedDetailsQueryWrap.lambda().ge(PhasedImplementationDetailsEO::getImplementationDate,newCarTimeArr[0]);
|
||||
phasedDetailsQueryWrap.lambda().le(PhasedImplementationDetailsEO::getImplementationDate,newCarTimeArr[1]);
|
||||
List<String> bussDocumentLibraryIdList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap)
|
||||
.stream().map(PhasedImplementationDetailsEO::getBussDocumentLibraryId).collect(Collectors.toList());
|
||||
|
||||
queryWrapper.and(query -> {
|
||||
query.and(q -> {
|
||||
q.lambda().ge(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,newCarTimeArr[0]);
|
||||
q.lambda().le(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,newCarTimeArr[1]);
|
||||
});
|
||||
if(CollectionUtils.isNotEmpty(bussDocumentLibraryIdList)){
|
||||
query.or(q -> {
|
||||
q.lambda().in(DummyInventoryInfoEO::getBussDocumentLibraryId,bussDocumentLibraryIdList);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
|
||||
log.info("一阶段消耗时间：" + (System.currentTimeMillis() - startTime));
|
||||
//数据字典
|
||||
@@ -412,6 +463,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime));
|
||||
treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList,sysDictItems);
|
||||
|
||||
// 数据处理
|
||||
this.disposeData(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut());
|
||||
|
||||
//表头排序
|
||||
dummyInventoryInfoEOList = hearSort(orderBy, orderByField, dummyInventoryInfoEOList);
|
||||
|
||||
@@ -419,6 +473,68 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
return dummyInventoryInfoEOList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 数据处理
|
||||
* @param datas
|
||||
* @param cut
|
||||
*/
|
||||
private void disposeData(List<DummyInventoryInfoEO> datas, String cut) {
|
||||
if(CollectionUtils.isNotEmpty(datas)){
|
||||
List<String> bussDocumentLibraryIdList = datas.stream().map(DummyInventoryInfoEO::getBussDocumentLibraryId).distinct().collect(Collectors.toList());
|
||||
QueryWrapper<PhasedImplementationDetailsEO> phasedDetailsQueryWrap = new QueryWrapper<>();
|
||||
phasedDetailsQueryWrap.lambda().in(PhasedImplementationDetailsEO::getBussDocumentLibraryId,bussDocumentLibraryIdList);
|
||||
List<PhasedImplementationDetailsEO> phasedDetailsList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap);
|
||||
|
||||
// 新车型分阶段实施数据信息
|
||||
List<PhasedImplementationDetailsEO> newCarModelPhasedDetailsList = phasedDetailsList.stream().filter(phasedDetails -> {
|
||||
boolean flag = false;
|
||||
if(StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue())){
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
// 在产车分阶段实施数据信息
|
||||
List<PhasedImplementationDetailsEO> carInProductionPhasedDetailsList = phasedDetailsList.stream().filter(phasedDetails -> {
|
||||
boolean flag = false;
|
||||
if(StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue())){
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
for (DummyInventoryInfoEO data : datas) {
|
||||
// 处理新车型实施日期展示
|
||||
List<Date> newCarModelDateList = newCarModelPhasedDetailsList.stream().filter(phasedDetails -> {
|
||||
boolean flag = false;
|
||||
if (StringUtils.equals(phasedDetails.getBussDocumentLibraryId(), data.getBussDocumentLibraryId())) {
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList());
|
||||
if(data.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){
|
||||
newCarModelDateList.add(data.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
|
||||
}
|
||||
String newCarModelDateStr = DateUtils.formatDateList(newCarModelDateList);
|
||||
data.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(newCarModelDateStr);
|
||||
|
||||
// 处理在产车实施日期展示
|
||||
List<Date> carInProductionDateList = carInProductionPhasedDetailsList.stream().filter(phasedDetails -> {
|
||||
boolean flag = false;
|
||||
if (StringUtils.equals(phasedDetails.getBussDocumentLibraryId(), data.getBussDocumentLibraryId())) {
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList());
|
||||
if(data.getImplementTime() != null){
|
||||
carInProductionDateList.add(data.getImplementTime());
|
||||
}
|
||||
String carInProductionDateStr = DateUtils.formatDateList(carInProductionDateList);
|
||||
data.setImplementTimeString(carInProductionDateStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<DummyInventoryInfoEO> hearSort(String orderBy, String orderByField, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
|
||||
if(ObjectUtils.isNotEmpty(orderByField)){
|
||||
Collator comparator = Collator.getInstance(Locale.CHINESE);
|
||||
@@ -1066,6 +1182,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
OutputStream os = null;
|
||||
HSSFWorkbook workbook = new HSSFWorkbook();
|
||||
String fileOriName = "虚拟清单导入模板.xls";
|
||||
|
||||
String sheetName = "";
|
||||
if(StringUtils.equals(dummyInventoryInfoEO.getCut(),CutEnum.CN.getValue())){
|
||||
sheetName = "虚拟清单导入模板";
|
||||
}else {
|
||||
sheetName = "Virtual Inventory Import Template";
|
||||
}
|
||||
|
||||
String filePath = uploadpath + File.separator + fileOriName;
|
||||
try {
|
||||
String titleOne = "";
|
||||
@@ -1075,19 +1199,17 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
"WVTA ID,认证类型," +
|
||||
"*认证级别," +"适用增补件,"+
|
||||
"*责任领域,备注," +
|
||||
"设计符合性确认,Pre-homo确认,验证符合性确认";
|
||||
titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物说明," +
|
||||
"交付物类型,交付物模板,发起人,责任人,交付物说明," +
|
||||
"交付物类型,交付物模板,发起人,责任人,交付物说明";
|
||||
"设计符合性确认,验证符合性确认";
|
||||
titleTwo = "交付物类型,交付物模板,责任人,交付物说明," +
|
||||
"交付物类型,交付物模板,责任人,交付物说明";
|
||||
}else{
|
||||
titleOne = "*Number,Sub-Title,Usage," +
|
||||
"WVTA ID,Certification Type," +
|
||||
"*Certification Level," +"Applicable Supplement,"+
|
||||
"*Responsible Field,Comments," +
|
||||
"Design compliance check,Pre-homo check,Validation compliance chech";
|
||||
titleTwo = "Type of deliverables,Deliverable template,Initiator,Person liable,Deliverables description," +
|
||||
"Type of deliverables,Deliverable template,Initiator,Person liable,Deliverables description," +
|
||||
"Type of deliverables,Deliverable template,Initiator,Person liable,Deliverables description";
|
||||
"Design compliance check,Validation compliance chech";
|
||||
titleTwo = "Type of deliverables,Deliverable template,Person liable,Deliverables description," +
|
||||
"Type of deliverables,Deliverable template,Person liable,Deliverables description";
|
||||
}
|
||||
|
||||
|
||||
@@ -1105,7 +1227,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
nowFile.delete();
|
||||
}
|
||||
nowFile.mkdirs();
|
||||
HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
|
||||
HSSFSheet sheet = workbook.createSheet(sheetName);
|
||||
sheet.setDefaultColumnWidth(16);//列宽
|
||||
HSSFCellStyle cellStyle = workbook.createCellStyle();
|
||||
cellStyle.setWrapText(true);//自动换行
|
||||
@@ -1119,7 +1241,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
int count = 1;
|
||||
int startLine = 0;
|
||||
int endLine = 0;
|
||||
int line = 4;
|
||||
int line = 3;
|
||||
for (int i = 0; i < index; i++) {
|
||||
//合并单元格
|
||||
CellRangeAddress region1 =
|
||||
@@ -1148,7 +1270,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
explain = "填写说明\n" +
|
||||
"1.导入数据从第四行开始\n" +
|
||||
"2.所有带*号的字段必须填写\n"+
|
||||
"3.实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
|
||||
"3.实施类别,交付物类型,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
|
||||
"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
|
||||
"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
|
||||
"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
|
||||
@@ -1156,10 +1278,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
explain = "Filling explanation\n" +
|
||||
"1.Import data starts at the fourth line\n" +
|
||||
"2.All fields marked with * must be filled in\n"+
|
||||
"3.Implementation category,Type of deliverables,Initiator,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
|
||||
"3.Implementation category,Type of deliverables,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
|
||||
"4.Certification Type,Certification Level,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
|
||||
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
|
||||
"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
|
||||
"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B.docx";
|
||||
}
|
||||
|
||||
|
||||
@@ -1176,7 +1298,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
row.createCell(lineTemp).setCellValue(headerArr[m]);
|
||||
Cell cell = row.getCell(lineTemp);
|
||||
cell.setCellStyle(cellStyle);
|
||||
lineTemp = lineTemp + 5;
|
||||
lineTemp = lineTemp + 4;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1368,17 +1490,15 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
String title = "";
|
||||
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
|
||||
title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,适用增补件,*责任领域,备注," +
|
||||
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计交付物说明," +
|
||||
"Pre交付物类型,Pre交付物模板,Pre发起人,Pre责任人,Pre交付物说明," +
|
||||
"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证交付物说明";
|
||||
"设计交付物类型,设计交付物模板,设计责任人,设计交付物说明," +
|
||||
"验证交付物类型,验证交付物模板,验证责任人,验证交付物说明";
|
||||
}else{
|
||||
title = "*Number,Sub-Title,Usage," +
|
||||
"WVTA ID,Certification Type," +
|
||||
"*Certification Level," +"Applicable Supplement,"+
|
||||
"*Responsible Field,Comments," +
|
||||
"Design Type of deliverables,Design Deliverable template,Design Initiator,Design Person liable,Design Deliverables description," +
|
||||
"Pre Type of deliverables,Pre Deliverable template,Pre Initiator,Pre Person liable,Pre Deliverables description," +
|
||||
"Verify Type of deliverables,Verify Deliverable template,Verify Initiator,Verify Person liable,Verify Deliverables description";
|
||||
"Design Type of deliverables,Design Deliverable template,Design Person liable,Design Deliverables description," +
|
||||
"Verify Type of deliverables,Verify Deliverable template,Verify Person liable,Verify Deliverables description";
|
||||
}
|
||||
|
||||
int pos = file.getOriginalFilename().lastIndexOf(".");
|
||||
@@ -1502,7 +1622,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
}else if(i == 1){
|
||||
if(j > 8){
|
||||
String flag = "";
|
||||
if(8 < j && j < 14){
|
||||
if(8 < j && j < 13){
|
||||
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
|
||||
flag ="设计";
|
||||
}else{
|
||||
@@ -1510,15 +1630,15 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
}
|
||||
key = flag + headerCell.getStringCellValue();
|
||||
}
|
||||
if(13 < j && j < 19){
|
||||
/*if(13 < j && j < 19){
|
||||
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
|
||||
flag ="Pre";
|
||||
}else{
|
||||
flag ="Pre ";
|
||||
}
|
||||
key = flag + headerCell.getStringCellValue();
|
||||
}
|
||||
if(18 < j && j < 24){
|
||||
}*/
|
||||
if(13 <= j && j < 18){
|
||||
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
|
||||
flag ="验证";
|
||||
}else{
|
||||
|
||||
+94
@@ -0,0 +1,94 @@
|
||||
package com.jero.modules.feishu.enums;
|
||||
|
||||
/**
|
||||
* 飞书消息模板枚举类 由于开发分支问题，此枚举只在认证清单流程中使用， 与 TemplateInfoEnum 作用一样
|
||||
*/
|
||||
public enum TemplateInfoEnum2 {
|
||||
|
||||
// 认证消息
|
||||
CERTIFICATION_MESSAGE1("stuido催办，认证工程师收到消息","ctp_AAuDmU58lKqB"),
|
||||
CERTIFICATION_MESSAGE2("Studio发起，认证工程师收到消息","ctp_AAuDmfXCkx8W"),
|
||||
CERTIFICATION_MESSAGE3("认证工程师拒绝，studio收到消息","ctp_AAuDM8YPr3iJ"),
|
||||
CERTIFICATION_MESSAGE4("studio撤回，认证工程师收到消息","ctp_AAuDmgJIf6Mr"),
|
||||
CERTIFICATION_MESSAGE5("studio重置流程，认证工程师收到消息","ctp_AAuDM8YPrBfs"),
|
||||
CERTIFICATION_MESSAGE6("认证清单-任务提醒，截止日期前第三天","ctp_AAuDmfXC3oJo"),
|
||||
CERTIFICATION_MESSAGE7("认证清单-任务提醒，截止日期当天","ctp_AAuDmfXCHc1I"),
|
||||
CERTIFICATION_MESSAGE8("认证清单-任务提醒，已逾期","ctp_AAuDMwOPU71H"),
|
||||
//CERTIFICATION_MESSAGE9("认证清单-责任人分发（转办），第二责任人收到消息","ctp_AAuDM8YP6soc"),
|
||||
CERTIFICATION_MESSAGE10("认证工程师发起流程，责任人收到消息","ctp_AAuePL6rUK1L"),
|
||||
CERTIFICATION_MESSAGE11("责任人拒绝，认证工程师收到消息","ctp_AAu2ZrSEiB1V"),
|
||||
CERTIFICATION_MESSAGE12("责任人接受，认证工程师收到消息","ctp_AAuePL6r3B0I"),
|
||||
CERTIFICATION_MESSAGE13("studio修改认证工程师，被修改人收到消息","ctp_AAuLRr2QhG9J"),
|
||||
CERTIFICATION_MESSAGE14("studio修改符合性截止时间，认证工程师收到消息","ctp_AAuePL6r3XqN"),
|
||||
CERTIFICATION_MESSAGE15("认证工程师修改责任人，被修改人收到消息","ctp_AAu2ZrSE1z3f"),
|
||||
CERTIFICATION_MESSAGE16("认证工程师催办，责任人收到消息","ctp_AAuPfn0M0H6i"),
|
||||
CERTIFICATION_MESSAGE17("责任人下发工程师，工程师接收-任务","ctp_AAuPfn0MCwlH"),
|
||||
CERTIFICATION_MESSAGE18("任务提醒，责任人接收-任务 发起人催办责任人","ctp_AAuPh3LJ2Nex"),
|
||||
CERTIFICATION_MESSAGE19("任务提醒，责任人接收-任务 两周通知","ctp_AAuPh3LJKUZk"),
|
||||
CERTIFICATION_MESSAGE20("任务提醒，责任人接收-任务 一周通知","ctp_AAuXnIIM45B0"),
|
||||
CERTIFICATION_MESSAGE21("任务提醒，责任人接收-任务 当天","ctp_AAu2lBIgnWND"),
|
||||
CERTIFICATION_MESSAGE22("任务提醒，责任人接收-任务 逾期之后 每天通知","ctp_AAuPfn0MDOYu"),
|
||||
CERTIFICATION_MESSAGE23("责任人提交，发起人接收审查任务-任务","ctp_AAuPh3LJKoIX"),
|
||||
CERTIFICATION_MESSAGE24("发起人审查退回，责任人接收-任务","ctp_AAu2lBIgZK5f"),
|
||||
CERTIFICATION_MESSAGE25("发起人审查通过，责任人接收通知-通知","ctp_AAuPKJ9CDwIP"),
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 法规清单发布相关消息模板
|
||||
*/
|
||||
REGULATION_LIST_RELEASE1("Studio发起或stuido催办，法规工程师收到消息","ctp_AAuL6mDxMKxu"),
|
||||
REGULATION_LIST_RELEASE2("法规清单发布-公用消息-绿色","ctp_AAuPKJ9Cj9w5"),
|
||||
REGULATION_LIST_RELEASE3("法规清单发布-公用消息-红色","ctp_AAu2lBIgaB79"),
|
||||
REGULATION_LIST_RELEASE4("法规清单发布-公用消息-黄色","ctp_AAuPh3LJWg1x"),
|
||||
|
||||
/**
|
||||
* 法规任务确认消息
|
||||
*/
|
||||
REGULATION_TASK_CONFIRMATION1("法规任务确认-公用消息-绿色-无流程类型","ctp_AAuLRr2QIbMb"),
|
||||
REGULATION_TASK_CONFIRMATION2("法规任务确认-公用消息-红色-无流程类型","ctp_AAuL6mDxffmu"),
|
||||
REGULATION_TASK_CONFIRMATION3("法规任务确认-公用消息-黄色-无流程类型","ctp_AAuLRr2Qzyj0"),
|
||||
REGULATION_TASK_CONFIRMATION4("法规任务确认-公用消息-绿色-有流程类型","ctp_AAuL6mDxf8l1"),
|
||||
REGULATION_TASK_CONFIRMATION5("法规任务确认-公用消息-红色-有流程类型","ctp_AAuPWTSU2Fg2"),
|
||||
REGULATION_TASK_CONFIRMATION6("法规任务确认-公用消息-黄色-有流程类型","ctp_AAuLRr2Qzkbo"),
|
||||
|
||||
|
||||
/**
|
||||
* 设计符合性流程
|
||||
*/
|
||||
DESIGN_COMPLIANCE_CONFIRMATION1("设计符合性流程-公用消息-绿色","ctp_AAuPIdaoms57"),
|
||||
DESIGN_COMPLIANCE_CONFIRMATION2("设计符合性流程-公用消息-红色","ctp_AAuLRr2QX8xb"),
|
||||
DESIGN_COMPLIANCE_CONFIRMATION3("设计符合性流程-公用消息-黄色","ctp_AAuLdvF0lUtu"),
|
||||
|
||||
/**
|
||||
* 验证符合性流程
|
||||
*/
|
||||
VALIDATION_COMPLIANCE_CONFIRMATION1("验证符合性流程-公用消息-绿色","ctp_AAuLdvF0lS41"),
|
||||
VALIDATION_COMPLIANCE_CONFIRMATION2("验证符合性流程-公用消息-红色","ctp_AAu2lBI6MV0i"),
|
||||
VALIDATION_COMPLIANCE_CONFIRMATION3("验证符合性流程-公用消息-黄色","ctp_AAupcD3RBbUV"),
|
||||
|
||||
;
|
||||
|
||||
String name;
|
||||
String value;
|
||||
|
||||
private TemplateInfoEnum2(String name, String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
+8
@@ -122,4 +122,12 @@ public interface IFeishuService {
|
||||
* @param emailList
|
||||
*/
|
||||
JSONObject getUserInfoFromLarkByEmainList(List<String> emailList) throws IOException ;
|
||||
|
||||
/**
|
||||
* 根据模板-批量发送飞书卡片消息 由于开发分支问题，此方法只在认证清单流程中使用， 与 batchSendLarkCardMsgByTemplate 作用一样
|
||||
* @param json
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
Result<?> batchSendLarkCardMsgByTemplate2(JSONObject json) throws IOException;
|
||||
}
|
||||
|
||||
+37
@@ -1394,4 +1394,41 @@ public class FeishuServiceImpl implements IFeishuService {
|
||||
return responseJson;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> batchSendLarkCardMsgByTemplate2(JSONObject json) throws IOException {
|
||||
String token = this.getTenantAccessToken();
|
||||
// 设置请求头
|
||||
Map<String, String> headerMap = new HashMap<>();
|
||||
headerMap.put("Authorization", "Bearer " + token);
|
||||
headerMap.put("Content-Type", "application/json; charset=utf-8");
|
||||
|
||||
String template_id = json.getString("template_id");
|
||||
String[] userIdArr = json.getString("userIds").split(",");
|
||||
Map<String,Object> templateVariableMap = JSONObject.parseObject(JSONObject.toJSONString(json.get("templateVariableMap")),Map.class);
|
||||
|
||||
JSONObject templateJson = new JSONObject();
|
||||
|
||||
JSONObject data = new JSONObject();
|
||||
data.put("template_id",template_id);
|
||||
data.put("template_variable",templateVariableMap);
|
||||
|
||||
templateJson.put("type","template");
|
||||
templateJson.put("data",data);
|
||||
|
||||
// 设置请求参数
|
||||
JSONObject paramsMap = new JSONObject();
|
||||
paramsMap.put("user_ids", userIdArr);
|
||||
paramsMap.put("msg_type", "interactive");
|
||||
paramsMap.put("card", templateJson);
|
||||
|
||||
// 发送请求给飞书
|
||||
String response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString());
|
||||
// 获取返回结果
|
||||
JSONObject tokenJson = JSONObject.parseObject(response);
|
||||
if(!tokenJson.get("code").toString().equals("0")) {
|
||||
log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson);
|
||||
}
|
||||
return Result.OK();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -248,7 +248,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
|
||||
headCustomVOOneList.add(headCustomVO);
|
||||
}
|
||||
if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
|
||||
res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
|
||||
res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag).stream().distinct().collect(Collectors.toList());
|
||||
} else {
|
||||
res = headCustomVOOneList;
|
||||
}
|
||||
|
||||
+4
-4
@@ -37,12 +37,12 @@ public enum EvaluationTypeEnum {
|
||||
|
||||
public static String getTextByValue(String value,String cut) {
|
||||
EvaluationTypeEnum[] values = values();
|
||||
for (EvaluationTypeEnum certificationProgressEnum : values) {
|
||||
if (certificationProgressEnum.value.equals(value)) {
|
||||
for (EvaluationTypeEnum evaluationTypeEnum : values) {
|
||||
if (evaluationTypeEnum.value.equals(value)) {
|
||||
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
return certificationProgressEnum.name;
|
||||
return evaluationTypeEnum.name;
|
||||
}else {
|
||||
return certificationProgressEnum.value;
|
||||
return evaluationTypeEnum.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+219
@@ -0,0 +1,219 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxAqcs;
|
||||
import com.jero.modules.ota.entity.OtaBaCxZxsjyq;
|
||||
import com.jero.modules.ota.service.IOtaBaCxAqcsService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-安全措施")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxAqcs")
|
||||
@Slf4j
|
||||
public class OtaBaCxAqcsController extends JeroController<OtaBaCxAqcs, IOtaBaCxAqcsService> {
|
||||
@Autowired
|
||||
private IOtaBaCxAqcsService otaBaCxAqcsService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxAqcs
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-安全措施-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-安全措施-分页列表查询", notes = "车型备案-安全措施-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxAqcs otaBaCxAqcs,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxAqcs> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxAqcs, req.getParameterMap());
|
||||
Page<OtaBaCxAqcs> page = new Page<OtaBaCxAqcs>(pageNo, pageSize);
|
||||
IPage<OtaBaCxAqcs> pageList = otaBaCxAqcsService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-安全措施-列表查询")
|
||||
@ApiOperation(value = "车型备案-安全措施-列表查询", notes = "车型备案-安全措施-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxAqcs>> queryList() {
|
||||
List<OtaBaCxAqcs> list = otaBaCxAqcsService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxAqcs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-安全措施-添加")
|
||||
@ApiOperation(value = "车型备案-安全措施-添加", notes = "车型备案-安全措施-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxAqcs otaBaCxAqcs) {
|
||||
otaBaCxAqcsService.add(otaBaCxAqcs);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxAqcs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-安全措施-编辑")
|
||||
@ApiOperation(value = "车型备案-安全措施-编辑", notes = "车型备案-安全措施-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxAqcs otaBaCxAqcs) {
|
||||
otaBaCxAqcsService.editById(otaBaCxAqcs);
|
||||
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) {
|
||||
otaBaCxAqcsService.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.otaBaCxAqcsService.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) {
|
||||
OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryById(id);
|
||||
if (otaBaCxAqcs == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxAqcs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-安全措施-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-安全措施-通过otaId查询", notes = "车型备案-安全措施-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryByOtaId(otaId, otaIdT);
|
||||
if (otaBaCxAqcs == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxAqcs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxAqcs
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxAqcs otaBaCxAqcs) {
|
||||
return super.exportXls(request, otaBaCxAqcs, OtaBaCxAqcs.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, OtaBaCxAqcs.class);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "车型备案-安全措施-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxAqcsService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-安全措施-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
OtaBaCxAqcs res;
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
res = this.otaBaCxAqcsService.importData(file, params[0], cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+212
@@ -0,0 +1,212 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxJbxx;
|
||||
import com.jero.modules.ota.service.IOtaBaCxJbxxService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.modules.system.util.StringUtils;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-车型基本信息")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxJbxx")
|
||||
@Slf4j
|
||||
public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJbxxService> {
|
||||
@Autowired
|
||||
private IOtaBaCxJbxxService otaBaCxJbxxService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxJbxx
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车型基本信息-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-车型基本信息-分页列表查询", notes = "车型备案-车型基本信息-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxJbxx otaBaCxJbxx,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxJbxx> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxJbxx, req.getParameterMap());
|
||||
Page<OtaBaCxJbxx> page = new Page<OtaBaCxJbxx>(pageNo, pageSize);
|
||||
IPage<OtaBaCxJbxx> pageList = otaBaCxJbxxService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车型基本信息-列表查询")
|
||||
@ApiOperation(value = "车型备案-车型基本信息-列表查询", notes = "车型备案-车型基本信息-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxJbxx>> queryList() {
|
||||
List<OtaBaCxJbxx> list = otaBaCxJbxxService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxJbxx
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车型基本信息-添加")
|
||||
@ApiOperation(value = "车型备案-车型基本信息-添加", notes = "车型备案-车型基本信息-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) {
|
||||
OtaBaCxJbxx res = otaBaCxJbxxService.add(otaBaCxJbxx);
|
||||
return Result.OK(res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxJbxx
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车型基本信息-编辑")
|
||||
@ApiOperation(value = "车型备案-车型基本信息-编辑", notes = "车型备案-车型基本信息-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) {
|
||||
otaBaCxJbxxService.editById(otaBaCxJbxx);
|
||||
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) {
|
||||
otaBaCxJbxxService.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.otaBaCxJbxxService.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) {
|
||||
OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryById(id);
|
||||
if (otaBaCxJbxx == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxJbxx);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过OtaId查询
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车型基本信息-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-车型基本信息-通过otaId查询", notes = "车型备案-车型基本信息-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
|
||||
@RequestParam(name = "otaIdT") String otaIdT) {
|
||||
OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT);
|
||||
return Result.OK(otaBaCxJbxx);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxJbxx
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxJbxx otaBaCxJbxx) {
|
||||
return super.exportXls(request, otaBaCxJbxx, OtaBaCxJbxx.class, "车型备案-车型基本信息");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
return super.importExcel(request, response, OtaBaCxJbxx.class);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-车型基本信息-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxJbxxService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-车型基本信息-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
OtaBaCxJbxx res;
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
res = this.otaBaCxJbxxService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+215
@@ -0,0 +1,215 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.ota.entity.OtaBaCxJsfzbacs;
|
||||
import com.jero.modules.ota.service.IOtaBaCxJsfzbacsService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-驾驶辅助系统基础备案参数")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxJsfzbacs")
|
||||
@Slf4j
|
||||
public class OtaBaCxJsfzbacsController extends JeroController<OtaBaCxJsfzbacs, IOtaBaCxJsfzbacsService> {
|
||||
@Autowired
|
||||
private IOtaBaCxJsfzbacsService otaBaCxJsfzbacsService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxJsfzbacs
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-分页列表查询", notes = "车型备案-驾驶辅助系统基础备案参数-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxJsfzbacs otaBaCxJsfzbacs,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxJsfzbacs> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxJsfzbacs, req.getParameterMap());
|
||||
Page<OtaBaCxJsfzbacs> page = new Page<OtaBaCxJsfzbacs>(pageNo, pageSize);
|
||||
IPage<OtaBaCxJsfzbacs> pageList = otaBaCxJsfzbacsService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-列表查询")
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-列表查询", notes = "车型备案-驾驶辅助系统基础备案参数-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxJsfzbacs>> queryList() {
|
||||
List<OtaBaCxJsfzbacs> list = otaBaCxJsfzbacsService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
@AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-添加")
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-添加", notes = "车型备案-驾驶辅助系统基础备案参数-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody JSONObject json) {
|
||||
otaBaCxJsfzbacsService.add(json);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxJsfzbacs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-编辑")
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-编辑", notes = "车型备案-驾驶辅助系统基础备案参数-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxJsfzbacs otaBaCxJsfzbacs) {
|
||||
otaBaCxJsfzbacsService.editById(otaBaCxJsfzbacs);
|
||||
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) {
|
||||
otaBaCxJsfzbacsService.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.otaBaCxJsfzbacsService.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) {
|
||||
OtaBaCxJsfzbacs otaBaCxJsfzbacs = otaBaCxJsfzbacsService.queryById(id);
|
||||
if (otaBaCxJsfzbacs == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxJsfzbacs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-通过id查询")
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-通过id查询", notes = "车型备案-驾驶辅助系统基础备案参数-通过id查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
JSONObject res = otaBaCxJsfzbacsService.queryByOtaId(otaId, otaIdT);
|
||||
if (res == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxJsfzbacs
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxJsfzbacs otaBaCxJsfzbacs) {
|
||||
return super.exportXls(request, otaBaCxJsfzbacs, OtaBaCxJsfzbacs.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, OtaBaCxJsfzbacs.class);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxJsfzbacsService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
this.otaBaCxJsfzbacsService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+216
@@ -0,0 +1,216 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs;
|
||||
import com.jero.modules.ota.service.IOtaBaCxKsjjsmccsService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-可在线升级的驾驶辅助功能名称与参数")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxKsjjsmccs")
|
||||
@Slf4j
|
||||
public class OtaBaCxKsjjsmccsController extends JeroController<OtaBaCxKsjjsmccs, IOtaBaCxKsjjsmccsService> {
|
||||
@Autowired
|
||||
private IOtaBaCxKsjjsmccsService otaBaCxKsjjsmccsService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxKsjjsmccs
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxKsjjsmccs otaBaCxKsjjsmccs,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxKsjjsmccs> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxKsjjsmccs, req.getParameterMap());
|
||||
Page<OtaBaCxKsjjsmccs> page = new Page<OtaBaCxKsjjsmccs>(pageNo, pageSize);
|
||||
IPage<OtaBaCxKsjjsmccs> pageList = otaBaCxKsjjsmccsService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询")
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxKsjjsmccs>> queryList() {
|
||||
List<OtaBaCxKsjjsmccs> list = otaBaCxKsjjsmccsService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加")
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody JSONObject json) {
|
||||
otaBaCxKsjjsmccsService.add(json);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxKsjjsmccs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑")
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) {
|
||||
otaBaCxKsjjsmccsService.editById(otaBaCxKsjjsmccs);
|
||||
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) {
|
||||
otaBaCxKsjjsmccsService.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.otaBaCxKsjjsmccsService.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) {
|
||||
OtaBaCxKsjjsmccs otaBaCxKsjjsmccs = otaBaCxKsjjsmccsService.queryById(id);
|
||||
if (otaBaCxKsjjsmccs == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxKsjjsmccs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-通过otaId查询", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
JSONObject json = otaBaCxKsjjsmccsService.queryByOtaId(otaId, otaIdT);
|
||||
if (json == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(json);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxKsjjsmccs
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) {
|
||||
return super.exportXls(request, otaBaCxKsjjsmccs, OtaBaCxKsjjsmccs.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, OtaBaCxKsjjsmccs.class);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxKsjjsmccsService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
this.otaBaCxKsjjsmccsService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+218
@@ -0,0 +1,218 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs;
|
||||
import com.jero.modules.ota.entity.OtaBaCxZxsjyq;
|
||||
import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-可升级的系统名称参数")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxKsjxtmccs")
|
||||
@Slf4j
|
||||
public class OtaBaCxKsjxtmccsController extends JeroController<OtaBaCxKsjxtmccs, IOtaBaCxKsjxtmccsService> {
|
||||
@Autowired
|
||||
private IOtaBaCxKsjxtmccsService otaBaCxKsjxtmccsService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxKsjxtmccs
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可升级的系统名称参数-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-分页列表查询", notes = "车型备案-可升级的系统名称参数-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxKsjxtmccs> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxKsjxtmccs, req.getParameterMap());
|
||||
Page<OtaBaCxKsjxtmccs> page = new Page<OtaBaCxKsjxtmccs>(pageNo, pageSize);
|
||||
IPage<OtaBaCxKsjxtmccs> pageList = otaBaCxKsjxtmccsService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可升级的系统名称参数-列表查询")
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-列表查询", notes = "车型备案-可升级的系统名称参数-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxKsjxtmccs>> queryList() {
|
||||
List<OtaBaCxKsjxtmccs> list = otaBaCxKsjxtmccsService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可升级的系统名称参数-添加")
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-添加", notes = "车型备案-可升级的系统名称参数-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody JSONObject json) {
|
||||
otaBaCxKsjxtmccsService.add(json);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxKsjxtmccs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可升级的系统名称参数-编辑")
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-编辑", notes = "车型备案-可升级的系统名称参数-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) {
|
||||
otaBaCxKsjxtmccsService.editById(otaBaCxKsjxtmccs);
|
||||
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) {
|
||||
otaBaCxKsjxtmccsService.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.otaBaCxKsjxtmccsService.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) {
|
||||
OtaBaCxKsjxtmccs otaBaCxKsjxtmccs = otaBaCxKsjxtmccsService.queryById(id);
|
||||
if (otaBaCxKsjxtmccs == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxKsjxtmccs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-可升级的系统名称参数-通过iotaId查询")
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-通过otaId查询", notes = "车型备案-可升级的系统名称参数-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
JSONObject json = otaBaCxKsjxtmccsService.queryByOtaId(otaId, otaIdT);
|
||||
if (json == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(json);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxKsjxtmccs
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) {
|
||||
return super.exportXls(request, otaBaCxKsjxtmccs, OtaBaCxKsjxtmccs.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, OtaBaCxKsjxtmccs.class);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxKsjxtmccsService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-可升级的系统名称参数-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
this.otaBaCxKsjxtmccsService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+262
@@ -0,0 +1,262 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.extRepo.entity.ExtRepoData;
|
||||
import com.jero.modules.ota.entity.OtaBaCxList;
|
||||
import com.jero.modules.ota.service.IOtaBaCxListService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 车型及功能备案列表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型及功能备案列表")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxList")
|
||||
@Slf4j
|
||||
public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxListService> {
|
||||
@Autowired
|
||||
private IOtaBaCxListService otaBaCxListService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxList
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型及功能备案列表-分页列表查询")
|
||||
@ApiOperation(value = "车型及功能备案列表-分页列表查询", notes = "车型及功能备案列表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxList otaBaCxList,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Page<OtaBaCxList> page = new Page<OtaBaCxList>(pageNo, pageSize);
|
||||
LambdaQueryWrapper<OtaBaCxList> queryWrapper = new LambdaQueryWrapper<>();
|
||||
// 文件名称模糊查询
|
||||
String cpdjbh = req.getParameter("cpdjbh");
|
||||
if (StringUtils.isNotBlank(cpdjbh)) {
|
||||
cpdjbh = cpdjbh.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaCxList::getCpdjbh, cpdjbh);
|
||||
}
|
||||
|
||||
String ggpc = req.getParameter("ggpc");
|
||||
if (StringUtils.isNotBlank(ggpc)) {
|
||||
ggpc = ggpc.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaCxList::getGgpc, ggpc);
|
||||
}
|
||||
|
||||
String cpsb = req.getParameter("cpsb");
|
||||
if (StringUtils.isNotBlank(cpsb)) {
|
||||
cpsb = cpsb.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaCxList::getCpsb, cpsb);
|
||||
}
|
||||
|
||||
String cpmc = req.getParameter("cpmc");
|
||||
if (StringUtils.isNotBlank(cpmc)) {
|
||||
cpmc = cpmc.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaCxList::getCpmc, cpmc);
|
||||
}
|
||||
|
||||
String cpxh = req.getParameter("cpxh");
|
||||
if (StringUtils.isNotBlank(cpxh)) {
|
||||
cpxh = cpxh.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaCxList::getCpxh, cpxh);
|
||||
}
|
||||
queryWrapper.orderByDesc(OtaBaCxList::getCreateTime);
|
||||
IPage<OtaBaCxList> pageList = otaBaCxListService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型及功能备案列表-列表查询")
|
||||
@ApiOperation(value = "车型及功能备案列表-列表查询", notes = "车型及功能备案列表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxList>> queryList() {
|
||||
LambdaQueryWrapper<OtaBaCxList> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.orderByDesc(OtaBaCxList::getCreateTime);
|
||||
List<OtaBaCxList> list = otaBaCxListService.list(queryWrapper);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxList
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型及功能备案列表-添加")
|
||||
@ApiOperation(value = "车型及功能备案列表-添加", notes = "车型及功能备案列表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxList otaBaCxList) {
|
||||
otaBaCxListService.add(otaBaCxList);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxList
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型及功能备案列表-编辑")
|
||||
@ApiOperation(value = "车型及功能备案列表-编辑", notes = "车型及功能备案列表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxList otaBaCxList) {
|
||||
otaBaCxListService.editById(otaBaCxList);
|
||||
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) {
|
||||
otaBaCxListService.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.otaBaCxListService.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) {
|
||||
OtaBaCxList otaBaCxList = otaBaCxListService.queryById(id);
|
||||
if (otaBaCxList == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxList
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxList otaBaCxList) {
|
||||
return super.exportXls(request, otaBaCxList, OtaBaCxList.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, OtaBaCxList.class);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 备案维护
|
||||
*/
|
||||
@AutoLog(value = "车型及功能备案列表-备案维护")
|
||||
@ApiOperation(value = "车型及功能备案列表-备案维护", notes = "车型及功能备案列表-备案维护")
|
||||
@PostMapping(value = "/batchRecord")
|
||||
public Result<?> batchRecord(@RequestBody JSONObject json) {
|
||||
String ids = json.getString("ids");
|
||||
String bazt = json.getString("bazt");
|
||||
String batjsj = json.getString("batjsj");
|
||||
String bz = json.getString("bz");
|
||||
String cut = json.getString("cut");
|
||||
otaBaCxListService.batchRecord(ids, bazt, batjsj, bz, cut);
|
||||
return Result.OK("备案维护成功!");
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型及功能备案列表-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxListService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型及功能备案列表-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
errMsg.append("导入成功！ 提示信息:");
|
||||
try {
|
||||
this.otaBaCxListService.importData(file, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型及功能备案列表-数据导出")
|
||||
@GetMapping(value = "/exportData")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportData(@RequestParam(value = "otaId", required = false) String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
try {
|
||||
this.otaBaCxListService.exportData(otaId, response, request);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+195
@@ -0,0 +1,195 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxLsjl;
|
||||
import com.jero.modules.ota.service.IOtaBaCxLsjlService;
|
||||
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.apache.commons.lang3.ObjectUtils;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-历史记录")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxLsjl")
|
||||
@Slf4j
|
||||
public class OtaBaCxLsjlController extends JeroController<OtaBaCxLsjl, IOtaBaCxLsjlService> {
|
||||
@Autowired
|
||||
private IOtaBaCxLsjlService otaBaCxLsjlService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxLsjl
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-历史记录-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-历史记录-分页列表查询", notes = "车型备案-历史记录-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxLsjl otaBaCxLsjl,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Object obj = req.getParameterMap().get("otaId");
|
||||
if(ObjectUtils.isNotEmpty(obj)){
|
||||
QueryWrapper<OtaBaCxLsjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxLsjl, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<OtaBaCxLsjl> page = new Page<OtaBaCxLsjl>(pageNo, pageSize);
|
||||
IPage<OtaBaCxLsjl> pageList = otaBaCxLsjlService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}else{
|
||||
return Result.OK();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-历史记录-列表查询")
|
||||
@ApiOperation(value = "车型备案-历史记录-列表查询", notes = "车型备案-历史记录-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxLsjl>> queryList() {
|
||||
List<OtaBaCxLsjl> list = otaBaCxLsjlService.list();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxLsjl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-历史记录-添加")
|
||||
@ApiOperation(value = "车型备案-历史记录-添加", notes = "车型备案-历史记录-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxLsjl otaBaCxLsjl) {
|
||||
otaBaCxLsjlService.add(otaBaCxLsjl);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxLsjl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-历史记录-编辑")
|
||||
@ApiOperation(value = "车型备案-历史记录-编辑", notes = "车型备案-历史记录-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxLsjl otaBaCxLsjl) {
|
||||
otaBaCxLsjlService.editById(otaBaCxLsjl);
|
||||
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) {
|
||||
otaBaCxLsjlService.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.otaBaCxLsjlService.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) {
|
||||
OtaBaCxLsjl otaBaCxLsjl = otaBaCxLsjlService.queryById(id);
|
||||
if (otaBaCxLsjl == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxLsjl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-历史记录-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-历史记录-通过otaId查询", notes = "车型备案-历史记录-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId) {
|
||||
List<OtaBaCxLsjl> otaBaCxLsjlList = otaBaCxLsjlService.queryByOtaId(otaId);
|
||||
if (otaBaCxLsjlList == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxLsjlList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxLsjl
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxLsjl otaBaCxLsjl) {
|
||||
return super.exportXls(request, otaBaCxLsjl, OtaBaCxLsjl.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, OtaBaCxLsjl.class);
|
||||
}
|
||||
|
||||
}
|
||||
+186
@@ -0,0 +1,186 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxQt;
|
||||
import com.jero.modules.ota.service.IOtaBaCxQtService;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-其他升级信息")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxQt")
|
||||
@Slf4j
|
||||
public class OtaBaCxQtController extends JeroController<OtaBaCxQt, IOtaBaCxQtService> {
|
||||
@Autowired
|
||||
private IOtaBaCxQtService otaBaCxQtService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxQt
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-其他升级信息-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-其他升级信息-分页列表查询", notes = "车型备案-其他升级信息-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxQt otaBaCxQt,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxQt> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxQt, req.getParameterMap());
|
||||
Page<OtaBaCxQt> page = new Page<OtaBaCxQt>(pageNo, pageSize);
|
||||
IPage<OtaBaCxQt> pageList = otaBaCxQtService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-其他升级信息-列表查询")
|
||||
@ApiOperation(value = "车型备案-其他升级信息-列表查询", notes = "车型备案-其他升级信息-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxQt>> queryList() {
|
||||
List<OtaBaCxQt> list = otaBaCxQtService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxQt
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-其他升级信息-添加")
|
||||
@ApiOperation(value = "车型备案-其他升级信息-添加", notes = "车型备案-其他升级信息-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxQt otaBaCxQt) {
|
||||
otaBaCxQtService.add(otaBaCxQt);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxQt
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-其他升级信息-编辑")
|
||||
@ApiOperation(value = "车型备案-其他升级信息-编辑", notes = "车型备案-其他升级信息-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxQt otaBaCxQt) {
|
||||
otaBaCxQtService.editById(otaBaCxQt);
|
||||
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) {
|
||||
otaBaCxQtService.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.otaBaCxQtService.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) {
|
||||
OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryById(id);
|
||||
if (otaBaCxQt == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxQt);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*/
|
||||
@AutoLog(value = "车型备案-其他升级信息-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-其他升级信息-通过otaId查询", notes = "车型备案-其他升级信息-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryByOtaId(otaId, otaIdT);
|
||||
if (otaBaCxQt == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxQt);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxQt
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxQt otaBaCxQt) {
|
||||
return super.exportXls(request, otaBaCxQt, OtaBaCxQt.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, OtaBaCxQt.class);
|
||||
}
|
||||
|
||||
}
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxSjmk;
|
||||
import com.jero.modules.ota.service.IOtaBaCxSjmkService;
|
||||
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: 车型备案-车端OTA升级功能模块
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="车型备案-车端OTA升级功能模块")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxSjmk")
|
||||
@Slf4j
|
||||
public class OtaBaCxSjmkController extends JeroController<OtaBaCxSjmk, IOtaBaCxSjmkService> {
|
||||
@Autowired
|
||||
private IOtaBaCxSjmkService otaBaCxSjmkService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxSjmk
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-分页列表查询")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-分页列表查询", notes="车型备案-车端OTA升级功能模块-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxSjmk otaBaCxSjmk,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxSjmk> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxSjmk, req.getParameterMap());
|
||||
Page<OtaBaCxSjmk> page = new Page<OtaBaCxSjmk>(pageNo, pageSize);
|
||||
IPage<OtaBaCxSjmk> pageList = otaBaCxSjmkService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-列表查询")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-列表查询", notes="车型备案-车端OTA升级功能模块-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxSjmk>> queryList() {
|
||||
List<OtaBaCxSjmk> list = otaBaCxSjmkService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxSjmk
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-添加")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-添加", notes="车型备案-车端OTA升级功能模块-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxSjmk otaBaCxSjmk) {
|
||||
otaBaCxSjmkService.add(otaBaCxSjmk);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxSjmk
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-编辑")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-编辑", notes="车型备案-车端OTA升级功能模块-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxSjmk otaBaCxSjmk) {
|
||||
otaBaCxSjmkService.editById(otaBaCxSjmk);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-通过id删除")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-通过id删除", notes="车型备案-车端OTA升级功能模块-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
otaBaCxSjmkService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-批量删除")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-批量删除", notes="车型备案-车端OTA升级功能模块-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.otaBaCxSjmkService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-车端OTA升级功能模块-通过id查询")
|
||||
@ApiOperation(value="车型备案-车端OTA升级功能模块-通过id查询", notes="车型备案-车端OTA升级功能模块-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
OtaBaCxSjmk otaBaCxSjmk = otaBaCxSjmkService.queryById(id);
|
||||
if(otaBaCxSjmk==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxSjmk);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxSjmk
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxSjmk otaBaCxSjmk) {
|
||||
return super.exportXls(request, otaBaCxSjmk, OtaBaCxSjmk.class, "车型备案-车端OTA升级功能模块");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, OtaBaCxSjmk.class);
|
||||
}
|
||||
|
||||
}
|
||||
+195
@@ -0,0 +1,195 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxTxjl;
|
||||
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
|
||||
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.apache.commons.lang3.StringUtils;
|
||||
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: 2023-03-25
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-填写记录表")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxTxjl")
|
||||
@Slf4j
|
||||
public class OtaBaCxTxjlController extends JeroController<OtaBaCxTxjl, IOtaBaCxTxjlService> {
|
||||
@Autowired
|
||||
private IOtaBaCxTxjlService otaBaCxTxjlService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxTxjl
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-填写记录表-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-填写记录表-分页列表查询", notes = "车型备案-填写记录表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxTxjl otaBaCxTxjl,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
|
||||
Page<OtaBaCxTxjl> page = new Page<OtaBaCxTxjl>(pageNo, pageSize);
|
||||
String otaId = req.getParameter("otaId");
|
||||
if (StringUtils.isEmpty(otaId)) {
|
||||
return Result.OK(page);
|
||||
}
|
||||
QueryWrapper<OtaBaCxTxjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
IPage<OtaBaCxTxjl> pageList = otaBaCxTxjlService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-填写记录表-列表查询")
|
||||
@ApiOperation(value = "车型备案-填写记录表-列表查询", notes = "车型备案-填写记录表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxTxjl>> queryList() {
|
||||
List<OtaBaCxTxjl> list = otaBaCxTxjlService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxTxjl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-填写记录表-添加")
|
||||
@ApiOperation(value = "车型备案-填写记录表-添加", notes = "车型备案-填写记录表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) {
|
||||
otaBaCxTxjlService.add(otaBaCxTxjl);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxTxjl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-填写记录表-编辑")
|
||||
@ApiOperation(value = "车型备案-填写记录表-编辑", notes = "车型备案-填写记录表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) {
|
||||
otaBaCxTxjlService.editById(otaBaCxTxjl);
|
||||
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) {
|
||||
otaBaCxTxjlService.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.otaBaCxTxjlService.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) {
|
||||
OtaBaCxTxjl otaBaCxTxjl = otaBaCxTxjlService.queryById(id);
|
||||
if (otaBaCxTxjl == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxTxjl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-填写记录表-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-填写记录表-通过otaId查询", notes = "车型备案-填写记录表-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId) {
|
||||
List<OtaBaCxTxjl> otaBaCxTxjlList = otaBaCxTxjlService.queryByOtaId(otaId);
|
||||
if (otaBaCxTxjlList == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxTxjlList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxTxjl
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxTxjl otaBaCxTxjl) {
|
||||
return super.exportXls(request, otaBaCxTxjl, OtaBaCxTxjl.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, OtaBaCxTxjl.class);
|
||||
}
|
||||
|
||||
}
|
||||
+214
@@ -0,0 +1,214 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.ota.entity.OtaBaCxZxsjyq;
|
||||
import com.jero.modules.ota.service.IOtaBaCxZxsjyqService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 车型备案-在线升级要求
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-在线升级要求")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaCxZxsjyq")
|
||||
@Slf4j
|
||||
public class OtaBaCxZxsjyqController extends JeroController<OtaBaCxZxsjyq, IOtaBaCxZxsjyqService> {
|
||||
@Autowired
|
||||
private IOtaBaCxZxsjyqService otaBaCxZxsjyqService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaCxZxsjyq
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-在线升级要求-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-在线升级要求-分页列表查询", notes = "车型备案-在线升级要求-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaCxZxsjyq otaBaCxZxsjyq,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaCxZxsjyq> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxZxsjyq, req.getParameterMap());
|
||||
Page<OtaBaCxZxsjyq> page = new Page<OtaBaCxZxsjyq>(pageNo, pageSize);
|
||||
IPage<OtaBaCxZxsjyq> pageList = otaBaCxZxsjyqService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-在线升级要求-列表查询")
|
||||
@ApiOperation(value = "车型备案-在线升级要求-列表查询", notes = "车型备案-在线升级要求-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaCxZxsjyq>> queryList() {
|
||||
List<OtaBaCxZxsjyq> list = otaBaCxZxsjyqService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaCxZxsjyq
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-在线升级要求-添加")
|
||||
@ApiOperation(value = "车型备案-在线升级要求-添加", notes = "车型备案-在线升级要求-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaCxZxsjyq otaBaCxZxsjyq) {
|
||||
otaBaCxZxsjyqService.add(otaBaCxZxsjyq);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaCxZxsjyq
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-在线升级要求-编辑")
|
||||
@ApiOperation(value = "车型备案-在线升级要求-编辑", notes = "车型备案-在线升级要求-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaCxZxsjyq otaBaCxZxsjyq) {
|
||||
otaBaCxZxsjyqService.editById(otaBaCxZxsjyq);
|
||||
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) {
|
||||
otaBaCxZxsjyqService.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.otaBaCxZxsjyqService.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) {
|
||||
OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryById(id);
|
||||
if (otaBaCxZxsjyq == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxZxsjyq);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过OtaId查询
|
||||
*/
|
||||
@AutoLog(value = "车型备案-在线升级要求-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-在线升级要求-通过otaId查询", notes = "车型备案-在线升级要求-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryByOtaId(otaId, otaIdT);
|
||||
if (otaBaCxZxsjyq == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaCxZxsjyq);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaCxZxsjyq
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaCxZxsjyq otaBaCxZxsjyq) {
|
||||
return super.exportXls(request, otaBaCxZxsjyq, OtaBaCxZxsjyq.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, OtaBaCxZxsjyq.class);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-在线升级要求-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaCxZxsjyqService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "车型备案-在线升级要求-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
OtaBaCxZxsjyq res;
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
res = this.otaBaCxZxsjyqService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+218
@@ -0,0 +1,218 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaSjGgnrfs;
|
||||
import com.jero.modules.ota.entity.OtaBaSjSjyxpg;
|
||||
import com.jero.modules.ota.service.IOtaBaSjGgnrfsService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="升级备案-用户告知内容及方式")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjGgnrfs")
|
||||
@Slf4j
|
||||
public class OtaBaSjGgnrfsController extends JeroController<OtaBaSjGgnrfs, IOtaBaSjGgnrfsService> {
|
||||
@Autowired
|
||||
private IOtaBaSjGgnrfsService otaBaSjGgnrfsService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjGgnrfs
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-用户告知内容及方式-分页列表查询")
|
||||
@ApiOperation(value="升级备案-用户告知内容及方式-分页列表查询", notes="升级备案-用户告知内容及方式-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjGgnrfs otaBaSjGgnrfs,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjGgnrfs> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGgnrfs, req.getParameterMap());
|
||||
Page<OtaBaSjGgnrfs> page = new Page<OtaBaSjGgnrfs>(pageNo, pageSize);
|
||||
IPage<OtaBaSjGgnrfs> pageList = otaBaSjGgnrfsService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-用户告知内容及方式-列表查询")
|
||||
@ApiOperation(value="升级备案-用户告知内容及方式-列表查询", notes="升级备案-用户告知内容及方式-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjGgnrfs>> queryList() {
|
||||
List<OtaBaSjGgnrfs> list = otaBaSjGgnrfsService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjGgnrfs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-用户告知内容及方式-添加")
|
||||
@ApiOperation(value="升级备案-用户告知内容及方式-添加", notes="升级备案-用户告知内容及方式-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjGgnrfs otaBaSjGgnrfs) {
|
||||
otaBaSjGgnrfsService.add(otaBaSjGgnrfs);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjGgnrfs
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-用户告知内容及方式-编辑")
|
||||
@ApiOperation(value="升级备案-用户告知内容及方式-编辑", notes="升级备案-用户告知内容及方式-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjGgnrfs otaBaSjGgnrfs) {
|
||||
otaBaSjGgnrfsService.editById(otaBaSjGgnrfs);
|
||||
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) {
|
||||
otaBaSjGgnrfsService.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.otaBaSjGgnrfsService.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) {
|
||||
OtaBaSjGgnrfs otaBaSjGgnrfs = otaBaSjGgnrfsService.queryById(id);
|
||||
if(otaBaSjGgnrfs==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjGgnrfs);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-用户告知内容及方式-通过otaId查询")
|
||||
@ApiOperation(value = "升级备案-用户告知内容及方式-通过otaId查询", notes = "升级备案-用户告知内容及方式-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
OtaBaSjGgnrfs otaBaSjGgnrfs = otaBaSjGgnrfsService.queryByOtaId(otaId, otaIdT);
|
||||
if (otaBaSjGgnrfs == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjGgnrfs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjGgnrfs
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjGgnrfs otaBaSjGgnrfs) {
|
||||
return super.exportXls(request, otaBaSjGgnrfs, OtaBaSjGgnrfs.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, OtaBaSjGgnrfs.class);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "升级备案-用户告知内容及方式-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaSjGgnrfsService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "升级备案-用户告知内容及方式-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
this.otaBaSjGgnrfsService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+180
@@ -0,0 +1,180 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaSjGnxtwh;
|
||||
import com.jero.modules.ota.service.IOtaBaSjGnxtwhService;
|
||||
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: 2023-03-28
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "车型备案-功能系统维护")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjGnxtwh")
|
||||
@Slf4j
|
||||
public class OtaBaSjGnxtwhController extends JeroController<OtaBaSjGnxtwh, IOtaBaSjGnxtwhService> {
|
||||
@Autowired
|
||||
private IOtaBaSjGnxtwhService otaBaSjGnxtwhService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjGnxtwh
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-功能系统维护-分页列表查询")
|
||||
@ApiOperation(value = "车型备案-功能系统维护-分页列表查询", notes = "车型备案-功能系统维护-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjGnxtwh> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap());
|
||||
Page<OtaBaSjGnxtwh> page = new Page<OtaBaSjGnxtwh>(pageNo, pageSize);
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
IPage<OtaBaSjGnxtwh> pageList = otaBaSjGnxtwhService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-功能系统维护-列表查询")
|
||||
@ApiOperation(value = "车型备案-功能系统维护-列表查询", notes = "车型备案-功能系统维护-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjGnxtwh>> queryList() {
|
||||
List<OtaBaSjGnxtwh> list = otaBaSjGnxtwhService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjGnxtwh
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-功能系统维护-添加")
|
||||
@ApiOperation(value = "车型备案-功能系统维护-添加", notes = "车型备案-功能系统维护-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) {
|
||||
try {
|
||||
otaBaSjGnxtwhService.add(otaBaSjGnxtwh);
|
||||
} catch (Exception e) {
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjGnxtwh
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "车型备案-功能系统维护-编辑")
|
||||
@ApiOperation(value = "车型备案-功能系统维护-编辑", notes = "车型备案-功能系统维护-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) {
|
||||
try {
|
||||
otaBaSjGnxtwhService.editById(otaBaSjGnxtwh);
|
||||
} catch (Exception e) {
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
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) {
|
||||
otaBaSjGnxtwhService.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.otaBaSjGnxtwhService.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) {
|
||||
OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id);
|
||||
if (otaBaSjGnxtwh == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjGnxtwh);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjGnxtwh
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjGnxtwh otaBaSjGnxtwh) {
|
||||
return super.exportXls(request, otaBaSjGnxtwh, OtaBaSjGnxtwh.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, OtaBaSjGnxtwh.class);
|
||||
}
|
||||
|
||||
}
|
||||
+185
@@ -0,0 +1,185 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxAqcs;
|
||||
import com.jero.modules.ota.entity.OtaBaSjJssj;
|
||||
import com.jero.modules.ota.service.IOtaBaSjJssjService;
|
||||
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: 2023-03-28
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="升级备案-结束升级")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjJssj")
|
||||
@Slf4j
|
||||
public class OtaBaSjJssjController extends JeroController<OtaBaSjJssj, IOtaBaSjJssjService> {
|
||||
@Autowired
|
||||
private IOtaBaSjJssjService otaBaSjJssjService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjJssj
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级-分页列表查询")
|
||||
@ApiOperation(value="升级备案-结束升级-分页列表查询", notes="升级备案-结束升级-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjJssj otaBaSjJssj,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjJssj> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjJssj, req.getParameterMap());
|
||||
Page<OtaBaSjJssj> page = new Page<OtaBaSjJssj>(pageNo, pageSize);
|
||||
IPage<OtaBaSjJssj> pageList = otaBaSjJssjService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级-列表查询")
|
||||
@ApiOperation(value="升级备案-结束升级-列表查询", notes="升级备案-结束升级-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjJssj>> queryList() {
|
||||
List<OtaBaSjJssj> list = otaBaSjJssjService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjJssj
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级-添加")
|
||||
@ApiOperation(value="升级备案-结束升级-添加", notes="升级备案-结束升级-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjJssj otaBaSjJssj) {
|
||||
otaBaSjJssjService.add(otaBaSjJssj);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjJssj
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级-编辑")
|
||||
@ApiOperation(value="升级备案-结束升级-编辑", notes="升级备案-结束升级-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjJssj otaBaSjJssj) {
|
||||
otaBaSjJssjService.editById(otaBaSjJssj);
|
||||
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) {
|
||||
otaBaSjJssjService.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.otaBaSjJssjService.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) {
|
||||
OtaBaSjJssj otaBaSjJssj = otaBaSjJssjService.queryById(id);
|
||||
if(otaBaSjJssj==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjJssj);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级-通过otaId查询")
|
||||
@ApiOperation(value = "升级备案-结束升级-通过otaId查询", notes = "升级备案-结束升级-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId) {
|
||||
OtaBaSjJssj otaBaSjJssj = otaBaSjJssjService.queryByOtaId(otaId);
|
||||
return Result.OK(otaBaSjJssj);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjJssj
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjJssj otaBaSjJssj) {
|
||||
return super.exportXls(request, otaBaSjJssj, OtaBaSjJssj.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, OtaBaSjJssj.class);
|
||||
}
|
||||
|
||||
}
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaSjJssjyy;
|
||||
import com.jero.modules.ota.service.IOtaBaSjJssjyyService;
|
||||
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: 2023-03-28
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="升级备案-结束升级原因")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjJssjyy")
|
||||
@Slf4j
|
||||
public class OtaBaSjJssjyyController extends JeroController<OtaBaSjJssjyy, IOtaBaSjJssjyyService> {
|
||||
@Autowired
|
||||
private IOtaBaSjJssjyyService otaBaSjJssjyyService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjJssjyy
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级原因-分页列表查询")
|
||||
@ApiOperation(value="升级备案-结束升级原因-分页列表查询", notes="升级备案-结束升级原因-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjJssjyy otaBaSjJssjyy,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjJssjyy> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjJssjyy, req.getParameterMap());
|
||||
Page<OtaBaSjJssjyy> page = new Page<OtaBaSjJssjyy>(pageNo, pageSize);
|
||||
IPage<OtaBaSjJssjyy> pageList = otaBaSjJssjyyService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级原因-列表查询")
|
||||
@ApiOperation(value="升级备案-结束升级原因-列表查询", notes="升级备案-结束升级原因-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjJssjyy>> queryList() {
|
||||
List<OtaBaSjJssjyy> list = otaBaSjJssjyyService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjJssjyy
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级原因-添加")
|
||||
@ApiOperation(value="升级备案-结束升级原因-添加", notes="升级备案-结束升级原因-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjJssjyy otaBaSjJssjyy) {
|
||||
otaBaSjJssjyyService.add(otaBaSjJssjyy);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjJssjyy
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-结束升级原因-编辑")
|
||||
@ApiOperation(value="升级备案-结束升级原因-编辑", notes="升级备案-结束升级原因-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjJssjyy otaBaSjJssjyy) {
|
||||
otaBaSjJssjyyService.editById(otaBaSjJssjyy);
|
||||
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) {
|
||||
otaBaSjJssjyyService.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.otaBaSjJssjyyService.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) {
|
||||
OtaBaSjJssjyy otaBaSjJssjyy = otaBaSjJssjyyService.queryById(id);
|
||||
if(otaBaSjJssjyy==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjJssjyy);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjJssjyy
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjJssjyy otaBaSjJssjyy) {
|
||||
return super.exportXls(request, otaBaSjJssjyy, OtaBaSjJssjyy.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, OtaBaSjJssjyy.class);
|
||||
}
|
||||
|
||||
}
|
||||
+257
@@ -0,0 +1,257 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.ota.entity.OtaBaCxList;
|
||||
import com.jero.modules.ota.entity.OtaBaSjList;
|
||||
import com.jero.modules.ota.service.IOtaBaSjListService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 升级备案-升级活动备案列表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "升级备案-升级活动备案列表")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjList")
|
||||
@Slf4j
|
||||
public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjListService> {
|
||||
@Autowired
|
||||
private IOtaBaSjListService otaBaSjListService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjList
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级活动备案列表-分页列表查询")
|
||||
@ApiOperation(value = "升级备案-升级活动备案列表-分页列表查询", notes = "升级备案-升级活动备案列表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjList otaBaSjList,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Page<OtaBaSjList> page = new Page<OtaBaSjList>(pageNo, pageSize);
|
||||
LambdaQueryWrapper<OtaBaSjList> queryWrapper = new LambdaQueryWrapper<>();
|
||||
String cpdjbh = req.getParameter("cpdjbh");
|
||||
if (StringUtils.isNotBlank(cpdjbh)) {
|
||||
cpdjbh = cpdjbh.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaSjList::getCpdjbh, cpdjbh);
|
||||
}
|
||||
String ggpc = req.getParameter("ggpc");
|
||||
if (StringUtils.isNotBlank(ggpc)) {
|
||||
ggpc = ggpc.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaSjList::getGgpc, ggpc);
|
||||
}
|
||||
|
||||
String cpsb = req.getParameter("cpsb");
|
||||
if (StringUtils.isNotBlank(cpsb)) {
|
||||
cpsb = cpsb.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaSjList::getCpsb, cpsb);
|
||||
}
|
||||
|
||||
String cpmc = req.getParameter("cpmc");
|
||||
if (StringUtils.isNotBlank(cpmc)) {
|
||||
cpmc = cpmc.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaSjList::getCpmc, cpmc);
|
||||
}
|
||||
|
||||
String cpxh = req.getParameter("cpxh");
|
||||
if (StringUtils.isNotBlank(cpxh)) {
|
||||
cpxh = cpxh.replace("%", "\\%");
|
||||
queryWrapper.like(OtaBaSjList::getCpxh, cpxh);
|
||||
}
|
||||
queryWrapper.orderByDesc(OtaBaSjList::getCreateTime);
|
||||
IPage<OtaBaSjList> pageList = otaBaSjListService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级活动备案列表-列表查询")
|
||||
@ApiOperation(value = "升级备案-升级活动备案列表-列表查询", notes = "升级备案-升级活动备案列表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjList>> queryList() {
|
||||
LambdaQueryWrapper<OtaBaSjList> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.orderByDesc(OtaBaSjList::getCreateTime);
|
||||
List<OtaBaSjList> list = otaBaSjListService.list(queryWrapper);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjList
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级活动备案列表-添加")
|
||||
@ApiOperation(value = "升级备案-升级活动备案列表-添加", notes = "升级备案-升级活动备案列表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjList otaBaSjList) {
|
||||
otaBaSjListService.add(otaBaSjList);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjList
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级活动备案列表-编辑")
|
||||
@ApiOperation(value = "升级备案-升级活动备案列表-编辑", notes = "升级备案-升级活动备案列表-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjList otaBaSjList) {
|
||||
otaBaSjListService.editById(otaBaSjList);
|
||||
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) {
|
||||
otaBaSjListService.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.otaBaSjListService.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) {
|
||||
OtaBaSjList otaBaSjList = otaBaSjListService.queryById(id);
|
||||
if (otaBaSjList == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjList
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjList otaBaSjList) {
|
||||
return super.exportXls(request, otaBaSjList, OtaBaSjList.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, OtaBaSjList.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 备案维护
|
||||
*/
|
||||
@AutoLog(value = "升级备案-备案维护")
|
||||
@ApiOperation(value = "升级备案-备案维护", notes = "升级备案-备案维护")
|
||||
@PostMapping(value = "/batchRecord")
|
||||
public Result<?> batchRecord(@RequestBody JSONObject json) {
|
||||
String ids = json.getString("ids");
|
||||
String bazt = json.getString("bazt");
|
||||
String batjsj = json.getString("batjsj");
|
||||
String bz = json.getString("bz");
|
||||
String cut = json.getString("cut");
|
||||
otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut);
|
||||
return Result.OK("备案维护成功!");
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "升级备案-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaSjListService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "升级备案-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
this.otaBaSjListService.importData(file, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
@ApiOperation(value = "升级备案-数据导出")
|
||||
@GetMapping(value = "/exportData")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportData(@RequestParam(value = "otaId", required = false) String otaId, HttpServletResponse response, HttpServletRequest request) {
|
||||
try {
|
||||
this.otaBaSjListService.exportData(otaId, response, request);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+178
@@ -0,0 +1,178 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaSjLsjl;
|
||||
import com.jero.modules.ota.service.IOtaBaSjLsjlService;
|
||||
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.apache.commons.lang3.ObjectUtils;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "升级备案-历史记录")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjLsjl")
|
||||
@Slf4j
|
||||
public class OtaBaSjLsjlController extends JeroController<OtaBaSjLsjl, IOtaBaSjLsjlService> {
|
||||
@Autowired
|
||||
private IOtaBaSjLsjlService otaBaSjLsjlService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjLsjl
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-历史记录-分页列表查询")
|
||||
@ApiOperation(value = "升级备案-历史记录-分页列表查询", notes = "升级备案-历史记录-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjLsjl otaBaSjLsjl,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Object obj = req.getParameterMap().get("otaId");
|
||||
if (ObjectUtils.isNotEmpty(obj)) {
|
||||
QueryWrapper<OtaBaSjLsjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjLsjl, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<OtaBaSjLsjl> page = new Page<OtaBaSjLsjl>(pageNo, pageSize);
|
||||
IPage<OtaBaSjLsjl> pageList = otaBaSjLsjlService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
} else {
|
||||
return Result.OK();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-历史记录-列表查询")
|
||||
@ApiOperation(value = "升级备案-历史记录-列表查询", notes = "升级备案-历史记录-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjLsjl>> queryList(@RequestBody OtaBaSjLsjl OtaBaSjLsjl) {
|
||||
List<OtaBaSjLsjl> list = otaBaSjLsjlService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjLsjl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-历史记录-添加")
|
||||
@ApiOperation(value = "升级备案-历史记录-添加", notes = "升级备案-历史记录-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjLsjl otaBaSjLsjl) {
|
||||
otaBaSjLsjlService.add(otaBaSjLsjl);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjLsjl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-历史记录-编辑")
|
||||
@ApiOperation(value = "升级备案-历史记录-编辑", notes = "升级备案-历史记录-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjLsjl otaBaSjLsjl) {
|
||||
otaBaSjLsjlService.editById(otaBaSjLsjl);
|
||||
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) {
|
||||
otaBaSjLsjlService.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.otaBaSjLsjlService.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) {
|
||||
OtaBaSjLsjl otaBaSjLsjl = otaBaSjLsjlService.queryById(id);
|
||||
if (otaBaSjLsjl == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjLsjl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjLsjl
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjLsjl otaBaSjLsjl) {
|
||||
return super.exportXls(request, otaBaSjLsjl, OtaBaSjLsjl.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, OtaBaSjLsjl.class);
|
||||
}
|
||||
|
||||
}
|
||||
+186
@@ -0,0 +1,186 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxQt;
|
||||
import com.jero.modules.ota.entity.OtaBaSjQtsjxx;
|
||||
import com.jero.modules.ota.service.IOtaBaSjQtsjxxService;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="升级备案-其他升级信息")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjQtsjxx")
|
||||
@Slf4j
|
||||
public class OtaBaSjQtsjxxController extends JeroController<OtaBaSjQtsjxx, IOtaBaSjQtsjxxService> {
|
||||
@Autowired
|
||||
private IOtaBaSjQtsjxxService otaBaSjQtsjxxService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjQtsjxx
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-其他升级信息-分页列表查询")
|
||||
@ApiOperation(value="升级备案-其他升级信息-分页列表查询", notes="升级备案-其他升级信息-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjQtsjxx otaBaSjQtsjxx,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjQtsjxx> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjQtsjxx, req.getParameterMap());
|
||||
Page<OtaBaSjQtsjxx> page = new Page<OtaBaSjQtsjxx>(pageNo, pageSize);
|
||||
IPage<OtaBaSjQtsjxx> pageList = otaBaSjQtsjxxService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-其他升级信息-列表查询")
|
||||
@ApiOperation(value="升级备案-其他升级信息-列表查询", notes="升级备案-其他升级信息-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjQtsjxx>> queryList() {
|
||||
List<OtaBaSjQtsjxx> list = otaBaSjQtsjxxService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjQtsjxx
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-其他升级信息-添加")
|
||||
@ApiOperation(value="升级备案-其他升级信息-添加", notes="升级备案-其他升级信息-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjQtsjxx otaBaSjQtsjxx) {
|
||||
otaBaSjQtsjxxService.add(otaBaSjQtsjxx);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjQtsjxx
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-其他升级信息-编辑")
|
||||
@ApiOperation(value="升级备案-其他升级信息-编辑", notes="升级备案-其他升级信息-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjQtsjxx otaBaSjQtsjxx) {
|
||||
otaBaSjQtsjxxService.editById(otaBaSjQtsjxx);
|
||||
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) {
|
||||
otaBaSjQtsjxxService.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.otaBaSjQtsjxxService.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) {
|
||||
OtaBaSjQtsjxx otaBaSjQtsjxx = otaBaSjQtsjxxService.queryById(id);
|
||||
if(otaBaSjQtsjxx==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjQtsjxx);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*/
|
||||
@AutoLog(value = "车型备案-其他升级信息-通过otaId查询")
|
||||
@ApiOperation(value = "车型备案-其他升级信息-通过otaId查询", notes = "车型备案-其他升级信息-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
OtaBaSjQtsjxx otaBaSjQtsjxx = otaBaSjQtsjxxService.queryByOtaId(otaId, otaIdT);
|
||||
if (otaBaSjQtsjxx == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjQtsjxx);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjQtsjxx
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjQtsjxx otaBaSjQtsjxx) {
|
||||
return super.exportXls(request, otaBaSjQtsjxx, OtaBaSjQtsjxx.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, OtaBaSjQtsjxx.class);
|
||||
}
|
||||
|
||||
}
|
||||
+216
@@ -0,0 +1,216 @@
|
||||
package com.jero.modules.ota.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.ota.entity.OtaBaSjSjfzbh;
|
||||
import com.jero.modules.ota.service.IOtaBaSjSjfzbhService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="升级备案-本次升级的驾驶辅助功能与参数变化")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjSjfzbh")
|
||||
@Slf4j
|
||||
public class OtaBaSjSjfzbhController extends JeroController<OtaBaSjSjfzbh, IOtaBaSjSjfzbhService> {
|
||||
@Autowired
|
||||
private IOtaBaSjSjfzbhService otaBaSjSjfzbhService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjSjfzbh
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-本次升级的驾驶辅助功能与参数变化-分页列表查询")
|
||||
@ApiOperation(value="升级备案-本次升级的驾驶辅助功能与参数变化-分页列表查询", notes="升级备案-本次升级的驾驶辅助功能与参数变化-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjSjfzbh otaBaSjSjfzbh,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjSjfzbh> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjfzbh, req.getParameterMap());
|
||||
Page<OtaBaSjSjfzbh> page = new Page<OtaBaSjSjfzbh>(pageNo, pageSize);
|
||||
IPage<OtaBaSjSjfzbh> pageList = otaBaSjSjfzbhService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-本次升级的驾驶辅助功能与参数变化-列表查询")
|
||||
@ApiOperation(value="升级备案-本次升级的驾驶辅助功能与参数变化-列表查询", notes="升级备案-本次升级的驾驶辅助功能与参数变化-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjSjfzbh>> queryList() {
|
||||
List<OtaBaSjSjfzbh> list = otaBaSjSjfzbhService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
*/
|
||||
@AutoLog(value = "升级备案-本次升级的驾驶辅助功能与参数变化-添加")
|
||||
@ApiOperation(value="升级备案-本次升级的驾驶辅助功能与参数变化-添加", notes="升级备案-本次升级的驾驶辅助功能与参数变化-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody JSONObject json) {
|
||||
otaBaSjSjfzbhService.add(json);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjSjfzbh
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-本次升级的驾驶辅助功能与参数变化-编辑")
|
||||
@ApiOperation(value="升级备案-本次升级的驾驶辅助功能与参数变化-编辑", notes="升级备案-本次升级的驾驶辅助功能与参数变化-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjSjfzbh otaBaSjSjfzbh) {
|
||||
otaBaSjSjfzbhService.editById(otaBaSjSjfzbh);
|
||||
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) {
|
||||
otaBaSjSjfzbhService.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.otaBaSjSjfzbhService.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) {
|
||||
OtaBaSjSjfzbh otaBaSjSjfzbh = otaBaSjSjfzbhService.queryById(id);
|
||||
if(otaBaSjSjfzbh==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjSjfzbh);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过otaId查询
|
||||
*
|
||||
* @param otaId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-本次升级的驾驶辅助功能与参数变化-通过otaId查询")
|
||||
@ApiOperation(value = "升级备案-本次升级的驾驶辅助功能与参数变化-通过otaId查询", notes = "升级备案-本次升级的驾驶辅助功能与参数变化-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
|
||||
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
|
||||
JSONObject json = otaBaSjSjfzbhService.queryByOtaId(otaId, otaIdT);
|
||||
if (json == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(json);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjSjfzbh
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjSjfzbh otaBaSjSjfzbh) {
|
||||
return super.exportXls(request, otaBaSjSjfzbh, OtaBaSjSjfzbh.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, OtaBaSjSjfzbh.class);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "升级备案-本次升级的驾驶辅助功能与参数变化-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaSjSjfzbhService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "升级备案-本次升级的驾驶辅助功能与参数变化-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
this.otaBaSjSjfzbhService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
|
||||
}
|
||||
+211
@@ -0,0 +1,211 @@
|
||||
package com.jero.modules.ota.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.ota.entity.OtaBaCxJbxx;
|
||||
import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
|
||||
import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
|
||||
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.multipart.MultipartFile;
|
||||
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: 2023-03-17
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags = "升级备案-升级目标车辆")
|
||||
@RestController
|
||||
@RequestMapping("/ota/otaBaSjSjmbcl")
|
||||
@Slf4j
|
||||
public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaBaSjSjmbclService> {
|
||||
@Autowired
|
||||
private IOtaBaSjSjmbclService otaBaSjSjmbclService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param otaBaSjSjmbcl
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级目标车辆-分页列表查询")
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-分页列表查询", notes = "升级备案-升级目标车辆-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(OtaBaSjSjmbcl otaBaSjSjmbcl,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<OtaBaSjSjmbcl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjmbcl, req.getParameterMap());
|
||||
Page<OtaBaSjSjmbcl> page = new Page<OtaBaSjSjmbcl>(pageNo, pageSize);
|
||||
IPage<OtaBaSjSjmbcl> pageList = otaBaSjSjmbclService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级目标车辆-列表查询")
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-列表查询", notes = "升级备案-升级目标车辆-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<OtaBaSjSjmbcl>> queryList() {
|
||||
List<OtaBaSjSjmbcl> list = otaBaSjSjmbclService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param otaBaSjSjmbcl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级目标车辆-添加")
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-添加", notes = "升级备案-升级目标车辆-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody OtaBaSjSjmbcl otaBaSjSjmbcl) {
|
||||
otaBaSjSjmbclService.add(otaBaSjSjmbcl);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param otaBaSjSjmbcl
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级目标车辆-编辑")
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-编辑", notes = "升级备案-升级目标车辆-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody OtaBaSjSjmbcl otaBaSjSjmbcl) {
|
||||
otaBaSjSjmbclService.editById(otaBaSjSjmbcl);
|
||||
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) {
|
||||
otaBaSjSjmbclService.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.otaBaSjSjmbclService.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) {
|
||||
OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryById(id);
|
||||
if (otaBaSjSjmbcl == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(otaBaSjSjmbcl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过OtaId查询
|
||||
*/
|
||||
@AutoLog(value = "升级备案-升级目标车辆-通过otaId查询")
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-通过otaId查询", notes = "升级备案-升级目标车辆-通过otaId查询")
|
||||
@GetMapping(value = "/queryByOtaId")
|
||||
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
|
||||
@RequestParam(name = "otaIdT") String otaIdT) {
|
||||
OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryByOtaId(otaId, otaIdT);
|
||||
return Result.OK(otaBaSjSjmbcl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param otaBaSjSjmbcl
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjSjmbcl otaBaSjSjmbcl) {
|
||||
return super.exportXls(request, otaBaSjSjmbcl, OtaBaSjSjmbcl.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, OtaBaSjSjmbcl.class);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-模板下载")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
// @RequiresPermissions("otaBaCx:exportTemplate")
|
||||
public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
|
||||
this.otaBaSjSjmbclService.exportTemplate(response, request);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "升级备案-升级目标车辆-数据导入")
|
||||
@PostMapping(value = "/importData")
|
||||
// @RequiresPermissions("otaBaCx:importData")
|
||||
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
|
||||
@RequestParam(value = "cut", required = false) String cut,
|
||||
@RequestParam(value = "otaId", required = false) String otaId) throws Exception {
|
||||
StringBuilder errMsg = new StringBuilder();
|
||||
OtaBaSjSjmbcl res;
|
||||
try {
|
||||
String[] params = otaId.split("\\?");
|
||||
otaId = params[0].equals("null") ? "" : params[0];
|
||||
cut = params[1].replace("cut=", "");
|
||||
res = this.otaBaSjSjmbclService.importData(file, otaId, cut, errMsg);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
return Result.error(errMsg.toString());
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user