diff --git a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql index 3f2798162..21d3cc26d 100644 --- a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql +++ b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql @@ -49,4 +49,8 @@ ALTER TABLE `laws_weilai`.`params_report_detail` ---2022-06-15 ALTER TABLE `laws_weilai`.`sys_user_role` - MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`; \ No newline at end of file + MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`; + +---2022-06-21 +ALTER TABLE `laws_weilai`.`params_report_config` + ADD COLUMN `old_params_config_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集库参数配置id' AFTER `display_seq`; \ No newline at end of file diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql new file mode 100644 index 000000000..7c71b2f41 --- /dev/null +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -0,0 +1,95 @@ +-- 三阶段的新增功能，必须添加的固定数据以sql形式放到此处 + + +-- 法规意见收集流程相关表SQL +-- 工作流数据库 增加固定数据 +INSERT INTO `t_form` (`OBJECT_ID`, `CODE`, `CREATE_TIME`, `WIDGET_JSON`, `JSON`, `NAME`, `SHOW_KEY`, `IS_DELETED`, `MODEL_ID`, `JSON_EVAL`, `HTML`, `RUN_TYPE`, `CATEGORY_ID`, `HTML_READONLY`) VALUES ('fgyjsjlc', '0005', '2022-06-22 14:20:15', NULL, NULL, '法规意见收集流程', NULL, 0, '15007', NULL, NULL, 'json', '4bdf0b396b4aa6ea10dd5e19956a1e22', NULL); + +-- 法规意见表 +CREATE TABLE `laws_opinion_gather` ( + `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 '所属部门', + `serial_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题', + `technology_territory` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术领域', + `gather_result` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集结果', + `start_time` datetime NULL DEFAULT NULL COMMENT '发起日期', + `end_time` datetime NULL DEFAULT NULL COMMENT '截止日期', + `acti_proc_inst_id` varchar(100) 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; + +-- 法规意见收集-评估结果表 +CREATE TABLE `laws_opinion_assessment_result` ( + `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 '所属部门', + `laws_opinion_gather_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '意见收集表id', + `related_section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节', + `issue_or_suggest` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议', + `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由', + `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件', + `submit_time` datetime NULL DEFAULT NULL COMMENT '提出时间', + `acti_proc_inst_id` varchar(100) 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; + +-- 法规-流程历史表 +CREATE TABLE `laws_process_history` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `acti_proc_inst_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', + `task_definition_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作节点', + `operator_person_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作人id', + `operator_role_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作角色编码', + `operator_time` datetime NULL DEFAULT NULL COMMENT '操作时间', + `flow_type` 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; + +-- 参数项收集清单表 添加字段 +ALTER TABLE `laws_weilai`.`params_collect_manifest` + ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; +ALTER TABLE `laws_weilai`.`params_collect_manifest` + ADD COLUMN `add_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '添加标识' AFTER `del_flag`; +-- 参数配置数据表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_config_data` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 参数配置数据历史版本表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_config_data_history` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 上报库参数配置数据表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_report_config_data` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 上报库表 添加字段 +ALTER TABLE `laws_weilai`.`params_report` + ADD COLUMN `params_template_publish_version` int(11) NULL DEFAULT NULL COMMENT '对应参数模板发布版本' AFTER `old_params_manifest_id`; + +-- 法规月报管理表 + CREATE TABLE `laws_monthly_report_manage` ( + `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(0) NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规月报名称', + `language` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月报语种', + `issue_status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态', + `file_id` varchar(32) 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 ROW_FORMAT = Dynamic; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 38331b390..c7a18846a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -1,16 +1,24 @@ package com.jero.modules.cert.collect.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.aspect.annotation.PermissionData; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; 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.*; @@ -21,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -37,6 +46,9 @@ public class ParamsCollectManifestEOController extends JeroController save(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { + boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList()); + if (isSuccess) { + return Result.OK("保存成功！"); + } else { + return Result.error("保存失败！"); + } + } /** * 查询清单所用模版参数项列表（过滤清单已添加的参数项） @@ -265,6 +295,43 @@ public class ParamsCollectManifestEOController extends JeroController> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); + //TODO 外部模拟登陆临时账号，列表不显示 + queryWrapper.ne("username", "_reserve_user_external"); + Page page = new Page(pageNo, pageSize); + IPage pageList = sysUserService.page(page, queryWrapper); + + //批量查询用户的所属部门 + //step.1 先拿到全部的 useids + //step.2 通过 useids，一次性查询用户的所属部门名字 + List userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); + if (userIds != null && userIds.size() > 0) { + Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); + pageList.getRecords().forEach(item -> { + item.setOrgCodeTxt(useDepNames.get(item.getId())); + }); + } + result.setSuccess(true); + result.setResult(pageList); + log.info(pageList.toString()); + return result; + } + /** * 分配工程接口人 * @@ -331,7 +398,11 @@ public class ParamsCollectManifestEOController extends JeroController lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) { boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO); if (isSuccess) { - return Result.OK("冻结配置成功！"); + if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) { + return Result.OK("解冻配置成功！"); + } else { + return Result.OK("冻结配置成功！"); + } } else { return Result.error("冻结配置失败！"); } @@ -362,7 +433,7 @@ public class ParamsCollectManifestEOController extends JeroController referParams(ParamsCollectManifestVO paramsCollectManifestVO) { + public Result referParams(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO); if (isSuccess) { return Result.OK("引用参数成功！"); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index f471eda07..6cc8feeff 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -7,15 +7,21 @@ 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.modules.cert.collect.entity.ParamsConfigEO; import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.enums.ManifestStateEnum; +import com.jero.modules.cert.collect.service.IParamsConfigEOService; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.collect.vo.ParamsManifestVO; +import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.template.entity.ParamsTemplateEO; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,9 +31,10 @@ 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: 2022-05-05 @@ -40,7 +47,10 @@ import java.util.List; public class ParamsManifestEOController extends JeroController { @Autowired private IParamsManifestEOService paramsManifestEOService; - + + @Autowired + private IParamsConfigEOService paramsConfigEOService; + /** /** * 分页列表查询 @@ -66,6 +76,12 @@ public class ParamsManifestEOController extends JeroController rows = pageList.getRecords(); + // 处理 状态 中英文 + Map stateMap = ManifestStateEnum.toMap(cut); + rows.forEach(manifestEO -> { + manifestEO.setState(stateMap.get(manifestEO.getState())); + }); return Result.OK(cut, pageList); } @@ -266,13 +282,30 @@ public class ParamsManifestEOController extends JeroController copy(ParamsManifestEO paramsManifestEO, - @RequestParam(name="sourceManifestId",required=true) String sourceManifestId) { - ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, sourceManifestId); + public Result copy(@RequestBody ParamsManifestVO paramsManifestVO) { + ParamsManifestEO paramsManifestEO = new ParamsManifestEO(); + BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO); + ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, paramsManifestVO.getSourceManifestId()); return Result.OK(manifestEO); } - + /** + * 判断配置列表是否为空 + * 用于参数收集前的校验 + * @return + */ + @AutoLog(value = "参数清单-判断配置列表是否为空") + @ApiOperation(value="参数清单-判断配置列表是否为空", notes="参数清单-判断配置列表是否为空") + @GetMapping(value = "/verifyConfig") +// @RequiresPermissions("params:config:list") + public Result queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) { + List list = paramsConfigEOService.queryList(paramsManifestId); + if (CollectionUtil.isNotEmpty(list)) { + return Result.OK(true); // 不为空 + } else { + return Result.OK(false); // 为空 + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java index 10e880fa3..5e48be132 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java @@ -35,6 +35,16 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme @ApiModelProperty(value = "变更标识") private String changeFlag; + /**删除标识*/ + @Excel(name = "删除标识", width = 15) + @ApiModelProperty(value = "删除标识") + private String delFlag; + + /**添加标识*/ + @Excel(name = "添加标识", width = 15) + @ApiModelProperty(value = "添加标识") + private String addFlag; + @TableField(exist = false) private String userTypes; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java index 260c49008..7754c385d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java @@ -3,9 +3,8 @@ package com.jero.modules.cert.collect.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 com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -64,16 +63,19 @@ public class ParamsConfigDataEO implements Serializable { /**文本类型数据*/ @Excel(name = "文本类型数据", width = 15) @ApiModelProperty(value = "文本类型数据") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String textData; /**下拉类型数据*/ @Excel(name = "下拉类型数据", width = 15) @ApiModelProperty(value = "下拉类型数据") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String pullData; /**附件类型数据*/ @Excel(name = "附件类型数据", width = 15) @ApiModelProperty(value = "附件类型数据") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String fileConnectId; /**参数配置id*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index ac65946b5..68430dd6e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -1,9 +1,6 @@ package com.jero.modules.cert.collect.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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -74,6 +71,7 @@ public class ParamsManifestEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "收集完成时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private java.util.Date finishTime; /**版本*/ @@ -101,4 +99,8 @@ public class ParamsManifestEO implements Serializable { @TableField(exist = false) private Boolean configFlag; // true-可添加配置；false-不可添加配置 + + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java index e807d9b8c..7ea6f3a19 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java @@ -6,8 +6,12 @@ package com.jero.modules.cert.collect.enums; * @Date: Created in 17:49 2022/5/16 */ public enum CollectManifestChangeFlagEnum { - CHANGE_BEFORE("变更前","0"), - CHANGE_AFTER("变更后","1"); + CHANGE_BEFORE("变更前","0"), // 指控件类型没变 + CHANGE_AFTER("变更后","1"), // 指控件类型变了 + DELETE_BEFORE("变更时未删除","0"), + DELETE_AFTER("变更时已删除","1"), + ADD_BEFORE("非添加参数项","0"), + ADD_AFTER("添加参数项","1"); String name; String value; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java index 6ec9fee80..ce0611de7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java @@ -11,15 +11,15 @@ import java.util.Map; * @Date: Created in 15:17 2022/5/7 */ public enum CollectManifestStateEnum { - WAIT_COLLECT("待发起收集","wait collect","1"), - WAIT_SDT("待工程接口人处理","wait sdt","2"), - SDT_BACK("工程接口人退回","sdt back","3"), - WAIT_FILL("待填写","wait fill","4"), - DRE_BACK("填写人退回","dre back","5"), - SUBMIT("已提交","submit","6"), - CERT_BACK("认证工程师退回","cert back","7"), - SYNC_REPORT("已同步至上报库","sync report","8"), - CHANGE("变更","change","9"); + WAIT_COLLECT("待发起收集","Wait Collect","1"), + WAIT_SDT("待工程接口人处理","Wait Sdt","2"), + SDT_BACK("工程接口人退回","Sdt Back","3"), + WAIT_FILL("待填写","Wait Fill","4"), + DRE_BACK("填写人退回","Dre Back","5"), + SUBMIT("已提交","Submit","6"), + CERT_BACK("认证工程师退回","Cert Back","7"), + SYNC_REPORT("已同步至上报库","Sync Report","8"), + CHANGE("变更","Change","9"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java index 2e3528573..e62add4e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java @@ -1,19 +1,27 @@ package com.jero.modules.cert.collect.enums; +import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; + +import java.util.HashMap; +import java.util.Map; + /** * @Author: liyawei * @Description: 参数清单-状态 * @Date: Created in 16:19 2022/5/5 */ public enum ManifestStateEnum { - COLLECTING("收集中","收集中"), - FINISHED("已完成","已完成"); + COLLECTING("收集中","Collecting","收集中"), + FINISHED("已完成","Finished","已完成"); String name; + String enName; String value; - ManifestStateEnum(String name, String value) { + ManifestStateEnum(String name, String enName, String value) { this.name = name; + this.enName = enName; this.value = value; } @@ -25,6 +33,14 @@ public enum ManifestStateEnum { this.name = name; } + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + public String getValue() { return value; } @@ -32,4 +48,18 @@ public enum ManifestStateEnum { public void setValue(String value) { this.value = value; } + + public static Map toMap(String cut){ + Map map = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + for (ManifestStateEnum manifestStateEnum : ManifestStateEnum.values()) { + map.put(manifestStateEnum.getValue(), manifestStateEnum.getName()); + } + } else if (CutEnum.EN.getValue().equals(cut)) { + for (ManifestStateEnum manifestStateEnum : ManifestStateEnum.values()) { + map.put(manifestStateEnum.getValue(), manifestStateEnum.getEnName()); + } + } + return map; + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 794c1e696..a8bcc7f33 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -27,6 +27,8 @@ + + @@ -52,13 +54,13 @@ - AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1' + AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7') - AND dre = #{paramsCollectManifestEO.dreForAuth} + AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8') - AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state != '1' + AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state in ('2','4','5','6','7','8') AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) @@ -74,7 +76,7 @@ select * from params_collect_manifest - order by change_flag desc, create_time asc + order by del_flag desc, add_flag desc, change_flag desc, nio_number asc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml index 65d85a714..8d45c4a10 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml @@ -57,6 +57,6 @@ select * from params_collect_manifest_history - order by create_time asc + order by nio_number asc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 7d1a1e3a1..be1ffc81c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -74,7 +74,7 @@ pm.title as title, pm.project_id as project_id, pm.state as state, - pni.project_name as project_name, + concat(pni.project_name,'-',pyni.year_name) as project_name, pm.params_template_id as params_template_id, pt.params_template_name as params_template_name, pm.params_template_publish_version as params_template_publish_version, @@ -83,6 +83,7 @@ left join params_template pt on pm.params_template_id = pt.id left join project_library_base as plb on plb.id = pm.project_id left join project_name_info as pni on plb.project_name_id = pni.id + left join project_year_name_info as pyni on plb.year_name_id=pyni.id ) tmp_tb where 1=1 and state = #{state} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 5e6392c24..3f055584b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -80,6 +80,13 @@ public interface IParamsCollectManifestEOService extends IService> configDataList); + /** + * 保存 + * @param configDataList + * @return + */ + boolean save(List> configDataList); + /** * 查询清单所用模版参数项列表（过滤清单已添加的参数项） * @param paramsCollectManifestVO diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index af78bfab8..11947cd09 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -142,6 +142,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限 + List list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 // 普通数据字典 @@ -715,6 +718,90 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> configDataList) { + List newConfigDataEOList = new ArrayList<>(); + + // 处理数据 + for (Map map : configDataList) { + String paramsCollectManifestId = (String) map.get("id"); + + // 添加配置数据 + for (Map.Entry entry : map.entrySet()) { + ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); + if ("id".equals(entry.getKey())) { + continue; + } + + // 取值 + String paramsConfigEOId = entry.getKey(); + Map paramsConfigDataMap = (Map) entry.getValue(); + // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） + List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + + // 判断是新增还是修改 + ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); + if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { + paramsConfigDataEO.setId(oldConfigDataEO.getId()); + + } + paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); + if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { + for (Map paramsConfigDataVO : paramsConfigDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + paramsConfigDataEO.setTextData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + paramsConfigDataEO.setPullData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); + String connectId = UUID.randomUUID().toString().replace("-", ""); + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileIdList[i]); + ossFile.setConnectId(connectId); + updateFileList.add(ossFile); + } + ossFileService.updateBatchById(updateFileList); + dataValue = connectId; + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + } + } + paramsConfigDataEO.setFileConnectId(dataValue); + + } + } + } + newConfigDataEOList.add(paramsConfigDataEO); + } + } + + // 批量更新 + return paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); + } + /** * 查询清单所用模版参数项列表（过滤清单已添加的参数项） * @param paramsCollectManifestVO @@ -728,7 +815,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsInfoPublishEOList = paramsInfoPublishEOService.list(queryWrapper); @@ -953,7 +1040,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); @@ -1038,7 +1136,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; + String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId; + String href = "the link,"; String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it."; String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it."; // 发送系统消息 @@ -1080,11 +1180,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); @@ -1107,8 +1209,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; + String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId; + String href = "the link,"; String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; // 发送系统消息 @@ -1175,7 +1278,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")); ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId); - // 根据收集库清单id 的是否上报过 - boolean isSync = paramsReportEOService.isSync(paramsManifestId); + // 根据收集库清单id和版本，判断当前版本是否上报过 + boolean isSync = paramsReportEOService.isSync(paramsManifestId, paramsManifestEO.getVersion()); String reportId = null; - if (!isSync) { + if (!isSync) { // 未上报过 reportId = UUID.randomUUID().toString().replace("-",""); - } else { - ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId); + } else { // 上报过 + ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId, paramsManifestEO.getVersion()); reportId = paramsReportEO.getId(); } @@ -1281,15 +1399,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); List addReportConfigEOList = new ArrayList<>(); List addReportCertCategoryParamsInfoEOList = new ArrayList<>(); + Map configIdMap = new HashMap<>(); // 存放新旧 configId 关系 if (!isSync) { // 未上报 // 复制配置 for (ParamsConfigEO configEO : paramsConfigEOList) { ParamsReportConfigEO addReportConfigEO = new ParamsReportConfigEO(); - BeanUtils.copyProperties(configEO, addReportConfigEO); // 全盘复制,包括id + BeanUtils.copyProperties(configEO, addReportConfigEO); addReportConfigEO.setParamsManifestId(reportId); + String addReportConfigId = UUID.randomUUID().toString().replace("-",""); + addReportConfigEO.setId(addReportConfigId); + addReportConfigEO.setOldParamsConfigId(configEO.getId()); addReportConfigEOList.add(addReportConfigEO); + + configIdMap.put(configEO.getId(), addReportConfigId); } + } else { + List paramsReportConfigEOList = paramsReportConfigEOService.queryList(reportId); + configIdMap = paramsReportConfigEOList.stream().collect(Collectors.toMap(ParamsReportConfigEO::getOldParamsConfigId, ParamsReportConfigEO::getId)); } // 添加参数项到上报库 @@ -1312,6 +1439,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList); for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) { ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO(); - BeanUtils.copyProperties(ccpi, addCcpi); // 全盘复制,包括id + BeanUtils.copyProperties(ccpi, addCcpi); + addCcpi.setId(UUID.randomUUID().toString().replace("-","")); addReportCertCategoryParamsInfoEOList.add(addCcpi); } @@ -1333,18 +1463,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index dbeda896e..3a31c4d3e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -18,6 +18,8 @@ import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.StringUtils; @@ -52,6 +54,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl configIdList = new ArrayList<>(); // 配置列名 + Map manifestMap = objectToMap(collectManifestEO); // 对象转map String controlType = collectManifestEO.getControlType(); String paramsCollectManifestId = collectManifestEO.getId(); @@ -126,10 +133,12 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); + + configIdList.add(paramsConfigEO.getId()); }); } @@ -141,6 +150,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); + String templateId = null; + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setIsLock(paramsConfigEO.getIsLock()); configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { configDataVO.setDataValue(paramsConfigDataEO.getTextData()); @@ -173,6 +195,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl controlValueMap = new HashMap<>(); - controlValueMap.put("lable", controlValueStr[i]); + controlValueMap.put("label", controlValueStr[i]); controlValueMap.put("value", controlValueStr[i]); controlValueMapList.add(controlValueMap); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index d68df1bc4..02261b799 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -23,6 +23,7 @@ import com.jero.modules.cert.collect.service.*; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; +import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.service.IParamsTemplateEOService; import com.jero.modules.project.entity.ProjectRelatedPersonnel; @@ -94,7 +95,11 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { - throw new JeroBootException("标题已存在！"); + if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("Title already exists!"); + } else { + throw new JeroBootException("标题已存在！"); + } } String paramsManifestId = UUID.randomUUID().toString().replace("-",""); @@ -110,6 +115,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { - throw new JeroBootException("标题已存在！"); + if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("Title already exists!"); + } else { + throw new JeroBootException("标题已存在！"); + } } } @@ -280,27 +293,25 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl nioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); - List sameList = newParamsInfoPublishEOList.stream().filter(e->nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); + List oldNioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); + List sameList = newParamsInfoPublishEOList.stream().filter(e->oldNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); + + List newNioNumberList = sameList.stream().map(ParamsInfoPublishEO::getNioNumber).collect(Collectors.toList()); + List diffList = oldParamsCollectManifestEOList.stream().filter(e->!newNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); + List delCollectManifestIdList = new ArrayList<>(); List updateCollectManifestEOList = new ArrayList<>(); - for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) { - ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream() - .filter(e->e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber())) - .collect(Collectors.toList()).get(0); - String newControlType = paramsInfoPublishEO.getControlType(); - String newControlVerify = paramsInfoPublishEO.getControlVerify(); - String newControlValues = paramsInfoPublishEO.getControlValues(); - - String oldControlType = oldCollectManifestEO.getControlType(); - String oldControlVerify = oldCollectManifestEO.getControlVerify(); - String oldControlValues = oldCollectManifestEO.getControlValues(); - - ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); - // 比较参数填写规则 - if (!newControlType.equals(oldControlType) - || (newControlVerify != null && !newControlVerify.equals(oldControlVerify)) - || (oldControlVerify != null && !oldControlVerify.equals(newControlVerify)) - || (newControlValues != null && !newControlValues.equals(oldControlValues)) - || (oldControlValues != null && !oldControlValues.equals(newControlValues))) { - - // 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边 - updateCollectManifestEO.setId(oldCollectManifestEO.getId()); - updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); - updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); - updateCollectManifestEO.setControlType(newControlType); - updateCollectManifestEO.setControlVerify(newControlVerify); - updateCollectManifestEO.setControlValues(newControlValues); - - delCollectManifestIdList.add(oldCollectManifestEO.getId()); - } else { - // 参数填写规则没有改变，状态变为：变更 + // 模板里没有，清单里有 + if (CollectionUtil.isNotEmpty(diffList)) { + for (ParamsCollectManifestEO oldCollectManifestEO : diffList) { + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); updateCollectManifestEO.setId(oldCollectManifestEO.getId()); updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue()); - updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); + updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项 + updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项 + updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项 + updateCollectManifestEOList.add(updateCollectManifestEO); } - updateCollectManifestEOList.add(updateCollectManifestEO); } + // 模板里有，清单里也有 + if (CollectionUtil.isNotEmpty(sameList)) { + for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) { + ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream() + .filter(e -> e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber())) + .collect(Collectors.toList()).get(0); + String newControlType = paramsInfoPublishEO.getControlType(); + String newControlVerify = paramsInfoPublishEO.getControlVerify(); + String newControlValues = paramsInfoPublishEO.getControlValues(); + + String oldControlType = oldCollectManifestEO.getControlType(); + String oldControlVerify = oldCollectManifestEO.getControlVerify(); + String oldControlValues = oldCollectManifestEO.getControlValues(); + + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); + BeanUtils.copyProperties(paramsInfoPublishEO, updateCollectManifestEO); + // 比较参数填写规则 + if (!newControlType.equals(oldControlType) + || (newControlVerify != null && !newControlVerify.equals(oldControlVerify)) + || (oldControlVerify != null && !oldControlVerify.equals(newControlVerify)) + || (newControlValues != null && !newControlValues.equals(oldControlValues)) + || (oldControlValues != null && !oldControlValues.equals(newControlValues))) { + + // 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边 + updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id + updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); + updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项 + updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项 + updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项 +// updateCollectManifestEO.setControlType(newControlType); +// updateCollectManifestEO.setControlVerify(newControlVerify); +// updateCollectManifestEO.setControlValues(newControlValues); + + delCollectManifestIdList.add(oldCollectManifestEO.getId()); + } else { + // 参数填写规则没有改变，状态变为：变更 + updateCollectManifestEO.setId(oldCollectManifestEO.getId()); + updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue()); + updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项 + updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项 + updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项 + + } + // 更新附件模板字段 + if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) { + updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId()); + } + + updateCollectManifestEOList.add(updateCollectManifestEO); + } + } // 删除参数项配置数据 if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) { paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList); @@ -444,9 +485,32 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl map = paramsCollectManifestEOService.isCollectFinished(sourceManifestId); + Boolean finish = (Boolean) map.get("finish"); + if (!finish) { + if (CutEnum.CN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("清单收集中，无法复制！"); + } else { + throw new JeroBootException("Manifest collection, and cannot be copied!"); + } + } + String paramsTemplateId = paramsManifestEO.getParamsTemplateId(); int paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle()); + queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId()); + List paramsManifestEOList = list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("Title already exists!"); + } else { + throw new JeroBootException("标题已存在！"); + } + } + // 查询所有模板参数项 List paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsTemplateId, paramsTemplatePublishVersion); @@ -500,24 +564,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl implements IParamsManifestHistoryEOService { @Autowired diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java index 689c4b438..1564daa81 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java @@ -69,4 +69,6 @@ public class ParamsCollectManifestVO { private String sourceConfigId; // 引用参数专用 @ApiModelProperty(value = "引用参数专用-到") private String targetConfigIds; // 引用参数专用 + + private String cut; // 引用参数专用 } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java index 1772bd5bf..187fe1d54 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java @@ -21,4 +21,5 @@ public class ParamsManifestVO { private String ids; private String cut; + private String sourceManifestId; } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java index c06770247..2ec6c9f98 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java @@ -61,10 +61,12 @@ public class ParamsExportTemplateEOController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName()); + queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); Page page = new Page(pageNo, pageSize); IPage pageList = paramsExportTemplateEOService.page(page, queryWrapper); List rows = pageList.getRecords(); + // 处理 状态 中英文 Map stateMap = ExportTemplateStateEnum.toMap(cut); rows.forEach(exportTemplateEO -> { exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState())); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 9a77fc4bd..bf1312780 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -1,21 +1,24 @@ package com.jero.modules.cert.report.controller; +import com.alibaba.fastjson.JSONObject; 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.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -59,23 +62,47 @@ public class ParamsReportDetailEOController extends JeroController>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, + public Result>> queryList(ParamsReportDetailEO paramsReportDetailEO, @RequestParam(name = "cut") String cut) { - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) { - paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) { + paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) { - paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getParamsName())) { + paramsReportDetailEO.setParamsName(paramsReportDetailEO.getParamsName().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getSdt())) { - paramsCollectManifestEO.setSdt(paramsCollectManifestEO.getSdt().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getSdt())) { + paramsReportDetailEO.setSdt(paramsReportDetailEO.getSdt().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) { - paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getDre())) { + paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%")); } - List> list = paramsReportDetailEOService.queryList(paramsCollectManifestEO, cut); + List> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut); return Result.OK(list); } + @ApiOperation(value = "上报库参数项-常规导出") + @GetMapping(value = "/exportNormal") +// @RequiresPermissions("report:detail:export:normal") + public void exportSplitInfoZip(ParamsReportDetailVO paramsReportDetailVO, + HttpServletResponse response, + HttpServletRequest request) { + paramsReportDetailEOService.exportNormal(paramsReportDetailVO, response, request); + } + + /** + * 冻结配置-下拉选项 + * + * @param paramsReportDetailVO + * @return + */ + @AutoLog(value = "上报库参数项-配置下拉选项(常规导出)") + @ApiOperation(value="上报库参数项-配置下拉选项(常规导出)", notes="上报库参数项-配置下拉选项(常规导出)") + @PostMapping(value = "/getConfigLabelList") +// @RequiresPermissions("report:detail:export:normal") + public Result getConfigLableList(ParamsReportDetailVO paramsReportDetailVO) { + List> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO); + return Result.OK(configLabelList); + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index be73a96d3..11e698743 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -104,7 +104,7 @@ public class ParamsReportEOController extends JeroController edit(@Validated @RequestBody ParamsReportEO paramsReportEO) { paramsReportEOService.editById(paramsReportEO); return Result.OK("编辑成功!"); @@ -118,7 +118,7 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paramsReportEOService.deleteById(id); return Result.OK("删除成功!"); @@ -132,7 +132,7 @@ public class ParamsReportEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paramsReportEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 084f3be64..0bdd40ab1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -78,4 +79,7 @@ public class ParamsExportTemplateEO implements Serializable { @ApiModelProperty(value = "附件上传") private String fileConnectId; + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java index 14a5fed4c..cc93e55fa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java @@ -3,9 +3,11 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.modules.cert.collect.entity.ParamsConfigEO; 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 java.io.Serializable; @@ -24,4 +26,9 @@ import java.io.Serializable; public class ParamsReportConfigEO extends ParamsConfigEO implements Serializable { private static final long serialVersionUID = 1L; + /**收集库参数配置id*/ + @Excel(name = "收集库参数配置id", width = 15) + @ApiModelProperty(value = "收集库参数配置id") + private String oldParamsConfigId; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java index 4cf48e223..8c5168c7f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java index 90003a7f1..e8d81dd1a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java @@ -67,6 +67,9 @@ public class ParamsReportEO implements Serializable { @ApiModelProperty(value = "版本") private Integer version; + @ApiModelProperty(value = "对应参数模板发布版本") + private Integer paramsTemplatePublishVersion; + @TableField(exist = false) @ApiModelProperty(value = "项目名称") private String projectName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java index a7c4a33dd..8ca30076c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java @@ -3,6 +3,7 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,4 +25,8 @@ import java.io.Serializable; public class ReportCertCategoryParamsInfoEO extends CertCategoryParamsInfoEO implements Serializable { private static final long serialVersionUID = 1L; + /**发布时版本*/ + @ApiModelProperty(value = "发布时版本") + private Integer version; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java index 68821d2fb..cc6cf3221 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java @@ -11,8 +11,8 @@ import java.util.Map; * @Date: Created in 11:29 2022/5/18 */ public enum ExportTemplateStateEnum { - ENABLE("启用","0","enable"), - DISABLE("禁用","1","disable"); + ENABLE("启用","0","Enable"), + DISABLE("禁用","1","Disable"); String name; String value; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java index e2dbfceb8..7a8e4de2c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java @@ -2,6 +2,9 @@ package com.jero.modules.cert.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 上报库参数配置数据 @@ -11,4 +14,6 @@ import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; */ public interface ParamsReportConfigDataEOMapper extends BaseMapper { + List selectByConfigIdListAndCollectManifestId(@Param("configIdList") List configIdList, + @Param("paramsCollectManifestId") String paramsCollectManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java index 811e0fc0f..ec54aeed7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java @@ -3,9 +3,11 @@ package com.jero.modules.cert.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 上报库参数项 @@ -15,5 +17,9 @@ import java.util.List; */ public interface ParamsReportDetailEOMapper extends BaseMapper { - List listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); + List listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); + + List> listInfoForExport(@Param("idList") List idList, + @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml index 2c27ef2ef..d21462bf6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml @@ -14,4 +14,16 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml index a58059d08..8dc02628a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index c386f672d..060cf0d4e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -31,24 +31,53 @@ - - - AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%') + + + AND nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.nioNumber}),'%') - - AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%') + + AND params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.paramsName}),'%') - - AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%') + + AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%') - - AND sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%') + + AND sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.sdt}),'%') - - AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%') + + AND dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.dre}),'%') - - AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} + + AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId} + + + + + + + + + + + AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.nioNumber}),'%') + + + AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%') + + + AND rccpi.cert_category = #{paramsReportDetailVO.certCategory} + + + AND rccpi.version = #{paramsReportDetailVO.paramsTemplatePublishVersion} + + + AND prd.sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.sdt}),'%') + + + AND prd.dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.dre}),'%') + + + AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId} @@ -59,6 +88,26 @@ select * from params_report_detail - order by create_time asc + order by nio_number asc, sync_time desc + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml index c00f9aec4..4426e029a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml @@ -12,12 +12,18 @@ + pr.id as id, pr.old_params_manifest_id as old_params_manifest_id, pr.version as version, + pr.params_template_publish_version as params_template_publish_version, + pr.create_by as create_by, + pr.create_time as create_time, + pr.update_by as update_by, + pr.update_time as update_time, pm.title as title, pni.project_name as project_name @@ -44,6 +50,7 @@ left join project_name_info as pni on plb.project_name_id = pni.id ) tmp_tb + order by create_time desc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index ec80f7bf7..16dce9473 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -3,6 +3,8 @@ package com.jero.modules.cert.report.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; +import java.util.List; + /** * @Description: 上报库参数配置数据 * @Author: jero-boot @@ -19,4 +21,6 @@ public interface IParamsReportConfigDataEOService extends IService queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 382a8b276..45931c5c2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -1,9 +1,11 @@ package com.jero.modules.cert.report.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -17,11 +19,11 @@ public interface IParamsReportDetailEOService extends IService> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut); + List> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut); /** * 列表表头中英文切换 @@ -31,4 +33,9 @@ public interface IParamsReportDetailEOService extends IService> getHeader(String paramsManifestId, String flag, String cut); + + void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request); + + // 配置-下拉选项 + List> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java index 7d8471009..ff7746e6f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java @@ -63,8 +63,8 @@ public interface IParamsReportEOService extends IService { IPage pageInfo(IPage page, ParamsReportEO paramsReportEO); - boolean isSync(String oldParamsManifestId); + boolean isSync(String oldParamsManifestId, Integer version); - ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId); + ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId, Integer version); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java index 51815b94e..b53290e5c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; import com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper; import com.jero.modules.cert.report.service.IParamsExportTemplateEOService; @@ -36,6 +38,16 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl 0) { - return false; - } else { return true; + } else { + return false; } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 72134af05..ac69c6438 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -7,6 +7,8 @@ import com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper; import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 上报库参数配置数据 * @Author: jero-boot @@ -31,4 +33,9 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId) { + return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index b9b2d1e7e..8ba990cfa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -2,10 +2,15 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ZipUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.cert.collect.entity.*; @@ -19,15 +24,44 @@ import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.common.ConvertHtml2Excel; +import com.jero.modules.split.common.ReadExcel; +import com.jero.modules.split.dto.FileSpiltValTableExportDto; +import com.jero.modules.split.dto.FileSplitValExportDto; +import com.jero.modules.split.dto.FileSplitValImgExportDto; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.CreationHelper; +import org.apache.poi.ss.usermodel.Hyperlink; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.usermodel.*; +import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.util.*; import java.util.stream.Collectors; @@ -55,6 +89,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) { - String paramsManifestId = paramsCollectManifestEO.getParamsManifestId(); + public List> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) { + String paramsManifestId = paramsReportDetailEO.getParamsManifestId(); - List list = paramsReportDetailEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 + List list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列 List paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 // 普通数据字典 @@ -120,6 +159,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configIdList = new ArrayList<>(); // 配置列名 + Map manifestMap = objectToMap(collectManifestEO); // 对象转map String controlType = collectManifestEO.getControlType(); String paramsCollectManifestId = collectManifestEO.getId(); @@ -129,13 +170,26 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); + + configIdList.add(paramsConfigEO.getId()); }); } + // 处理工程接口人 +// Map sdtMap = new HashMap<>(); +// sdtMap.put("id", collectManifestEO.getId()); +// sdtMap.put("state", collectManifestEO.getState()); +// sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ",")); +// sdtMap.put("dataValue", collectManifestEO.getSdt()); +// manifestMap.put("sdt", sdtMap); + + // 配置列名数组 + manifestMap.put("configIds", configIdList); + listMap.add(manifestMap); }); @@ -149,14 +203,24 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); + String templateId = null; + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setIsLock(paramsConfigEO.getIsLock()); configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { configDataVO.setDataValue(paramsConfigDataEO.getTextData()); @@ -168,6 +232,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl controlValueMap = new HashMap<>(); - controlValueMap.put("lable", controlValueStr[i]); + controlValueMap.put("label", controlValueStr[i]); controlValueMap.put("value", controlValueStr[i]); controlValueMapList.add(controlValueMap); } @@ -386,6 +476,365 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fieldList = Arrays.asList(field.split(",")); // list形式 + + // 查询导出数据 + List> allParamsInfoList = queryForExport(paramsReportDetailVO); // id记得去掉 + + // 开始处理工作表 + List allRelevFileList = new ArrayList<>(); + + // 在excel表中添加表头 + XSSFRow row = sheetItems.createRow(0); + for (int i = 0; i < headers.length; i++) { + XSSFCell cell = row.createCell(i); + XSSFRichTextString text = new XSSFRichTextString(headers[i]); + cell.setCellValue(text); + cell.setCellStyle(cellStyle1); + // 设置单元格宽度 + if("参数值".equals(headers[i])) { + sheetItems.setColumnWidth(i, 80 * 256); + } else { + sheetItems.setColumnWidth(i, 20 * 256); + } + } + //放文字内容 + int allRow = 0; + for(int rowNum = 0;rowNum < allParamsInfoList.size(); rowNum++){ + Map exportDto = allParamsInfoList.get(rowNum); + + // 处理文件 + List fileList = (List) exportDto.get("fileList"); + if (CollectionUtil.isNotEmpty(fileList)) { + allRelevFileList.addAll(fileList); + } + + allRow++; + XSSFRow row1 = sheetItems.createRow(allRow); + for(int cellNum = 0; cellNum < fieldList.size(); cellNum++){ + if (ObjectUtils.isNotEmpty(exportDto.get(fieldList.get(cellNum)))) { + row1.createCell(cellNum).setCellValue(exportDto.get(fieldList.get(cellNum)).toString()); + row1.getCell(cellNum).setCellStyle(cellStyle); + + } + } + + } + + //下载关联文件内容 + if (allRelevFileList != null && !allRelevFileList.isEmpty()) { + allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); + downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + } + + String repFileName = fileName.replaceAll("/","_"); + excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName); + response.setHeader("Content-Disposition", + "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request) +"\""); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(excelOS); + excelOS.flush(); + excelOS.close(); + ZipUtil.zip(fileNowPath,fileNowPath+".zip"); + FileInputStream fis = new FileInputStream(fileNowPath+".zip"); + int len = 0; + while ((len = fis.read()) != -1) { + os.write(len); + } + os.flush(); + os.close(); // 后开先关 + fis.close(); // 先开后关 + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + IOUtils.closeQuietly(excelOS); + File tempZipFile = new File(uploadpath + "/tempZip"); + FileUtil.deleteContents(tempZipFile); + } + } + + @Override + public List> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO) { + String paramsManifestId = paramsReportDetailVO.getParamsManifestId(); + + // 查询配置列 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, paramsManifestId); + + queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); + List paramsConfigEOList = paramsReportConfigEOService.list(queryWrapper); + + List> configLabelList = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { + Map map = new HashMap<>(); + map.put("label", paramsConfigEO.getConfigName()); + map.put("value", paramsConfigEO.getId()); + configLabelList.add(map); + } + } + + return configLabelList; + } + + private void downLoadFileList(List allRelevFileList,String fileNowPath) { + File nowFile = new File(fileNowPath); + if (nowFile.exists()){ + nowFile.delete(); + } + nowFile.mkdirs(); + + for(OSSFile fileExportDto : allRelevFileList){ + String oldPath = fileExportDto.getUrl(); + String newPath = fileNowPath + File.separator + fileExportDto.getFileName(); + if (CosBootUtil.doesObjectExist(oldPath)){ + try (InputStream in = CosBootUtil.download(oldPath);) { + copyFile1(in, newPath); + } catch (IOException e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + } + } + } + + } + + public void copyFile1(InputStream in, String destPath) throws IOException { + BufferedInputStream bis = new BufferedInputStream(in); + BufferedOutputStream bos = + new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE)); + // 打开输入流 +// FileInputStream fis = new FileInputStream(srcPath); + // 打开输出流 +// FileOutputStream fos = new FileOutputStream(destPath); + // 读取和写入信息 + byte[] bytes = new byte[1024 * 1024]; + int len; + while ((len = bis.read(bytes)) > 0) { + bos.write(bytes, 0, len); + } + // 关闭流 先开后关 后开先关 + // 先开后关，先开的输入流，再开的输出流，那么应该先关输出流，再关输入流 + // 先关外层，再关内层。如BufferedInputStream包装了一个FileInputStream，那么先关BufferedInputStream，再关FileInputStream。 + bos.close(); // 后开先关 + bis.close(); // 先开后关 + } + + private List> queryForExport(ParamsReportDetailVO paramsReportDetailVO) { + List idList = new ArrayList<>(); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) { + idList = Arrays.asList(paramsReportDetailVO.getIds().split(",")); + } + List configIdList = Arrays.asList(paramsReportDetailVO.getConfigIds().split(",")); + List> dataList = paramsReportDetailEOMapper.listInfoForExport(idList, paramsReportDetailVO); + + List paramsConfigEOList = paramsReportConfigEOService.queryList(paramsReportDetailVO.getParamsManifestId()); // 查询所有配置列 + + // 查询配置列数据 + for (Map record1 : dataList) { + + String paramsCollectManifestId = (String) record1.get("id"); + + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + List fileList = new ArrayList<>(); + //不合并 + if ("1".equals(paramsReportDetailVO.getCombineFlag())) { + paramsConfigEOList = paramsConfigEOList.stream().filter(e->configIdList.contains(e.getId())).collect(Collectors.toList()); // 过滤出要导出的配置列 + paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + + String paramsConfigId = paramsConfigEO.getId(); + ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(ossFileList.get(0).getFileName()).append("&"); + + fileList.addAll(ossFileList); + } + } + + String configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + + record1.put(paramsConfigEO.getId(), configData); + }); + + } else if ("2".equals(paramsReportDetailVO.getCombineFlag())) { // 合并 + String configData = ""; + List paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); + + String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData())) + .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + + String pullDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getPullData())) + .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + + List fileNameList = new ArrayList<>(); + paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { + if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + fileNameList.add(ossFileList.get(0).getFileName()); + + fileList.addAll(ossFileList); + } + } + }); + + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(textDatas)) { + configDataBuilder.append(textDatas).append("&"); + } + if (StringUtils.isNotEmpty(pullDatas)) { + configDataBuilder.append(pullDatas).append("&"); + } + if (CollectionUtil.isNotEmpty(fileNameList)) { + configDataBuilder.append(StringUtils.join(fileNameList, ",")).append("&"); + } + configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + record1.put("params_value", configData); + + } + record1.put("fileList", fileList); + } + } + return dataList; + } + + /** + * 获取导出文件的表头 + * + * @return + */ + private String[] getWorkbookTitleForExport(ParamsReportDetailVO paramsReportDetailVO) { + String cut = paramsReportDetailVO.getCut(); + String certCategoryName = paramsReportDetailVO.getCertCategoryName(); + String paramsManifestId = paramsReportDetailVO.getParamsManifestId(); + String combineFlag = paramsReportDetailVO.getCombineFlag(); + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_REPORT_DETAIL.getValue()); + + List dbFieldNameList = new ArrayList<>(); + List dbFieldList = new ArrayList<>(); + + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + + // 固定列 + for (int i = 0; i < fieldList.size(); i++) { + OnlCgformField onlCgformField = fieldList.get(i); + Map map = new HashMap<>(); + String dbFieldName = onlCgformField.getDbFieldName(); + if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { + dbFieldList.add(dbFieldName); + + if(CutEnum.CN.getValue().equals(cut)){ + dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名 + }else{ + dbFieldNameList.add(onlCgformField.getDbFieldEnName()); // 字段英文名 + } + } + } + + // 认证类别列 + dbFieldList.add("cert_number"); + dbFieldList.add("cert_params_name"); + if(CutEnum.CN.getValue().equals(cut)){ + dbFieldNameList.add(certCategoryName + "编号"); // 字段中文名 + dbFieldNameList.add(certCategoryName + "参数名称"); // 字段中文名 + }else{ + dbFieldNameList.add(certCategoryName + " Number"); // 字段中文名 + dbFieldNameList.add(certCategoryName + " Params Name"); // 字段中文名 + } + + // 配置列 + if ("1".equals(combineFlag)) { + List configIdList = Arrays.asList(paramsReportDetailVO.getConfigIds().split(",")); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ParamsReportConfigEO::getId, configIdList).orderByAsc(ParamsReportConfigEO::getDisplaySeq); + List paramsReportConfigEOList = paramsReportConfigEOService.list(wrapper); + if (CollectionUtil.isNotEmpty(paramsReportConfigEOList)) { + for (ParamsReportConfigEO paramsReportConfigEO : paramsReportConfigEOList) { + dbFieldList.add(paramsReportConfigEO.getId()); + dbFieldNameList.add(paramsReportConfigEO.getConfigName()); + } + } + } else if ("2".equals(combineFlag)) { + dbFieldList.add("params_value"); + if(CutEnum.CN.getValue().equals(cut)){ + dbFieldNameList.add("参数值"); // 字段中文名 + }else{ + dbFieldNameList.add("Params Values"); // 字段中文名 + } + } + + String[] title = new String[2]; + String dbFieldStr = StringUtils.join(dbFieldList, ","); + String dbFieldNameStr = StringUtils.join(dbFieldNameList, ","); + + title[0] = dbFieldStr; + title[1] = dbFieldNameStr; + return title; + } + /** * 获取一个类和其父类的所有属性 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 8c9398eea..b53905e06 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportEO; import com.jero.modules.cert.report.mapper.ParamsReportEOMapper; import com.jero.modules.cert.report.service.IParamsReportEOService; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -100,9 +101,10 @@ public class ParamsReportEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId) + .eq(ParamsReportEO::getVersion, version); int num = count(queryWrapper); if (num > 0) { return true; // 上报过 @@ -113,9 +115,10 @@ public class ParamsReportEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId) + .eq(ParamsReportEO::getVersion, version); return getOne(queryWrapper); } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java new file mode 100644 index 000000000..84ec1e32b --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java @@ -0,0 +1,54 @@ +package com.jero.modules.cert.report.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +@Data +public class ParamsReportDetailVO { + + /**nio编号*/ + @ApiModelProperty(value = "nio编号") + private String nioNumber; + + /**参数名称*/ + @ApiModelProperty(value = "参数名称") + private String paramsName; + + /**认证类别*/ + @ApiModelProperty(value = "认证类别") + private String certCategory; + + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + + /**填写人*/ + @ApiModelProperty(value = "填写人") + private String dre; + + + @ApiModelProperty(value = "参数清单id") + private String paramsManifestId; + + @ApiModelProperty(value = "认证类别名称") + private String certCategoryName; + + @ApiModelProperty(value = "对应参数模板发布版本") + private Integer paramsTemplatePublishVersion; + + private String ids; // 勾选导出 + private String configIds; // 导出的配置列 + private String combineFlag; // 合并标识 1-不合并，2-合并 + private String separator; // 分隔符 + + private String cut; + private String exportName; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 6f0941db9..ab39e0243 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -7,6 +7,7 @@ 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.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.service.IParamsInfoEOService; @@ -73,14 +74,17 @@ public class ParamsInfoEOController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId()) .like(StringUtils.isNotEmpty(paramsInfoEO.getNioNumber()), ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()) .like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), ParamsInfoEO::getParamsName, paramsInfoEO.getParamsName()) .eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), ParamsInfoEO::getDutyTerritory, paramsInfoEO.getDutyTerritory()) - .orderBy(StringUtils.isNotBlank(orderByField), "1".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber) - .orderByDesc(ParamsInfoEO::getCreateTime); + .orderBy(true, "asc".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber); Page page = new Page(pageNo, pageSize); IPage pageList = paramsInfoEOService.page(page, queryWrapper); // List rows = pageList.getRecords(); @@ -231,9 +235,14 @@ public class ParamsInfoEOController extends JeroController publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId) { - int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId); - return Result.OK("发布版本：" + publishVersion + "成功!"); + public Result publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId, + @RequestParam(name="cut") String cut) { + int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId, cut); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("发布版本：" + publishVersion + " 成功！"); + } else { + return Result.OK("Publish version:" + publishVersion + " success!"); + } } /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index 46bb57d69..cdca194aa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -135,4 +135,7 @@ public class ParamsInfoEO implements Serializable { @TableField(exist = false) private List certCategoryParamsInfoEOList; // 认证类别参数列表 + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java index 1c0f1bfb4..3beeb783d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java @@ -11,16 +11,16 @@ import java.util.Map; * @Date: Created in 15:51 2022/4/22 */ public enum ControlTypeEnum { - TEXT("文本", "text","1"), - 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_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("文本", "Text","1"), + 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_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"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java index 0234d1fa8..b8b399e51 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java @@ -11,15 +11,15 @@ import java.util.Map; * @Date: Created in 15:58 2022/4/22 */ public enum ControlVerifyEnum { - NULL("无","null","1"), - CHINESE("中文","chinese","2"), - POSITIVE_INTEGER("正整数","positive integer","3"), - POSITIVE_FLOAT("正浮点数","positive float","4"), - INTEGER_DECIMAL("整数或小数","integer decimal","5"), - DECIMAL_ONE("一位小数","decimal one","6"), - DECIMAL_TWO("两位小数","decimal two","7"), - DECIMAL_THREE("三位小数","decimal three","8"), - DECIMAL_FOUR("四位小数","decimal four","9"); + NULL("无","Null","1"), + CHINESE("中文","Chinese","2"), + POSITIVE_INTEGER("正整数","Positive integer","3"), + POSITIVE_FLOAT("正浮点数","Positive float","4"), + INTEGER_DECIMAL("整数或小数","Integer decimal","5"), + DECIMAL_ONE("一位小数","Decimal one","6"), + DECIMAL_TWO("两位小数","Decimal two","7"), + DECIMAL_THREE("三位小数","Decimal three","8"), + DECIMAL_FOUR("四位小数","Decimal four","9"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java index 27e4cc10a..5c8ea1caf 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java @@ -11,8 +11,8 @@ import java.util.Map; * @Date: Created in 11:20 2022/4/14 */ public enum ParamsIsMustEnum { - YES("是","yes","1"), - NO("否","no","0"); + YES("是","Yes","1"), + NO("否","No","0"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java index d5f9c7ccb..3d9873de7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java @@ -61,7 +61,7 @@ public interface IParamsInfoPublishEOService extends IService getListByPublishVersion(String paramsTemplateId, int publishVersion); - int publishTemplate(String paramsTemplateId); + int publishTemplate(String paramsTemplateId, String cut); Integer getNewestVersionByParamsTemplateId(String paramsTemplateId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java index 38c84bfd6..34ef8920a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.modules.cert.template.service.ICertCategoryParamsInfoEOService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.Date; import java.util.List; @@ -17,6 +18,7 @@ import java.util.List; * @Version: V1.0 */ @Service +@Transactional public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl implements ICertCategoryParamsInfoEOService { @Autowired diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java index 4125d0c14..a38df667b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.modules.cert.template.mapper.CertCategoryParamsInfoPublishEOMapp import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.Date; import java.util.List; @@ -17,6 +18,7 @@ import java.util.List; * @Version: V1.0 */ @Service +@Transactional public class CertCategoryParamsInfoPublishEOServiceImpl extends ServiceImpl implements ICertCategoryParamsInfoPublishEOService { /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 56f0677fe..e4a311b2e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.aspectj.util.FileUtil; import org.checkerframework.checker.units.qual.C; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -101,14 +102,23 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); + queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId()); List paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { - throw new JeroBootException("NIO编号已存在！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("NIO编号已存在！"); + } else { + throw new JeroBootException("NIO number already exists!"); + } } // 批量添加认证类别参数 @@ -117,9 +127,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccParamsInfoList = certCategoryParamsInfoEOList.stream() .collect(Collectors.collectingAndThen(Collectors - .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getCertCategory() + ";" + o.getParamsNumber()))), ArrayList::new)); + .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getParamsNumber()))), ArrayList::new)); if (ccParamsInfoList.size() < certCategoryParamsInfoEOList.size()) { - throw new JeroBootException("不同类别间参数编号必须唯一！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("不同类别间参数编号必须唯一！"); + } else { + throw new JeroBootException("Parameter number must be unique among the different categories!"); + } } certCategoryParamsInfoEOList.forEach(certCategoryParamsInfoEO -> { certCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); @@ -166,16 +180,25 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); + queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId()); List paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { - throw new JeroBootException("NIO编号已存在！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("NIO编号已存在！"); + } else { + throw new JeroBootException("NIO number already exists!"); + } } } @@ -189,9 +212,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccParamsInfoList = certCategoryParamsInfoEOList.stream() .collect(Collectors.collectingAndThen(Collectors - .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getCertCategory() + ";" + o.getParamsNumber()))), ArrayList::new)); + .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getParamsNumber()))), ArrayList::new)); if (ccParamsInfoList.size() < certCategoryParamsInfoEOList.size()) { - throw new JeroBootException("不同类别间参数编号必须唯一！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("不同类别间参数编号必须唯一！"); + } else { + throw new JeroBootException("Parameter number must be unique among the different categories!"); + } } certCategoryParamsInfoEOList.forEach(certCategoryParamsInfoEO -> { @@ -233,7 +260,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 不能删 发布版用的同一文件 return removeById(id); } @@ -253,7 +280,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nioNumberList = paramsInfoEOList.stream().map(ParamsInfoEO::getNioNumber).collect(Collectors.toList()); // 关联删除认证类别参数项 certCategoryParamsInfoEOService.deleteByNioNumberList(nioNumberList, paramsTemplateId); - // TODO 关联删除附件模板文件信息和文件 + // 关联删除附件模板文件信息和文件 ---> 不能删 发布版用的同一文件 } return removeByIds(ids); @@ -279,10 +306,20 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl c.getItemValue(), c -> c.getEnName())); } - for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOList) { - certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + + List certCategoryParamsInfoEOListOrdered = new ArrayList<>(); + for (SysDictItem sysDictItem : sysDictItemList) { + List certCategoryParamsInfoEOS = certCategoryParamsInfoEOList.stream() + .filter(e->sysDictItem.getItemValue().equals(e.getCertCategory())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOS)) { + CertCategoryParamsInfoEO certCategoryParamsInfoEO = certCategoryParamsInfoEOS.get(0); + certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + + certCategoryParamsInfoEOListOrdered.add(certCategoryParamsInfoEO); + } } - paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList); + + paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOListOrdered); return paramsInfoEO; } @@ -372,7 +409,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getCnExportSheetsList(List paramsInfoEOList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEOList)) { - throw new JeroBootException("没有可导出的数据"); + throw new JeroBootException("没有可导出的数据！"); } List fileTemplateList = new ArrayList<>(); @@ -545,7 +599,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getEnExportSheetsList(List paramsInfoEnExportList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEnExportList)) { - throw new JeroBootException("没有可导出的数据"); + throw new JeroBootException("No data available for export!"); } List fileTemplateList = new ArrayList<>(); @@ -710,7 +764,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); @@ -774,10 +828,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); List paramsInfoEOListEn = resultEn.getList(); copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); } else { + String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*技术领域","*参数批次","*责任领域", + "参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"}; + params.setImportFields(fields); + ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, ParamsInfoCnImport.class, params); paramsInfoEOList = result.getList(); } @@ -785,10 +847,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { + String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"}; + params.setImportFields(fields); + ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); List listEn = resultEn.getList(); copycertCategoryParamsInfoList(listEn, list); } else { + String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"}; + params.setImportFields(fields); + ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); list = result.getList(); } @@ -1027,12 +1095,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl stringMessage = new ArrayList<>(); + List nioNumberImport = new ArrayList<>(); // 记录导入的nio编号 + int i = 1; //记录行号 - int num = 0; //记录是第几条数据 //循环验证数据 for (ParamsInfoCnImport dto : paramsInfoEOList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(dto)) { + i++; continue; } @@ -1048,24 +1118,42 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - resultMap = validateMustAndLength(nioNumber, "nio编号", "nio number", IsMustEnum.YES.getValue(),"15", false, cut); + resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"15", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { // 校验nio编号 格式：字母数字横杠（-） String nioNumberRegex = "^[A-Za-z0-9-]+$"; if (!nioNumber.matches(nioNumberRegex)) { - errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)"; + if(CutEnum.CN.getValue().equals(cut)) { + errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)；"; + } else { + errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);"; + } countError++; } + if (CollectionUtil.isNotEmpty(nioNumberImport)) { + if (nioNumberImport.contains(dto.getNioNumber())) { + if (CutEnum.CN.getValue().equals(cut)) { + errorMsg += "NIO编号重复！"; + } else { + errorMsg += "NIO number already exists!"; + } + countError++; + } else { + nioNumberImport.add(dto.getNioNumber()); + } + } else { + nioNumberImport.add(dto.getNioNumber()); + } } // 是否必填 String isMust = dto.getIsMust(); - resultMap = validateMustAndLength(isMust, "是否必填", "is must", IsMustEnum.YES.getValue(), "50", false, cut); + resultMap = validateMustAndLength(isMust, "是否必填", "Is Must", IsMustEnum.YES.getValue(), "50", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); - resultMap = getCodeByName(isMust,"是否必填","is must","enum",paramsIsMustEnumMap,null,null,cut); + resultMap = getCodeByName(isMust,"是否必填","Is Must","enum",paramsIsMustEnumMap,null,null,cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); isMust = (String)resultMap.get("value"); @@ -1073,16 +1161,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(filepath, fileName); + List nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null); +// List nowFileList = FileUnZip.readFileByFilename(filepath, fileName); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += "附件模板压缩包中没有" + fileName + "文件; "; @@ -1229,10 +1318,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> ccDtoMap : certCategoryParamsInfoEOListMap.entrySet()) { String certCategory = ccDtoMap.getKey(); List ccDtoList = ccDtoMap.getValue(); + + List ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号 + int j = 1; for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(ccDto)) { + j++; continue; } @@ -1242,36 +1335,66 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = ccDto.getNioNumber(); - resultMap = validateMustAndLength(nioNumber, "nio编号", "nio number", IsMustEnum.YES.getValue(),"15", false, cut); + resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO number", IsMustEnum.YES.getValue(),"15", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(ccDto.getNioNumber())) { // 校验nio编号 格式：字母数字横杠（-） String nioNumberRegex = "^[A-Za-z0-9-]+$"; if (!nioNumber.matches(nioNumberRegex)) { - errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)"; + if(CutEnum.CN.getValue().equals(cut)) { + errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)；"; + } else { + errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);"; + } countError++; } + if (CollectionUtil.isNotEmpty(ccNioNumberImport)) { + if (ccNioNumberImport.contains(ccDto.getNioNumber())) { + if (CutEnum.CN.getValue().equals(cut)) { + errorMsg += "NIO编号重复！"; + } else { + errorMsg += "NIO number already exists!"; + } + countError++; + } else { + ccNioNumberImport.add(ccDto.getNioNumber()); + } + } else { + ccNioNumberImport.add(ccDto.getNioNumber()); + } } // 编号 String paramsNumber = ccDto.getParamsNumber(); - resultMap = validateMustAndLength(paramsNumber, "编号", "number", IsMustEnum.YES.getValue(),"15", false, cut); + resultMap = validateMustAndLength(paramsNumber, "编号", "Number", IsMustEnum.YES.getValue(),"15", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); + if (StringUtils.isNotEmpty(ccDto.getParamsNumber())) { + // 校验编号 格式：字母数字横杠（-） + String numberRegex = "^[A-Za-z0-9-]+$"; + if (!paramsNumber.matches(numberRegex)) { + if(CutEnum.CN.getValue().equals(cut)) { + errorMsg += "编号格式错误，仅能为字母，数字，横杠(-)；"; + } else { + errorMsg += "Number formatting errors, can only letters, numbers, dash (-);"; + } + countError++; + } + } // 参数名称 String paramsName = ccDto.getParamsName(); - resultMap = validateMustAndLength(paramsName, "参数名称", "params name", IsMustEnum.YES.getValue(),"30", false, cut); + resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(),"30", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); // 参数说明 String description = ccDto.getDescription(); - resultMap = validateMustAndLength(description, "参数说明", "description", IsMustEnum.NO.getValue(),"200", false, cut); + resultMap = validateMustAndLength(description, "参数说明", "Description", IsMustEnum.NO.getValue(),"200", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); @@ -1279,17 +1402,42 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccDtoAfterDistinct = ccDtoList.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); + if (ccDtoAfterDistinct.size() < ccDtoList.size()) { + // 取差集 + String reduceOne = ccDtoList.stream() + .filter(e->!ccDtoAfterDistinct.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); + if (StringUtils.isNotBlank(reduceOne)) { + if (CutEnum.CN.getValue().equals(cut)) { + stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；"); + } else { + stringMessage.add("Repeat cert category exist in NIO Number: " + reduceOne + ";"); + } + } + } + certCategoryParamsInfoEOList.addAll(ccDtoList); } // 校验同 nio下认证参数编号唯一 - List ccDtoAfterDistinct = certCategoryParamsInfoEOList.stream() + List ccDtoAfterDistinctTwo = certCategoryParamsInfoEOList.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> - new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); - if (ccDtoAfterDistinct.size() < certCategoryParamsInfoEOList.size()) { - stringMessage.add("导入数据中存在重复认证编号；"); + new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getParamsNumber()))), ArrayList::new)); + if (ccDtoAfterDistinctTwo.size() < certCategoryParamsInfoEOList.size()) { + // 取差集 + String reduceTwo = certCategoryParamsInfoEOList.stream() + .filter(e->!ccDtoAfterDistinctTwo.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); + if (StringUtils.isNotBlank(reduceTwo)) { + if (CutEnum.CN.getValue().equals(cut)) { + stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；"); + } else { + stringMessage.add("Repeat number exist in NIO Number: " + reduceTwo + ";"); + } + } } - Map map = new HashMap(); if (stringMessage.isEmpty()) { map.put("result", true); @@ -1318,6 +1466,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl listAfterDistinct = listAll.stream() + .filter(e->StringUtils.isNotEmpty(e.getNioNumber()) && StringUtils.isNotEmpty(e.getCertCategory())) .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); listAfterDistinct.forEach(item -> { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java index a0def11b1..2f89eed11 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.cert.template.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.template.entity.*; @@ -13,6 +14,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,6 +27,7 @@ import java.util.UUID; * @Version: V1.0 */ @Service +@Transactional public class ParamsInfoPublishEOServiceImpl extends ServiceImpl implements IParamsInfoPublishEOService { @Autowired @@ -120,11 +123,15 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl sourceParamsInfoEOList = paramsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); if (CollectionUtil.isEmpty(sourceParamsInfoEOList)) { - throw new JeroBootException("没有可发布的参数项！"); // 模板中没有参数项，不让发布 + if (CutEnum.EN.getValue().equals(cut)) { + throw new JeroBootException("Please add parameters before publish!"); // 模板中没有参数项，不让发布 + } else { + throw new JeroBootException("请添加参数后再发布！"); // 模板中没有参数项，不让发布 + } } List sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java index 1c670f7bd..8e69d4f13 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,6 +28,7 @@ import java.util.UUID; * @Version: V1.0 */ @Service +@Transactional public class ParamsTemplateEOServiceImpl extends ServiceImpl implements IParamsTemplateEOService { @Autowired diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java index fc5e43960..fbac7d23f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java @@ -52,7 +52,7 @@ public class CertCategoryParamsInfoEnImport { private String paramsName; /**参数说明*/ - @Excel(name = "参数说明", width = 36, orderNum = "4") + @Excel(name = "Description", width = 36, orderNum = "4") @ApiModelProperty(value = "参数说明") private String description; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index b5dd68d1d..e4e9b0339 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -89,12 +89,12 @@ public class ParamsInfoEnExport { private String certCategory; /**控件类型*/ - @Excel(name = "*Control Type", width = 15, replace = {"text_1","pull single_2","pull more_3","file_4","text+pull single_5","text+pull more_6","text+file_7","pull single+file_8","pull more+file_9","text+pull single+file_10"}) + @Excel(name = "*Control Type", width = 15, replace = {"Text_1","Pull single_2","Pull more_3","File_4","Text+Pull single_5","Text+Pull more_6","Text+File_7","Pull single+File_8","Pull more+File_9","Text+Pull single+File_10"}) @ApiModelProperty(value = "控件类型") private String controlType; /**控件校验*/ - @Excel(name = "Control Verify", width = 15, replace = {"null_1","chinese_2","positive integer_3","positive float_4","integer decimaL_5","decimal one_6","decimal two_7","decimal three_8","decimal four_9"}) + @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"}) @ApiModelProperty(value = "控件校验") private String controlVerify; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 4d12498a0..6786e76ff 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -111,6 +111,16 @@ public class OSSFileServiceImpl extends ServiceImpl impl throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！"); } } + } else if ("2".equals(state)) { + String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX"; + //固定文件 + if (!fileTypeStrTwo.contains(fileType)) { + if (cut.equals(CutEnum.CN.getValue())) { + throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！"); + } else { + throw new JeroBootException("Only upload word,excel type of file Please select the file again！"); + } + } } else { if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) { if (cut.equals(CutEnum.CN.getValue())) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 825cb6866..8ad2c2c07 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -53,6 +53,9 @@ public class BussDocumentLibraryEO implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") private java.lang.String region; + /**适用地区*/ + @ApiModelProperty(value = "类别") + private java.lang.String lei4Bie2; /**状态*/ @ApiModelProperty(value = "状态") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml index aa1e7acd8..806a6daaa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml @@ -12,6 +12,7 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index fe6c9e3f8..2a201f721 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3574,8 +3574,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { + public String getConditionStr(Map parameter) { String cut = (String) parameter.get("cut"); + String flag = String.valueOf(parameter.get("flag")); //查询条件 StringBuilder conditionSb = new StringBuilder("where 1 = 1"); @@ -3640,6 +3641,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + warnTime.split(",")[0] + "'" + + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); + } + }else{ + //日期(区分单日期还时间范围) + if (warnTime.contains(",")) { + conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" + + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); + } + } + } + //高级搜索 queryConditionVOList List if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ String queryConditionVOListStr = (String) parameter.get("queryConditionVOList"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java index 9e144a470..ab3e9e5bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java @@ -7,7 +7,8 @@ package com.jero.modules.dummy.enums; */ public enum InventoryStateEnum { ISSUE("已发布","1"), - DRAFT("草稿","2"); + DRAFT("草稿","2"), + TO_BE_RELEASED("待发布","2"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java new file mode 100644 index 000000000..80885a019 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.lawsOpinionGather.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.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Api(tags="法规意见收集-评估结果表") +@RestController +@RequestMapping("/lawsOpinionGather/lawsOpinionAssessmentResultEO") +@Slf4j +public class LawsOpinionAssessmentResultEOController extends JeroController { + @Autowired + private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService; + + /** + * 分页列表查询 + * + * @param lawsOpinionAssessmentResultEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-分页列表查询") + @ApiOperation(value="法规意见收集-评估结果表-分页列表查询", notes="法规意见收集-评估结果表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsOpinionAssessmentResultEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-列表查询") + @ApiOperation(value="法规意见收集-评估结果表-列表查询", notes="法规意见收集-评估结果表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsOpinionAssessmentResultEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-添加") + @ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + lawsOpinionAssessmentResultEOService.add(lawsOpinionAssessmentResultEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-编辑") + @ApiOperation(value="法规意见收集-评估结果表-编辑", notes="法规意见收集-评估结果表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + lawsOpinionAssessmentResultEOService.editById(lawsOpinionAssessmentResultEO); + 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) { + lawsOpinionAssessmentResultEOService.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.lawsOpinionAssessmentResultEOService.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) { + LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO = lawsOpinionAssessmentResultEOService.queryById(id); + if(lawsOpinionAssessmentResultEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsOpinionAssessmentResultEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsOpinionAssessmentResultEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + return super.exportXls(request, lawsOpinionAssessmentResultEO, LawsOpinionAssessmentResultEO.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, LawsOpinionAssessmentResultEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java new file mode 100644 index 000000000..922d15e25 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java @@ -0,0 +1,184 @@ +package com.jero.modules.lawsOpinionGather.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.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Api(tags="法规意见收集表") +@RestController +@RequestMapping("/lawsOpinionGather/lawsOpinionGatherEO") +@Slf4j +public class LawsOpinionGatherEOController extends JeroController { + @Autowired + private ILawsOpinionGatherEOService lawsOpinionGatherEOService; + + /** + * 分页列表查询 + * + * @param lawsOpinionGatherEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规意见收集表-分页列表查询") + @ApiOperation(value="法规意见收集表-分页列表查询", notes="法规意见收集表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsOpinionGatherEO lawsOpinionGatherEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsOpinionGatherEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规意见收集表-列表查询") + @ApiOperation(value="法规意见收集表-列表查询", notes="法规意见收集表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsOpinionGatherEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsOpinionGatherEO + * @return + */ + @AutoLog(value = "法规意见收集表-添加") + @ApiOperation(value="法规意见收集表-添加", notes="法规意见收集表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsOpinionGatherEO lawsOpinionGatherEO) { + lawsOpinionGatherEOService.add(lawsOpinionGatherEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsOpinionGatherEO + * @return + */ + @AutoLog(value = "法规意见收集表-编辑") + @ApiOperation(value="法规意见收集表-编辑", notes="法规意见收集表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsOpinionGatherEO lawsOpinionGatherEO) { + lawsOpinionGatherEOService.editById(lawsOpinionGatherEO); + 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) { + lawsOpinionGatherEOService.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.lawsOpinionGatherEOService.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) { + LawsOpinionGatherEO lawsOpinionGatherEO = lawsOpinionGatherEOService.queryById(id); + if(lawsOpinionGatherEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsOpinionGatherEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsOpinionGatherEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsOpinionGatherEO lawsOpinionGatherEO) { + return super.exportXls(request, lawsOpinionGatherEO, LawsOpinionGatherEO.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, LawsOpinionGatherEO.class); + } + + /** + * 流程调用接口 + * @param jsonObject + * @return + */ + @AutoLog(value = "法规意见收集表-流程调用") + @ApiOperation(value="法规意见收集表-流程调用", notes="法规意见收集表-流程调用") + @PostMapping(value = "/processCall") + public Result processCall(@RequestBody JSONObject jsonObject){ + return this.lawsOpinionGatherEOService.processCall(jsonObject); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java new file mode 100644 index 000000000..15ec36e61 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java @@ -0,0 +1,184 @@ +package com.jero.modules.lawsOpinionGather.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.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Api(tags="法规-流程历史表") +@RestController +@RequestMapping("/lawsOpinionGather/lawsProcessHistoryEO") +@Slf4j +public class LawsProcessHistoryEOController extends JeroController { + @Autowired + private ILawsProcessHistoryEOService lawsProcessHistoryEOService; + + /** + * 分页列表查询 + * + * @param lawsProcessHistoryEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规-流程历史表-分页列表查询") + @ApiOperation(value="法规-流程历史表-分页列表查询", notes="法规-流程历史表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsProcessHistoryEO lawsProcessHistoryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsProcessHistoryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsProcessHistoryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规-流程历史表-列表查询") + @ApiOperation(value="法规-流程历史表-列表查询", notes="法规-流程历史表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsProcessHistoryEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsProcessHistoryEO + * @return + */ + @AutoLog(value = "法规-流程历史表-添加") + @ApiOperation(value="法规-流程历史表-添加", notes="法规-流程历史表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsProcessHistoryEO lawsProcessHistoryEO) { + lawsProcessHistoryEOService.add(lawsProcessHistoryEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsProcessHistoryEO + * @return + */ + @AutoLog(value = "法规-流程历史表-编辑") + @ApiOperation(value="法规-流程历史表-编辑", notes="法规-流程历史表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsProcessHistoryEO lawsProcessHistoryEO) { + lawsProcessHistoryEOService.editById(lawsProcessHistoryEO); + 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) { + lawsProcessHistoryEOService.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.lawsProcessHistoryEOService.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) { + LawsProcessHistoryEO lawsProcessHistoryEO = lawsProcessHistoryEOService.queryById(id); + if(lawsProcessHistoryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsProcessHistoryEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsProcessHistoryEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsProcessHistoryEO lawsProcessHistoryEO) { + return super.exportXls(request, lawsProcessHistoryEO, LawsProcessHistoryEO.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, LawsProcessHistoryEO.class); + } + + /** + * 流程调用接口 + * @param jsonObject + * @return + */ + @AutoLog(value = "法规-流程历史表-流程调用") + @ApiOperation(value="法规-流程历史表-流程调用", notes="法规-流程历史表-流程调用") + @PostMapping(value = "/processCall") + public Result processCall(@RequestBody JSONObject jsonObject){ + return this.lawsProcessHistoryEOService.processCall(jsonObject); + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java new file mode 100644 index 000000000..a7712bfbf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java @@ -0,0 +1,98 @@ +package com.jero.modules.lawsOpinionGather.entity; + +import java.io.Serializable; +import java.util.Date; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Data +@TableName("laws_opinion_assessment_result") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_opinion_assessment_result对象", description="法规意见收集-评估结果表") +public class LawsOpinionAssessmentResultEO 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 lawsOpinionGatherId; + + /**相关章节*/ + @Excel(name = "相关章节", width = 15) + @ApiModelProperty(value = "相关章节") + private String relatedSection; + + /**问题/建议*/ + @Excel(name = "问题/建议", width = 15) + @ApiModelProperty(value = "问题/建议") + private String issueOrSuggest; + + /**理由*/ + @Excel(name = "理由", width = 15) + @ApiModelProperty(value = "理由") + private String reason; + + /**附件*/ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private String accessoryFile; + + /**提出时间*/ + @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 submitTime; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private String actiProcInstId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java new file mode 100644 index 000000000..aa759104e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java @@ -0,0 +1,100 @@ +package com.jero.modules.lawsOpinionGather.entity; + +import java.io.Serializable; +import java.util.Date; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Data +@TableName("laws_opinion_gather") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_opinion_gather对象", description="法规意见收集表") +public class LawsOpinionGatherEO 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; + + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private String title; + + /**技术领域*/ + @Excel(name = "技术领域", width = 15) + @ApiModelProperty(value = "技术领域") + private String technologyTerritory; + + /**收集结果*/ + @Excel(name = "收集结果", width = 15) + @ApiModelProperty(value = "收集结果") + private String gatherResult; + + /**发起日期*/ + @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 startTime; + + /**截止日期*/ + @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 endTime; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private String actiProcInstId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java new file mode 100644 index 000000000..6ac820d97 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java @@ -0,0 +1,93 @@ +package com.jero.modules.lawsOpinionGather.entity; + +import java.io.Serializable; +import java.util.Date; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Data +@TableName("laws_process_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_process_history对象", description="法规-流程历史表") +public class LawsProcessHistoryEO 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 actiProcInstId; + + /**操作节点*/ + @Excel(name = "操作节点", width = 15) + @ApiModelProperty(value = "操作节点") + private String taskDefinitionKey; + + /**操作人id*/ + @Excel(name = "操作人id", width = 15) + @ApiModelProperty(value = "操作人id") + private String operatorPersonId; + + /**操作角色编码*/ + @Excel(name = "操作角色编码", width = 15) + @ApiModelProperty(value = "操作角色编码") + private String operatorRoleCode; + + /**操作时间*/ + @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 operatorTime; + + /**流程类型*/ + @Excel(name = "流程类型", width = 15) + @ApiModelProperty(value = "流程类型") + private String flowType; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java new file mode 100644 index 000000000..777f4ed77 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java @@ -0,0 +1,63 @@ +package com.jero.modules.lawsOpinionGather.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 收集结果枚举类 + */ +public enum GatherResultEnum { + + UNDERWAY("进行中","underway","underway"), + COMPLETED("已完成","completed","completed"), + ; + + + String cnName; + String enName; + String value; + + private GatherResultEnum(String cnName, String value, String enName) { + this.cnName = cnName; + this.value = value; + this.enName = enName; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + GatherResultEnum[] values = values(); + for (GatherResultEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return taskStatusEnum.cnName; + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + return taskStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java new file mode 100644 index 000000000..aca50df1e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsOpinionGather.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface LawsOpinionAssessmentResultEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java new file mode 100644 index 000000000..3f6ef09fe --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsOpinionGather.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface LawsOpinionGatherEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java new file mode 100644 index 000000000..72c33aea1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsOpinionGather.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface LawsProcessHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml new file mode 100644 index 000000000..92b82189e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml new file mode 100644 index 000000000..0b11179f6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml new file mode 100644 index 000000000..43244944a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java new file mode 100644 index 000000000..8be4646a9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.lawsOpinionGather.service; + +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface ILawsOpinionAssessmentResultEOService extends IService { + + /** + * 保存 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + void add(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO); + + /** + * 更新 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + void editById(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsOpinionAssessmentResultEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java new file mode 100644 index 000000000..e1a0cbe59 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java @@ -0,0 +1,70 @@ +package com.jero.modules.lawsOpinionGather.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface ILawsOpinionGatherEOService extends IService { + + /** + * 保存 + * + * @param lawsOpinionGatherEO + * @return + */ + void add(LawsOpinionGatherEO lawsOpinionGatherEO); + + /** + * 更新 + * + * @param lawsOpinionGatherEO + * @return + */ + void editById(LawsOpinionGatherEO lawsOpinionGatherEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsOpinionGatherEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java new file mode 100644 index 000000000..7d52e881e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java @@ -0,0 +1,70 @@ +package com.jero.modules.lawsOpinionGather.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface ILawsProcessHistoryEOService extends IService { + + /** + * 保存 + * + * @param lawsProcessHistoryEO + * @return + */ + void add(LawsProcessHistoryEO lawsProcessHistoryEO); + + /** + * 更新 + * + * @param lawsProcessHistoryEO + * @return + */ + void editById(LawsProcessHistoryEO lawsProcessHistoryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsProcessHistoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java new file mode 100644 index 000000000..ee57a53d0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.lawsOpinionGather.service.impl; + +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Service +public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl implements ILawsOpinionAssessmentResultEOService { + + /** + * 保存 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @Override + public void add(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + Date now = new Date(); + lawsOpinionAssessmentResultEO.setCreateTime(now); + lawsOpinionAssessmentResultEO.setUpdateTime(now); + save(lawsOpinionAssessmentResultEO); + } + + /** + * 更新 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @Override + public void editById(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + Date now = new Date(); + lawsOpinionAssessmentResultEO.setUpdateTime(now); + saveOrUpdate(lawsOpinionAssessmentResultEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsOpinionAssessmentResultEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java new file mode 100644 index 000000000..f1b8735fd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -0,0 +1,127 @@ +package com.jero.modules.lawsOpinionGather.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Service +public class LawsOpinionGatherEOServiceImpl extends ServiceImpl implements ILawsOpinionGatherEOService { + + /** + * 保存 + * + * @param lawsOpinionGatherEO + * @return + */ + @Override + public void add(LawsOpinionGatherEO lawsOpinionGatherEO) { + Date now = new Date(); + lawsOpinionGatherEO.setCreateTime(now); + lawsOpinionGatherEO.setUpdateTime(now); + save(lawsOpinionGatherEO); + } + + /** + * 更新 + * + * @param lawsOpinionGatherEO + * @return + */ + @Override + public void editById(LawsOpinionGatherEO lawsOpinionGatherEO) { + Date now = new Date(); + lawsOpinionGatherEO.setUpdateTime(now); + saveOrUpdate(lawsOpinionGatherEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsOpinionGatherEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD_LAWS_OPINION_GATHER.getValue())){ + Object lawsOpinionGatherInfoJson = jsonObject.get("lawsOpinionGatherInfo"); + LawsOpinionGatherEO lawsOpinionGatherEO = JSONObject.parseObject( + JSONObject.toJSONString(lawsOpinionGatherInfoJson),LawsOpinionGatherEO.class + ); + this.baseMapper.insert(lawsOpinionGatherEO); + } + + if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT.getValue())){ + LawsOpinionGatherEO lawsOpinionGatherEO = new LawsOpinionGatherEO(); + lawsOpinionGatherEO.setId(jsonObject.getString("id")); + lawsOpinionGatherEO.setGatherResult(jsonObject.getString("gatherResult")); + this.baseMapper.updateById(lawsOpinionGatherEO); + } + return new Result<>().success("调用成功！"); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java new file mode 100644 index 000000000..77599194d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java @@ -0,0 +1,126 @@ +package com.jero.modules.lawsOpinionGather.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Service +public class LawsProcessHistoryEOServiceImpl extends ServiceImpl implements ILawsProcessHistoryEOService { + + /** + * 保存 + * + * @param lawsProcessHistoryEO + * @return + */ + @Override + public void add(LawsProcessHistoryEO lawsProcessHistoryEO) { + Date now = new Date(); + lawsProcessHistoryEO.setCreateTime(now); + lawsProcessHistoryEO.setUpdateTime(now); + save(lawsProcessHistoryEO); + } + + /** + * 更新 + * + * @param lawsProcessHistoryEO + * @return + */ + @Override + public void editById(LawsProcessHistoryEO lawsProcessHistoryEO) { + Date now = new Date(); + lawsProcessHistoryEO.setUpdateTime(now); + saveOrUpdate(lawsProcessHistoryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsProcessHistoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){ + JSONArray lawsProcessHistoryEOArray = jsonObject.getJSONArray("lawsProcessHistoryEOList"); + List lawsProcessHistoryEOList = new ArrayList<>(); + LawsProcessHistoryEO lawsProcessHistoryEO = null; + for (Object lawsProcessHistory : lawsProcessHistoryEOArray) { + lawsProcessHistoryEO = JSONObject.parseObject(JSONObject.toJSONString(lawsProcessHistory),LawsProcessHistoryEO.class); + lawsProcessHistoryEOList.add(lawsProcessHistoryEO); + } + this.saveBatch(lawsProcessHistoryEOList); + } + + return new Result<>().success("调用成功！"); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 7ec3d757c..145dfceda 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -36,6 +36,9 @@ public enum OperatorTypeEnum { QUERY_PREHOMO_STATISTICS("查询prehomo统计","queryPrehomoStatistics"), QUERY_VERIFY_STATISTICS("查询验证符合性统计","queryVerifyStatistics"), QUERY_CERTIFICATION_PROGRESS_STATISTICS("查询认证进度统计","queryCertificationProgressStatistics"), + + ADD_LAWS_OPINION_GATHER("添加法规意见收集数据","addLawsOpinionGather"), + UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT("更新法规意见收集数据收集结果","updateLawsOpinionGatherGatherResult"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index 97c121ef3..65f095b9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -141,15 +141,12 @@ public class InventoryAffirmJob implements Job { //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() - + projectLibraryBase.getId() - + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -173,13 +170,11 @@ public class InventoryAffirmJob implements Job { + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index a38c101b0..1b5f65d22 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -145,13 +145,11 @@ public class PrehomoJob implements Job { + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -176,13 +174,11 @@ public class PrehomoJob implements Job { + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index fef21de5a..ec99745d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -143,13 +143,11 @@ public class VerifyComplianceJob implements Job { + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -174,13 +172,11 @@ public class VerifyComplianceJob implements Job { + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index 3e51e1e8a..0259c57fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -140,17 +140,10 @@ public class designComplianceJob implements Job { + " are 3 days. Please check and address it in a timely manner."; //飞书跳转链接 - String hrefFeishu = backUrl - + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() - + projectLibraryBase.getId() - + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -174,13 +167,11 @@ public class designComplianceJob implements Job { + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index ed7f56542..b5b732ec5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1109,13 +1109,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -1634,7 +1632,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; @@ -1653,17 +1653,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(","))); List projectLawsInventoryEOList = this.list(wrapper); - List projectTaskInventoryEOList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { - - String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", ""); - projectLawsInventoryEO.setId(projectLawsInventoryId); - - ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); - String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); - projectTaskInventoryEO.setId(projectTaskInventoryId); - projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId); - projectTaskInventoryEOList.add(projectTaskInventoryEO); + projectLawsInventoryEO.setId(UUID.randomUUID().toString().replace("-", "")); } this.saveBatch(projectLawsInventoryEOList); @@ -1676,9 +1667,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); -// updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId()); -// setDateNull(lawsInventoryEO, updateWrapper); -// //保存 -// this.update(lawsInventoryEO,updateWrapper); -// } +// this.updateBatchById(projectLawsInventoryEOList); + for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId()); + setDateNull(lawsInventoryEO, updateWrapper); + //保存 + this.update(lawsInventoryEO,updateWrapper); + } //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -5808,15 +5791,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index fae17e73f..c32566eed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -283,13 +283,11 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index c7b9d5a1e..6e5ee0d93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -337,15 +337,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -610,10 +607,6 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl projectYearInfoEOQueryWrapper = new QueryWrapper<>(); - projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); - ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); - SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); String msgContentEN = ""; @@ -633,13 +626,11 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java new file mode 100644 index 000000000..dcaf92ed1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java @@ -0,0 +1,193 @@ +package com.jero.modules.report.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.report.entity.LawsMonthlyReportManageEO; +import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +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.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +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: 2022-06-28 + * @Version: V1.0 + */ +@Api(tags="法规月报管理") +@RestController +@RequestMapping("/report/lawsMonthlyReportManageEO") +@Slf4j +public class LawsMonthlyReportManageEOController extends JeroController { + @Autowired + private ILawsMonthlyReportManageEOService lawsMonthlyReportManageEOService; + + /** + * 分页列表查询 + * + * @param lawsMonthlyReportManageEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规月报管理-分页列表查询") + @ApiOperation(value="法规月报管理-分页列表查询", notes="法规月报管理-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsMonthlyReportManageEO lawsMonthlyReportManageEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportManageEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsMonthlyReportManageEOService.getPageInfo(page, queryWrapper); + return Result.OK(lawsMonthlyReportManageEO.getCut(),pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规月报管理-列表查询") + @ApiOperation(value="法规月报管理-列表查询", notes="法规月报管理-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsMonthlyReportManageEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsMonthlyReportManageEO + * @return + */ + @AutoLog(value = "法规月报管理-添加") + @ApiOperation(value="法规月报管理-添加", notes="法规月报管理-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + lawsMonthlyReportManageEOService.add(lawsMonthlyReportManageEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsMonthlyReportManageEO + * @return + */ + @AutoLog(value = "法规月报管理-编辑") + @ApiOperation(value="法规月报管理-编辑", notes="法规月报管理-编辑") + @GetMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + lawsMonthlyReportManageEOService.editById(lawsMonthlyReportManageEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规月报管理-通过id删除") + @ApiOperation(value="法规月报管理-通过id删除", notes="法规月报管理-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsMonthlyReportManageEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规月报管理-批量删除") + @ApiOperation(value="法规月报管理-批量删除", notes="法规月报管理-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsMonthlyReportManageEOService.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) { + LawsMonthlyReportManageEO lawsMonthlyReportManageEO = lawsMonthlyReportManageEOService.queryById(id); + if(lawsMonthlyReportManageEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsMonthlyReportManageEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsMonthlyReportManageEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + return super.exportXls(request, lawsMonthlyReportManageEO, LawsMonthlyReportManageEO.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, LawsMonthlyReportManageEO.class); + } + + + + @AutoLog(value = "发布") + @ApiOperation(value="发布", notes="发布") + @PostMapping(value = "/issue") +// @RequiresPermissions("dummyInventoryBase:issue") + public Result issue(@RequestBody LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + try { + lawsMonthlyReportManageEOService.issue(lawsMonthlyReportManageEO); + } catch (Exception e) { + return Result.error("操作失败"); + } + return Result.OK("操作成功"); + + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java new file mode 100644 index 000000000..55495b7ba --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.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.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 月报标题模板 + * @Author: jero-boot + * @Date: 2022-06-29 + * @Version: V1.0 + */ +@Api(tags="月报标题模板") +@RestController +@RequestMapping("/report/lawsMonthlyReportTitleTemplateEO") +@Slf4j +public class LawsMonthlyReportTitleTemplateEOController extends JeroController { + @Autowired + private ILawsMonthlyReportTitleTemplateEOService lawsMonthlyReportTitleTemplateEOService; + + /** + * 分页列表查询 + * + * @param lawsMonthlyReportTitleTemplateEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "月报标题模板-分页列表查询") + @ApiOperation(value="月报标题模板-分页列表查询", notes="月报标题模板-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsMonthlyReportTitleTemplateEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "月报标题模板-列表查询") + @ApiOperation(value="月报标题模板-列表查询", notes="月报标题模板-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsMonthlyReportTitleTemplateEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsMonthlyReportTitleTemplateEO + * @return + */ + @AutoLog(value = "月报标题模板-添加") + @ApiOperation(value="月报标题模板-添加", notes="月报标题模板-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { + lawsMonthlyReportTitleTemplateEOService.add(lawsMonthlyReportTitleTemplateEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsMonthlyReportTitleTemplateEO + * @return + */ + @AutoLog(value = "月报标题模板-编辑") + @ApiOperation(value="月报标题模板-编辑", notes="月报标题模板-编辑") + @GetMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { + lawsMonthlyReportTitleTemplateEOService.editById(lawsMonthlyReportTitleTemplateEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "月报标题模板-通过id删除") + @ApiOperation(value="月报标题模板-通过id删除", notes="月报标题模板-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsMonthlyReportTitleTemplateEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "月报标题模板-批量删除") + @ApiOperation(value="月报标题模板-批量删除", notes="月报标题模板-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsMonthlyReportTitleTemplateEOService.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) { + LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = lawsMonthlyReportTitleTemplateEOService.queryById(id); + if(lawsMonthlyReportTitleTemplateEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsMonthlyReportTitleTemplateEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsMonthlyReportTitleTemplateEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { + return super.exportXls(request, lawsMonthlyReportTitleTemplateEO, LawsMonthlyReportTitleTemplateEO.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, LawsMonthlyReportTitleTemplateEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java new file mode 100644 index 000000000..1509de236 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java @@ -0,0 +1,88 @@ +package com.jero.modules.report.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 com.jero.common.aspect.annotation.Dict; +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: 2022-06-28 + * @Version: V1.0 + */ +@Data +@TableName("laws_monthly_report_manage") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_monthly_report_manage对象", description="法规月报管理") +public class LawsMonthlyReportManageEO implements Serializable { + private static final long serialVersionUID = 1L; + + @TableField(exist = false) + private java.lang.String cut; + + /**主键*/ + @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; + + /**月报语种*/ + @Dict(dicCode ="yue4_bao4_yu3_zhong3") + @Excel(name = "月报语种", width = 15) + @ApiModelProperty(value = "月报语种") + private java.lang.String language; + + /**发布状态*/ + @Dict(dicCode ="fa3_gui1_yue4_bao4_guan3_li3_-_-_fa1_bu4_zhuang4_tai4") + @Excel(name = "发布状态", width = 15) + @ApiModelProperty(value = "发布状态") + private java.lang.String issueStatus; + + /**文件id*/ + @Excel(name = "文件id", width = 15) + @ApiModelProperty(value = "文件id") + private java.lang.String fileId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java new file mode 100644 index 000000000..2d7084e0c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 月报标题模板 + * @Author: jero-boot + * @Date: 2022-06-29 + * @Version: V1.0 + */ +@Data +@TableName("laws_monthly_report_title_template") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_monthly_report_title_template对象", description="月报标题模板") +public class LawsMonthlyReportTitleTemplateEO 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 parentId; + + /**中文标题*/ + @Excel(name = "中文标题", width = 15) + @ApiModelProperty(value = "中文标题") + private java.lang.String titleCn; + + /**英文标题*/ + @Excel(name = "英文标题", width = 15) + @ApiModelProperty(value = "英文标题") + private java.lang.String titleEn; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportManageEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportManageEOMapper.java new file mode 100644 index 000000000..572a4ddad --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportManageEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.LawsMonthlyReportManageEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规月报管理 + * @Author: jero-boot + * @Date: 2022-06-28 + * @Version: V1.0 + */ +public interface LawsMonthlyReportManageEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportTitleTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportTitleTemplateEOMapper.java new file mode 100644 index 000000000..1820a8a3d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportTitleTemplateEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 月报标题模板 + * @Author: jero-boot + * @Date: 2022-06-29 + * @Version: V1.0 + */ +public interface LawsMonthlyReportTitleTemplateEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml new file mode 100644 index 000000000..c0ceb45de --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml new file mode 100644 index 000000000..5ce76fae5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java new file mode 100644 index 000000000..cc0d078a2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java @@ -0,0 +1,77 @@ +package com.jero.modules.report.service; + +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.report.entity.LawsMonthlyReportManageEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规月报管理 + * @Author: jero-boot + * @Date: 2022-06-28 + * @Version: V1.0 + */ +public interface ILawsMonthlyReportManageEOService extends IService { + + /** + * 保存 + * + * @param lawsMonthlyReportManageEO + * @return + */ + void add(LawsMonthlyReportManageEO lawsMonthlyReportManageEO); + + /** + * 更新 + * + * @param lawsMonthlyReportManageEO + * @return + */ + void editById(LawsMonthlyReportManageEO lawsMonthlyReportManageEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsMonthlyReportManageEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 分页 + * @param page + * @param queryWrapper + * @return + */ + IPage getPageInfo(Page page, QueryWrapper queryWrapper); + + void issue(LawsMonthlyReportManageEO lawsMonthlyReportManageEO); + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java new file mode 100644 index 000000000..63b28c44f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.report.service; + +import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 月报标题模板 + * @Author: jero-boot + * @Date: 2022-06-29 + * @Version: V1.0 + */ +public interface ILawsMonthlyReportTitleTemplateEOService extends IService { + + /** + * 保存 + * + * @param lawsMonthlyReportTitleTemplateEO + * @return + */ + void add(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO); + + /** + * 更新 + * + * @param lawsMonthlyReportTitleTemplateEO + * @return + */ + void editById(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsMonthlyReportTitleTemplateEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java new file mode 100644 index 000000000..2dd8d1757 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -0,0 +1,114 @@ +package com.jero.modules.report.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.dummy.enums.InventoryStateEnum; +import com.jero.modules.report.entity.LawsMonthlyReportManageEO; +import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper; +import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 法规月报管理 + * @Author: jero-boot + * @Date: 2022-06-28 + * @Version: V1.0 + */ +@Service +public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportManageEOService { + + /** + * 保存 + * + * @param lawsMonthlyReportManageEO + * @return + */ + @Override + public void add(LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + lawsMonthlyReportManageEO.setIssueStatus(InventoryStateEnum.TO_BE_RELEASED.getValue()); + Date now = new Date(); + lawsMonthlyReportManageEO.setCreateTime(now); + lawsMonthlyReportManageEO.setUpdateTime(now); + save(lawsMonthlyReportManageEO); + } + + /** + * 更新 + * + * @param lawsMonthlyReportManageEO + * @return + */ + @Override + public void editById(LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + Date now = new Date(); + lawsMonthlyReportManageEO.setUpdateTime(now); + saveOrUpdate(lawsMonthlyReportManageEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsMonthlyReportManageEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public IPage getPageInfo(Page page, QueryWrapper queryWrapper) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.and(query->{ + query.in("create_by",sysUser.getUsername()).in("issue_status", InventoryStateEnum.TO_BE_RELEASED.getValue()) + .or().in("issue_status",InventoryStateEnum.ISSUE.getValue()); + }); + Page pageInfo = this.page(page, queryWrapper); + return pageInfo; + } + + @Override + public void issue(LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + this.updateById(lawsMonthlyReportManageEO); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java new file mode 100644 index 000000000..e0509e457 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.report.service.impl; + +import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper; +import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 月报标题模板 + * @Author: jero-boot + * @Date: 2022-06-29 + * @Version: V1.0 + */ +@Service +public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportTitleTemplateEOService { + + /** + * 保存 + * + * @param lawsMonthlyReportTitleTemplateEO + * @return + */ + @Override + public void add(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { + Date now = new Date(); + lawsMonthlyReportTitleTemplateEO.setCreateTime(now); + lawsMonthlyReportTitleTemplateEO.setUpdateTime(now); + save(lawsMonthlyReportTitleTemplateEO); + } + + /** + * 更新 + * + * @param lawsMonthlyReportTitleTemplateEO + * @return + */ + @Override + public void editById(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { + Date now = new Date(); + lawsMonthlyReportTitleTemplateEO.setUpdateTime(now); + saveOrUpdate(lawsMonthlyReportTitleTemplateEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsMonthlyReportTitleTemplateEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 9962c9ba9..6b49c5eca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -76,6 +76,55 @@ public class FileUnZip { return orgMkdirs; } + /** + * 解压zip文件 + * 解决解压文件下有多个文件夹时，读不到orgMkdirs问题 + * @param sourceFile,待解压的zip文件; descDir,解压后的存放路径 + * @throws Exception + * @author gaoyan + **/ + public static String unZipFiles2(String sourceFile, String descDir) throws IOException { + File zipFile = new File(sourceFile); + + File pathFile = new File(descDir); + if (!pathFile.exists()) { + pathFile.mkdirs(); + } + ZipFile zip = new ZipFile(zipFile,"gbk"); + String orgMkdirsLast = ""; + for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) { + ZipEntry entry = (ZipEntry) entries.nextElement(); + String zipEntryName = entry.getName(); + String outPath = (descDir + "/" + zipEntryName).replaceAll("\\*", "/"); + orgMkdirsLast = zipEntryName.substring(0, zipEntryName.indexOf('/')); + //判断路径是否存在,不存在则创建文件路径 + File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); + if (!file.exists()) { + file.mkdirs(); + } + //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 + if (new File(outPath).isDirectory()) { + continue; + } + //输出文件路径信息 +// InputStream in = null; +// OutputStream out = null; + try(InputStream in =zip.getInputStream(entry); + OutputStream out =new FileOutputStream(outPath)){ + byte[] buf1 = new byte[1024]; + int len; + while ((len = in.read(buf1)) > 0) { + out.write(buf1, 0, len); + } + }catch(IOException e){ + logger.error(e.getMessage(),e); + } + } + zip.close(); + String orgMkdirs = descDir + "/" + orgMkdirsLast; + return orgMkdirs; + } + /** * 递归删除文件及文件夹 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 3a21d9da6..8fae259fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1484,7 +1484,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java new file mode 100644 index 000000000..b1dba1d41 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java @@ -0,0 +1,71 @@ +package com.jero.modules.warn.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.modules.warn.service.LawsWarnService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * @description + * @date 2022/6/20 11:54 + * @auth zhn + */ +@Api(tags="法规预警") +@RestController +@RequestMapping("/LawsWarn") +@Slf4j +public class LawsWarnController { + + @Autowired + private LawsWarnService lawsWarnService; + + + /** + * 分页列表查询 + * @param parameter + * @return + */ + @ApiOperation(value="分页查询", notes="分页查询") + @PostMapping(value = "/queryPageInfo") + @ResponseBody +// @RequiresPermissions("document:queryPageInfo") + public JSONObject queryPageInfo(@RequestBody Map parameter) { + IPage infoPage = lawsWarnService.getInfoPage(parameter); + Result ok = Result.OK(infoPage); + JSONObject jsonResult = JSONObject.fromObject(ok); + return jsonResult; + } + + @ApiOperation(value = "导出excel") + @GetMapping(value = "/exportExcel") +// @RequiresPermissions("document:exportExcel") + public void exportExcel(@RequestParam Map map, + HttpServletResponse response, + HttpServletRequest request){ + lawsWarnService.exportExcel(map,response,request); + } + + + @ApiOperation(value = "推送") + @GetMapping(value = "/warnPullMessage") +// @RequiresPermissions("document:pullMessage") + public Result pullMessage(String departIds,String userIds,String documentIds) { + lawsWarnService.warnPullMessage(departIds,userIds,documentIds); + return Result.OK("推送成功"); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java new file mode 100644 index 000000000..ae530cdbb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -0,0 +1,359 @@ +package com.jero.modules.warn.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.MessageTypeEnum; +import com.jero.common.constant.enums.ModuleEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.system.entity.SysAnnouncement; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysAnnouncementService; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +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 org.yaml.snakeyaml.util.UriEncoder; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * @description + * @date 2022/6/20 11:55 + * @auth zhn + */ +@Service +public class LawsWarnService { + @Autowired + private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; + @Autowired + private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper; + @Autowired + private SysCategoryServiceImpl sysCategoryService; + @Autowired + private SysDictItemServiceImpl sysDictItemServiceImpl; + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + @Autowired + private ISysDepartService sysDepartService; + @Autowired + private ISysUserService sysUserService; + @Value(value = "${jero.backUrl}") + private String backUrl; + @Autowired + private ISysAnnouncementService sysAnnouncementService; + @Resource + private IFeishuService iFeishuService; + + public IPage getInfoPage(Map parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //查询的字段 + String fieldQuery = "id,serial_number,title,title_en,state,region,technology_territory,xin1_che1_xing2_shi2_shi1_ri4_qi1,implement_time"; + List fieldList = Arrays.asList(fieldQuery.split(",")); + + List fieldListNew = new ArrayList<>(); + for (String field : fieldList) { + String fieldTemp = null; + if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) { + String fieldNew = "date_format(" + field + ", '%Y-%m-%d')"; + fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field; + fieldListNew.add(fieldTemp); + } else { + fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field; + fieldListNew.add(fieldTemp); + } + } + //封装查询条件 + String condition = bussDocumentLibraryEOService.getConditionStr(parameter); + int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); + int pageSize = Integer.parseInt(parameter.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition); + + + //树形数据字典 + List categoryList = sysCategoryService.list(); + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + List onlCgformFieldListTemp = onlCgformFieldList.stream().filter(e -> fieldList.contains(e.getDbFieldName())).collect(Collectors.toList()); + List records = infoPage.getRecords(); + for (Map record : records) { + //处理标题 + if(CutEnum.EN.getValue().equals(cut)){ + record.put("title",record.get("title_en")); + } + Map record1 = (Map) record; + List treeFieldList = new ArrayList<>(); + OnlCgformField onlCgformField = new OnlCgformField(); + onlCgformField.setDbFieldName("technology_territory"); + treeFieldList.add(onlCgformField); + for (Map.Entry entry : record1.entrySet()) { + //下拉选处理数据字典 + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, onlCgformFieldListTemp,null); + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + } + return infoPage; + } + + public void exportExcel(Map map, HttpServletResponse response, HttpServletRequest request) { + String cut = (String) map.get("cut"); + String flag = String.valueOf(map.get("flag")); + List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + onlCgformFieldList = onlCgformFieldList.stream().filter(e -> !"id".equals(e.getDbFieldName()) + && !"create_by".equals(e.getDbFieldName()) + && !"create_time".equals(e.getDbFieldName()) + && !"update_by".equals(e.getDbFieldName()) + && !"update_time".equals(e.getDbFieldName()) + && !"sys_org_code".equals(e.getDbFieldName())).collect(Collectors.toList()); + //要查询的字段 + String fieldQuery = "id,serial_number,title,title_en,state,region,technology_territory,xin1_che1_xing2_shi2_shi1_ri4_qi1,implement_time"; + List fieldList = Arrays.asList(fieldQuery.split(",")); + //封装查询条件(包含高级搜索) + String condition = bussDocumentLibraryEOService.getConditionStr(map); + List> datas = bussDocumentLibraryEOMapper.getInfoList(" " + StringUtils.join(fieldList, ","), condition); + //部分导出 + String partId = (String) map.get("id"); + if (StringUtils.isNotBlank(partId)) { + //部门导出的数据 + datas = datas.stream().filter(entry -> partId.contains((String) entry.get("id"))).collect(Collectors.toList()); + } + OutputStream os = null; + Workbook workbook = new XSSFWorkbook(); + //创建工作表对象 + Sheet sheet = workbook.createSheet(); + String dateName = ""; + + // 创建头部 + String header = ""; + if(CutEnum.CN.getValue().equals(cut)){ + header = "编号,标题,状态,适用地区,技术领域,"; + if("0".equals(flag)){ + dateName = "新车型实施日期"; + }else{ + dateName = "在产车实施日期"; + } + }else{ + header = "Number,Title,Status,region,Technical Field,"; + if("0".equals(flag)){ + dateName = "New Type Execution Date"; + }else{ + dateName = "New Vehicle Execution Date"; + } + } + header = header +dateName; + + bussDocumentLibraryEOService.createHeader(workbook, sheet, header); + List onlCgformFieldListTemp = new LinkedList<>(); + List numberOnlCgformField = onlCgformFieldList.stream().filter(e -> "serial_number".equals(e.getDbFieldName())).collect(Collectors.toList()); + List titleOnlCgformField = onlCgformFieldList.stream().filter(e -> "title".equals(e.getDbFieldName())).collect(Collectors.toList()); + List titleEnOnlCgformField = onlCgformFieldList.stream().filter(e -> "title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); + List stateOnlCgformField = onlCgformFieldList.stream().filter(e -> "state".equals(e.getDbFieldName())).collect(Collectors.toList()); + List regionOnlCgformField = onlCgformFieldList.stream().filter(e -> "region".equals(e.getDbFieldName())).collect(Collectors.toList()); + List technologyOnlCgformField = onlCgformFieldList.stream().filter(e -> "technology_territory".equals(e.getDbFieldName())).collect(Collectors.toList()); + List newCarOnlCgformField = onlCgformFieldList.stream().filter(e -> "xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(e.getDbFieldName())).collect(Collectors.toList()); + List implementOnlCgformField = onlCgformFieldList.stream().filter(e -> "implement_time".equals(e.getDbFieldName())).collect(Collectors.toList()); + onlCgformFieldListTemp.addAll(numberOnlCgformField); + onlCgformFieldListTemp.addAll(titleOnlCgformField); + onlCgformFieldListTemp.addAll(titleEnOnlCgformField); + onlCgformFieldListTemp.addAll(stateOnlCgformField); + onlCgformFieldListTemp.addAll(regionOnlCgformField); + onlCgformFieldListTemp.addAll(technologyOnlCgformField); + onlCgformFieldListTemp.addAll(newCarOnlCgformField); + onlCgformFieldListTemp.addAll(implementOnlCgformField); + // 创建数据 + createDatas(workbook, sheet, datas,onlCgformFieldListTemp, cut,flag); + try { + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("导出失败"); + }else{ + throw new JeroBootException("Export failure"); + } + } + } + + void createDatas(Workbook workbook, Sheet sheet, List> datas,List onlCgformFieldListTemp, String cut,String flag){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //树形数据字典 + List categoryList = sysCategoryService.list(); + + //过滤出树形字段 + List treeFieldList = onlCgformFieldListTemp.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + //下拉单选,多选 + List pullFieldList = onlCgformFieldListTemp.stream() + .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType()) || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + int i = 0; + for (Map data : datas) { + if(CutEnum.CN.getValue().equals(cut)){ + data.remove("title_en"); + }else{ + data.remove("title"); + } + if("0".equals(flag)){ + data.remove("implement_time"); + }else{ + data.remove("xin1_che1_xing2_shi2_shi1_ri4_qi1"); + } + List onlCgformFieldList = new LinkedList<>(); + for (Map.Entry entry : data.entrySet()) { + List collect = onlCgformFieldListTemp.stream().filter(e -> e.getDbFieldName().equals(entry.getKey())).collect(Collectors.toList()); + onlCgformFieldList.addAll(collect); + //下拉选处理数据字典 + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, pullFieldList,null); + //处理树形数据字典 + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + + Row row = sheet.createRow(i + 1); + i++; + int sheetNum = 0; + + for (OnlCgformField onlCgformField : onlCgformFieldList) { + String value = ""; + //时间类型 + if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) { + if (ObjectUtils.isNotEmpty(data.get(onlCgformField.getDbFieldName()))) { + value = sdf.format(data.get(onlCgformField.getDbFieldName())); + } + } else { + value = StringUtils.valueOf(data.get(onlCgformField.getDbFieldName())); + } + if("null".equals(value)){ + value = ""; + } + row.createCell(sheetNum).setCellValue(value); + sheetNum++; + } + } + } + + + public String warnPullMessage(String departIds, String userIds, String documentIds) { + Set allDepartIds = new HashSet<>(); + //查询当前部门下所有部门 + if (StringUtils.isNotEmpty(departIds)) { + String[] departIdArr = departIds.split(","); + for (String departId : departIdArr) { + List subDepIdsByDepId = sysDepartService.getSubDepIdsByDepId(departId); + allDepartIds.addAll(subDepIdsByDepId); + } + } + + List userIdList = new ArrayList<>(); + List thirdIdList = new ArrayList<>(); + if (StringUtils.isNotBlank(departIds)) { + //查询部门下的人员 + List userList = new ArrayList<>(); + if(allDepartIds.size() != 0){ + userList = sysUserService.getUserListByDepIds(new ArrayList<>(allDepartIds)); + } + + if (userList.size() != 0) { + userIdList = userList.stream().map(SysUser::getId).distinct().collect(Collectors.toList()); + thirdIdList = userList.stream().map(SysUser::getThirdId).distinct().collect(Collectors.toList()); + } + } + if(userIdList.size() == 0 && StringUtils.isNotBlank(userIds)){ + List sysUsers = sysUserService.listByIds(Arrays.asList(userIds.split(","))); + if(sysUsers.size() != 0){ + List userId = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()); + List thirdId = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + userIdList.addAll(userId); + thirdIdList.addAll(thirdId); + } + } + + //查询文档 + List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds); + List serialNumberList = new ArrayList<>(); + List urlList = new ArrayList<>(); + List hrefList = new ArrayList<>(); + for (Map map : mapList) { + serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); + String url = backUrl + "/docManage/library/detail?id=" + map.get("id") + + "&title=" + map.get("title") + + "&serial_number=" + map.get("serial_number"); + + String href = "" + map.get("serial_number") + ""; + urlList.add(url); + hrefList.add(href); + } + + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out."; + String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out."; + //封装消息的实体类 + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo); + //飞书 + try { + for (String s : urlList) { + String encode = UriEncoder.encode(s); + List list = new ArrayList<>(); + mapList.stream().forEach(e->{ + if(s.contains((String)e.get("id"))){ + String serialNumber = StringUtils.valueOf(e.get("serial_number")); + list.add(serialNumber); + } + }); + String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out."; + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); + } + } catch (IOException e) { + e.printStackTrace(); + } + bussDocumentLibraryEOService.sendWebsocket(documentIds, contentInfo); + return "推送成功"; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java new file mode 100644 index 000000000..a68792e59 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java @@ -0,0 +1,174 @@ +package com.jero.modules.warn.service; + +import com.jero.common.constant.enums.MessageTypeEnum; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; +import com.jero.modules.system.entity.SysAnnouncement; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysAnnouncementService; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @description + * @date 2022/6/28 18:38 + * @auth zhn + */ +@Service +public class TimedTaskWarn implements Job { + + @Autowired + private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; + @Autowired + private IOnlCgformSubscribeService iOnlCgformSubscribeService; + @Autowired + private SysDictItemServiceImpl sysDictItemServiceImpl; + @Autowired + private ISysAnnouncementService sysAnnouncementService; + @Resource + private IFeishuService iFeishuService; + @Autowired + private SysUserMapper sysUserMapper; + @Value(value = "${jero.backUrl}") + private String backUrl; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + //获取所有的法规 + List bussDocumentLibraryEOList = bussDocumentLibraryEOService.list(); + //订阅信息 + List subscribeList = iOnlCgformSubscribeService.list(); + List documentIdList = subscribeList.stream().map(OnlCgformSubscribe::getDocumentId).distinct().collect(Collectors.toList()); + //已经订阅的法规 + List bussDocumentLibraryEOS = bussDocumentLibraryEOList.stream() + .filter(e -> documentIdList.contains(e.getId())).collect(Collectors.toList()); + if(bussDocumentLibraryEOS.size() == 0){ + return; + } + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String currentTime = sdf.format(new Date()); + for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOS) { + Date xin1Che1Xing2Shi2Shi1Ri4Qi1 = bussDocumentLibraryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1(); + Date implementTime = bussDocumentLibraryEO.getImplementTime(); + String category = bussDocumentLibraryEO.getLei4Bie2(); + String serialNumber = bussDocumentLibraryEO.getSerialNumber(); + String id = bussDocumentLibraryEO.getId(); + String title = bussDocumentLibraryEO.getTitleEn(); + //类别 + if(StringUtils.isNotBlank(category)){ + String finalCategory = category; + List stateDictItemList = dictItemList.stream() + .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) + .collect(Collectors.toList()); + if(stateDictItemList.size() != 0){ + category = stateDictItemList.get(0).getEnName(); + } + }else{ + category = ""; + } + String href = "" + serialNumber + ""; + //跳转文档详情 + String url = backUrl + "/docManage/library/detail?id=" + id; + //订阅的用户 + List onlCgformSubscribe = subscribeList.stream().filter(e -> e.getDocumentId().equals(bussDocumentLibraryEO.getId())).collect(Collectors.toList()); + List userIdList = new ArrayList<>(); + List thirdIdList = new ArrayList<>(); + if(onlCgformSubscribe.size() != 0){ + List userNameList = onlCgformSubscribe.stream().map(OnlCgformSubscribe::getCreateBy).collect(Collectors.toList()); + List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); + userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + thirdIdList = userList.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + } + //新车型实施日期 + //您所订阅的标准GB 7258 新车型实施日期为2022-01-01,请注意查看 + //The implementation date of the standard GB 7258 new model you subscribed to is 2022-01-01, + // please pay attention to check + if(ObjectUtils.isNotEmpty(xin1Che1Xing2Shi2Shi1Ri4Qi1)){ + //当前时间的前6个月 + String beforeTimeSix = beforeTime(6,xin1Che1Xing2Shi2Shi1Ri4Qi1); + //当前时间的前12个月 + String beforeTimeSixTen = beforeTime(12,xin1Che1Xing2Shi2Shi1Ri4Qi1); + + if(currentTime.equals(beforeTimeSix) || currentTime.equals(beforeTimeSixTen)){ + //发送站内消息和飞书消息 + String format = sdf.format(xin1Che1Xing2Shi2Shi1Ri4Qi1); + String content = "The implementation date of the " + category +" "+ serialNumber + + " new model you subscribed to is "+format+",please pay attention to check"; + String contentInfo = "The implementation date of the " + category +" "+ href + + " new model you subscribed to is "+format+",please pay attention to check"; + sendMessage(content,contentInfo,content, url, userIdList, thirdIdList); + } + } + + //在产车实施日期 + //The implementation date of the standard GB 7258 in production vehicle you subscribed to is 2022-01-01, + // please pay attention to check + if(ObjectUtils.isNotEmpty(implementTime)){ + //当前时间的前6个月 + String beforeTimeSix = beforeTime(6,implementTime); + //当前时间的前12个月 + String beforeTimeSixTen = beforeTime(12,implementTime); + if(currentTime.equals(beforeTimeSix) || currentTime.equals(beforeTimeSixTen)){ + //发送站内消息和飞书消息 + String format = sdf.format(implementTime); + String content = "The implementation date of the " + category +" "+ serialNumber + + " production vehicle you subscribed to is "+format+",please pay attention to check"; + String contentInfo = "The implementation date of the " + category +" "+ href + + " production vehicle you subscribed to is "+format+",please pay attention to check"; + sendMessage(content,contentInfo,content, url, userIdList, thirdIdList); + } + } + } + } + + private void sendMessage(String content,String contentInfo,String contentFeiShu, String url, List userIdList, List thirdIdList) { + //站内消息 + //封装消息的实体类 + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content); + + //飞书消息 + try { + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentFeiShu, MessageTypeEnum.WARN.getName(), url); + } catch (IOException e) { + e.printStackTrace(); + } + } + + private String beforeTime (int month,Date date){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendarBefore = Calendar.getInstance(); + calendarBefore.setTime(date); + calendarBefore.add(Calendar.MONTH, -month); + Date dateBefore = calendarBefore.getTime(); + String beforeTime = sdf.format(dateBefore); + return beforeTime; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 704ac4a14..bf3b4ca11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -68,6 +68,9 @@ public class workFlowController { jsonObject.put("id", FlowTypeEnum.YZFHXSCLC.getProcessDefinitionKey()); initConditionAssessmentEO(jsonObject); return this.activiti_define_start(jsonObject); + }else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){ + jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey()); + return this.activiti_define_start(jsonObject); }else{ return null; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 321b10971..159c3a27b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -9,6 +9,7 @@ public enum FlowTypeEnum { SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc"), PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"), YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"), + FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"), ; private String value; diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 517707911..cf284ac6f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -142,8 +142,8 @@ spring: # username: root # password: 123456 # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_stand?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 34507c021..864996229 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -74,6 +74,7 @@ module.exports = { user: 'User', numericalValue: 'Numerical Value', not: 'No.', + notOnlyRz: 'No', EnterValue: 'Please Enter a Value', SavedQuery: 'Saved Search', NoQueriesSaved: 'No Queries Were Saved', @@ -600,7 +601,7 @@ module.exports = { engineeringInterfacePerson: 'Engineering Interface', typeOfDeliverables: 'Deliverable Type', deliverableTemplate: 'Deliverable Template', - entryName: 'Project Name', + entryName: 'Name', targetMarket: 'Target Market', projectStatus: 'Status', StudioEngineer: 'R&H Studio', @@ -617,7 +618,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'NiO number', + NiONumber: 'NIO number', ParameterName: 'Parameter name', ParameterDescription: 'Parameter description', Version: 'Version', @@ -712,14 +713,28 @@ module.exports = { uploadTime: 'Upload Time', enclosure: 'Enclosure', // 认证 + // 认证状态 + timeoperation: 'You have permission to operate this button.', + NiOnumberis: 'NiO number is', + NoOperationPermissionForthisbutton: 'No operation permission for this button', + Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.', + Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', + Datastatusis: 'Datastatusis', + Dropdownradio: 'Drop down radio', + Dropdownmultipleselection: 'Drop down multiple selection', + a: '+', + positiveInteger: 'Positive integer', + // 参数收集开始 + MaintainConfigureInfo: 'Maintain configuration information', ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', - Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration', + Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', + NoConfigurationNotStart: 'No configuration added, unable to start collection, please check', theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', - chinese: 'chinese', - integerOrDecimal: 'integer Or Decimal', + chinese: 'Chinese', + integerOrDecimal: 'Integer Or Decimal', OneDecimalPlace: 'One Decimal Place', TwoDecimalplaces: 'Two Decimal places', Threedecimalplaces: 'Threedecimalplaces', @@ -733,7 +748,7 @@ module.exports = { ListTitle: 'List Title', CopyProjectCollectionparameters: 'Copy Project Collection parameters', from: 'From', - ReferenceTo: 'Reference To', + ReferenceTo: 'To', checkTheDeadline: 'Select the collection deadline of the parameter item', accountNumber: 'Account Number', fullName: 'Full Name', @@ -757,7 +772,9 @@ module.exports = { configure: 'Configure', parameter: 'Parameter', changeExtension: 'Change Extension', + addDetailList: 'Add', detailedList: 'DetailedList', + copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completion Time', parameterTemplateName: 'Parameter Template Name', onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered', @@ -774,6 +791,9 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Content Description', + parameterTemplateExportName: 'Parameter List', + parameterDataExport: 'Parameter Export Data', + // 参数收集结束 circulationInformation: 'Circulation information', circulationHistory: 'Circulation History', agree: 'Agree', @@ -808,7 +828,7 @@ module.exports = { technicalEvaluationResults: 'Technical Evaluation Results', engineeringConfirmation: 'Engineering Deliverables', feedbackFromTheEngineer: 'Engineer Comment', - completedBy: 'Completed By', + completedBy: 'SdtPeople', completedTime: 'Completed Time', replyFromProjectContactPerson: 'Assignee Reply', answer: 'Answer', @@ -920,14 +940,14 @@ module.exports = { reportNotUploaded: 'Report not uploaded', position: 'position', // 认证权限状态 - CollectionInitiated: 'Collection to be initiated、', - handledInterface: 'To be handled by the project interface、', - ReturnedPerson: 'Returned by project contact person、', - completed: 'To be completed、', - Filledreturn: 'Filled by return、', - Submitted: 'Submitted、', - ReturnedEngineer: 'Returned by Certification Engineer、', - SynchronizedLibrary: 'Synchronized to the upper reporting Library、', + CollectionInitiated: 'Collection to be initiated', + handledInterface: 'To be handled by the project interface', + ReturnedPerson: 'Returned by project contact person', + completed: 'To be completed', + Filledreturn: 'Filled by return', + Submitted: 'Submitted', + ReturnedEngineer: 'Returned by Certification Engineer', + SynchronizedLibrary: 'Synchronized to the upper reporting Library', Statusis: 'Statusis', toHavePermission: 'To Have Permission', and: 'and', @@ -939,5 +959,108 @@ module.exports = { question: 'Question', ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' + OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', + or: 'or', + warningTime: 'Warning time', + RegulationMonthlyManagement: 'Regulation Monthly Management', + RegulationMonthlyFill: 'Regulation Monthly Fill', + RegulationMonthlyName: 'Regulation monthly name', + monthlyLanguage: 'Monthly language', + releaseStatus: 'Release status', + uploadedBy: 'Uploaded by', + uploadMonthly: 'Upload monthly', + chapterContents: 'Chapter contents', + chineseTitle: 'Chinese title', + englishTitle: 'English title', + regulatoryContact: 'Regulatory contact', + exportStatus: 'Export status', + monthlyTitleTemplate: 'Monthly title template', + monthlyIntegrationAndExport: 'Monthly integration and export', + addContent: 'Add content', + editContent: 'Edit content', + viewContent: 'View content', + fillInTheMonth: 'Fill in the month', + monthSelection: 'Month selection', + bringInStandardInformation: 'Bring in standard information', + contentTemplate: 'Content template', + moveUp: 'Move up', + moveDown: 'Move down', + vehicleType: 'Vehicle Type', + usage: 'Usage', + implementationModel: 'Implementation model', + primaryCoverageCn: 'Primary coverage (Cn)', + primaryCoverageEn: 'Primary coverage (En)', + workProgressCn: 'NIO Work progress (Cn)', + workProgressEn: 'NIO Work progress (En)', + initiatingProcess: 'Initiating Process', + collectResults: 'Collect results', + dateOfInitiation: 'Date of initiation', + closingDate: 'Closing date', + viewProcess: 'View process', + evaluationResults: 'Evaluation results', + Assessor: 'Assessor', + collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions', + feedbackInformation: 'Feedback Information', + relevantSections: 'Relevant sections', + questionsSuggestions: 'Questions or Suggestions', + reason: 'Reason', + proposedTime:'Proposed time', + feedbackPoint: 'Feedback point', + link: 'Link', + planNoChinese: 'Plan No.', + standardNameCn: 'Standard Name Cn', + standardNameEn: 'Standard Name En', + deadlineForComments: 'Deadline for comments', + standardNo: 'Standard No', + implemenDate: 'Implementation Date', +// 上报库 + Enable: 'Enable', + Latestupdatetime: 'Latest update time', + Exporthistory: 'Exporthistory', + Exporttype: 'Export Type', + Exporttime: 'Export Time', + file: 'File', + // 中英修改-全局 + Copysuccessful: 'Copy Successful', + Copyfailed: 'Copy Failed', + Synchronizedatabase: 'Synchronize the data of the selected row to the database?', + Aftersynchronization: 'After synchronization, the parameter items cannot be modified.', + FNumber: 'Number', + NNNiONumber: 'Number', + NNiONumber: 'NIO Number', + NRequired: 'Is Must', + NParameterName: 'Params Name', + NtechnicalField: 'Technical Field', + NparameterBatch: 'Params Batch', + NareaOfResponsibility: 'Duty Territory', + NParameterDescription: 'Description', + NcertificationCategory: 'Cert Category', + NcontrolType: 'Control Type', + NcontrolVerification: 'Control Verify', + NcontrolAlternatives: 'Control Values', + NattachmentTemplate: 'File Template', + Ntext: 'Text', + NDropdownradio: 'Pull single', + NDropdownmultipleselection: 'Pull more', + Nenclosure: 'File', + Atext: 'Text+Pull single', + Btext: 'Text+Pull more', + Ctext: 'Text+File', + Dtext: 'Pull single+File', + Etext: 'Pull more+File', + Ftext: 'Text+Pull single+File', + Nnothing: 'Null', + Nchinese: 'Chinese', + NpositiveInteger: 'Positive integer', + NPositivefloatingpointnumber: 'Positive float', + NintegerOrDecimal: 'Integer decimal', + NOneDecimalPlace: 'Decimal one', + NTwoDecimalplaces: 'Decimal two', + NThreedecimalplaces: 'Decimal three', + NFourDecimalplaces: 'Decimal four', + yes: 'Yes', + Copyparameterlist: 'Copy parameter list', + Templatenamelist: 'Template name - parameter item collection list', + newNiONumber: 'Number', + English: 'English', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index b7d2738aa..be54f48e2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -76,6 +76,7 @@ module.exports = { numericalValue: '数值', yes: '是', not: '否', + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', NoQueriesSaved: '没有保存任何查询', @@ -723,9 +724,23 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + // 认证状态 + timeoperation: '时，才有权限操作此按钮。', + NiOnumberis: 'NIO编号为', + NoOperationPermissionForthisbutton: '没有此按钮的操作权限', + Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', + Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', + Datastatusis: '数据状态为', + Dropdownradio: '下拉单选', + Dropdownmultipleselection: '下拉多选', + a: '+', + positiveInteger: '正整数', + // 参数收集 + MaintainConfigureInfo: '维护配置信息', ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', - Theselectedconfiguration: '所选项目有未完成收集数据，不能添加配置', + Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置', + NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查', theCurrent: '此数据当前状态为', thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮', Frozenstatus: '冻结状态,仅可以查看', @@ -768,7 +783,9 @@ module.exports = { configure: '配置', parameter: '参数', changeExtension: '变更扩展', + addDetailList: '添加清单', detailedList: '清单', + copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', parameterTemplateName: '参数模板名称', onlyThree: '只能输入字母，数字，横杠（-）三种内容', @@ -785,6 +802,9 @@ module.exports = { releaseVersion: '发布版本', parameterTemplate: '参数模板', contentDescription: '内容说明', + parameterTemplateExportName: '参数项列表', + parameterDataExport: '参数项导出数据', + // 参数收集结束 circulationInformation: '流转信息', circulationHistory: '流转历史', agree: '同意', @@ -926,14 +946,14 @@ module.exports = { reportNotUploaded: '报告未上传', position: '职位', // 认证权限状态 - CollectionInitiated: '待发起收集、', - handledInterface: '待工程接口人处理、', - ReturnedPerson: '工程接口人退回、', - completed: '待填写、', - Filledreturn: '填写人退回、', - Submitted: '已提交、', - ReturnedEngineer: '认证工程师退回、', - SynchronizedLibrary: '已同步至上报库、', + CollectionInitiated: '待发起收集', + handledInterface: '待工程接口人处理', + ReturnedPerson: '工程接口人退回', + completed: '待填写', + Filledreturn: '填写人退回', + Submitted: '已提交', + ReturnedEngineer: '认证工程师退回', + SynchronizedLibrary: '已同步至上报库', Statusis: '状态为', toHavePermission: '才有权限', and: '并且', @@ -943,6 +963,108 @@ module.exports = { documentLibraryDetails: '文档库详情', question: '催办', ConfirmQuestion: '确认催办？', - OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', - disableInput:'禁止输入', + OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办', + disableInput: '禁止输入', + or: '或', + warningTime: '预警时间', + RegulationMonthlyManagement: '法规月报管理', + RegulationMonthlyFill: '法规月报填写', + RegulationMonthlyName: '法规月报名称', + monthlyLanguage: '月报语种', + releaseStatus: '发布状态', + uploadedBy: '上传人', + uploadMonthly: '上传月报', + chapterContents: '章节目录', + chineseTitle: '中文标题', + englishTitle: '英文标题', + regulatoryContact: '法规联系人', + exportStatus: '导出状态', + monthlyTitleTemplate: '月报标题模板', + monthlyIntegrationAndExport: '月报整合导出', + addContent: '新增内容', + editContent: '编辑内容', + viewContent: '查看内容', + monthSelection: '月份选择', + fillInTheMonth: '填写月份', + contentTemplate: '内容模板', + bringInStandardInformation: '带入标准信息', + moveUp: '上移', + moveDown: '下移', + vehicleType: '适用车型', + usage: '用法', + implementationModel: '实施车型', + primaryCoverageCn: '主要内容(中文)', + primaryCoverageEn: '主要内容(英文)', + workProgressCn: 'NIO工作进展(中文)', + workProgressEn: 'NIO工作进展(英文)', + initiatingProcess: '发起流程', + collectResults: '收集结果', + dateOfInitiation: '发起日期', + closingDate: '截止日期', + viewProcess: '查看流程', + evaluationResults: '评估结果', + Assessor:'评估人', + collectionOfRegulatoryOpinions:'法规意见收集', + feedbackInformation:'反馈信息', + relevantSections:'相关章节', + questionsSuggestions:'问题/建议', + link: '链接', + reason:'理由', + planNoChinese:'计划号', + feedbackPoint:'反馈点', + standardNameCn:'标准名称中文', + standardNameEn:'标准名称英文', + deadlineForComments:'征求意见截止日期', + proposedTime:'提出时间', + standardNo:'标准编号', + implemenDate:'实施日期', +// 上报库 + Enable: '启用', + Latestupdatetime: '最新更新时间', + Exporthistory: '导出历史', + Exporttype: '导出类型', + Exporttime: '导出时间', + file: '文件', +// 中英修改-全局 + Copysuccessful: '复制成功', + Copyfailed: '复制失败', + Synchronizedatabase: '是否同步选中行数据至上报库?', + Aftersynchronization: '同步后的参数项将不可修改', + FNumber: '账号', + NNNiONumber: 'NIO编号', + NNiONumber: 'NIO编号', + NRequired: '是否必填', + NParameterName: '参数名称', + NtechnicalField: '技术领域', + NparameterBatch: '参数批次', + NareaOfResponsibility: '责任领域', + NParameterDescription: '参数说明', + NcertificationCategory: '认证类别', + NcontrolType: '控件类型', + NcontrolVerification: '控件校验', + NcontrolAlternatives: '控件备选值', + NattachmentTemplate: '附件模板', + Ntext: '文本', + NDropdownradio: '下拉单选', + NDropdownmultipleselection: '下拉多选', + Nenclosure: '附件', + Atext: '文本+下拉单选', + Btext: '文本+下拉多选', + Ctext: '文本+附件', + Dtext: '下拉单选+附件', + Etext:'下拉多选+附件', + Ftext: '文本+下拉单选+附件', + Nnothing: '无', + Nchinese: '中文', + NpositiveInteger: '正整数', + NPositivefloatingpointnumber: '正浮点数', + NintegerOrDecimal: '整数或小数', + NOneDecimalPlace: '一位小数', + NTwoDecimalplaces: '两位小数', + NThreedecimalplaces: '三位小数', + NFourDecimalplaces: '四位小数', + Copyparameterlist: '复制参数清单', + Templatenamelist: '模板名称-参数项收集清单', + newNiONumber: 'NIO编号', + English:'英文', } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 35aa37a8e..90bcdd144 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -1,6 +1,6 @@ + + \ No newline at end of file