WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-07-01 17:29:15 +08:00
parent d65bac3c2b 5d04b64baa
commit d156de1ce8
182 changed files with 15328 additions and 2895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
+5 -1
View File
@@ -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`;
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`;
jero-boot/db/蔚来标准sql/dev_third_record.sql
+118
View File
@@ -0,0 +1,118 @@
-- 三阶段的新增功能，必须添加的固定数据以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;
-- 参数清单表 修改字段长度
ALTER TABLE `laws_weilai`.`params_manifest`
MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`;
-- 参数清单历史版本表 修改字段长度
ALTER TABLE `laws_weilai`.`params_manifest_history`
MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`;
-- 参数项收集切换角色日志表
CREATE TABLE `params_collect_manifest_user_type_log` (
`id` varchar(36) NOT NULL,
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
`project_id` varchar(50) DEFAULT NULL COMMENT '项目id',
`params_manifest_id` varchar(50) DEFAULT NULL COMMENT '参数清单id',
`user_id` varchar(50) DEFAULT NULL COMMENT '用户id',
`user_type` varchar(50) DEFAULT NULL COMMENT '用户类型',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+73 -2
View File
@@ -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<ParamsColl
@Autowired
private IParamsCollectManifestEOService paramsCollectManifestEOService;
@Autowired
private ISysUserService sysUserService;
/**
* 表头中英文切换
*
@@ -97,6 +109,24 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 保存
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-保存")
@ApiOperation(value="参数项收集清单-保存", notes="参数项收集清单-保存")
@PostMapping(value = "/save")
// @RequiresPermissions("params:collectManifest:save")
public Result<?> 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<ParamsColl
}
}
/**
* 获取用户列表数据
*
* @param user
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "填写人-分页查询")
@ApiOperation(value="填写人-分页查询", notes="填写人-分页查询")
@GetMapping(value = "/drePage")
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
//TODO 外部模拟登陆临时账号，列表不显示
queryWrapper.ne("username", "_reserve_user_external");
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
//step.2 通过 useids，一次性查询用户的所属部门名字
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
if (userIds != null && userIds.size() > 0) {
Map<String, String> 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<ParamsColl
public Result<?> 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<ParamsColl
@ApiOperation(value="参数项收集清单-引用参数", notes="参数项收集清单-引用参数")
@PostMapping(value = "/referParams")
// @RequiresPermissions("params:collectManifest:refer")
public Result<?> referParams(ParamsCollectManifestVO paramsCollectManifestVO) {
public Result<?> referParams(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("引用参数成功！");
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java
+72
View File
@@ -0,0 +1,72 @@
package com.jero.modules.cert.collect.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.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
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-07-01
* @Version: V1.0
*/
@Api(tags="参数项收集切换角色日志表")
@RestController
@RequestMapping("/params/userTypeLog")
@Slf4j
public class ParamsCollectManifestUserTypeLogEOController extends JeroController<ParamsCollectManifestUserTypeLogEO, IParamsCollectManifestUserTypeLogEOService> {
@Autowired
private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService;
/**
* 编辑
*
* @param paramsCollectManifestUserTypeLogEO
* @return
*/
@AutoLog(value = "参数项收集切换角色日志表-编辑")
@ApiOperation(value="参数项收集切换角色日志表-编辑", notes="参数项收集切换角色日志表-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
paramsCollectManifestUserTypeLogEOService.editById(paramsCollectManifestUserTypeLogEO);
return Result.OK("编辑成功!");
}
/**
* 通过id查询
*
* @param
* @return
*/
@AutoLog(value = "参数项收集切换角色日志表-查询当前用户类型")
@ApiOperation(value="参数项收集切换角色日志表-查询当前用户类型", notes="参数项收集切换角色日志表-查询当前用户类型")
@GetMapping(value = "/queryCurrentType")
public Result<?> queryById(@RequestParam(name="projectId",required=true) String projectId,
@RequestParam(name="paramsManifestId",required=true) String paramsManifestId,
@RequestParam(name="userId",required=true) String userId) {
ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO = paramsCollectManifestUserTypeLogEOService.queryCurrentType(projectId,paramsManifestId,userId);
return Result.OK(paramsCollectManifestUserTypeLogEO);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+39 -6
View File
@@ -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<ParamsManifestEO, IParamsManifestEOService> {
@Autowired
private IParamsManifestEOService paramsManifestEOService;
@Autowired
private IParamsConfigEOService paramsConfigEOService;
/**
/**
* 分页列表查询
@@ -66,6 +76,12 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsManifestEOService.pageInfo(page, paramsManifestEO);
List<ParamsManifestEO> rows = pageList.getRecords();
// 处理 状态 中英文
Map<String, String> 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<ParamsManifestEO,
@ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
@PostMapping(value = "/copy")
// @RequiresPermissions("params:manifest:copy")
public Result<?> 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<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
if (CollectionUtil.isNotEmpty(list)) {
return Result.OK(true); // 不为空
} else {
return Result.OK(false); // 为空
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
+10
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java
+84
View File
@@ -0,0 +1,84 @@
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 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-07-01
* @Version: V1.0
*/
@Data
@TableName("params_collect_manifest_user_type_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_collect_manifest_user_type_log对象", description="参数项收集切换角色日志表")
public class ParamsCollectManifestUserTypeLogEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**项目id*/
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
private String projectId;
/**参数清单id*/
@Excel(name = "参数清单id", width = 15)
@ApiModelProperty(value = "参数清单id")
private String paramsManifestId;
/**用户id*/
@Excel(name = "用户id", width = 15)
@ApiModelProperty(value = "用户id")
private String userId;
/**用户类型*/
@Excel(name = "用户类型", width = 15)
@ApiModelProperty(value = "用户类型")
private String userType;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java
+5 -3
View File
@@ -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*/
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+6 -4
View File
@@ -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;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java
+6 -2
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java
+9 -9
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
+33 -3
View File
@@ -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<String,String> toMap(String cut){
Map<String,String> 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;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java
+17
View File
@@ -0,0 +1,17 @@
package com.jero.modules.cert.collect.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 参数项收集切换角色日志表
* @Author: jero-boot
* @Date: 2022-07-01
* @Version: V1.0
*/
public interface ParamsCollectManifestUserTypeLogEOMapper extends BaseMapper<ParamsCollectManifestUserTypeLogEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+6 -4
View File
@@ -27,6 +27,8 @@
<result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="change_flag" property="changeFlag" />
<result column="del_flag" property="delFlag" />
<result column="add_flag" property="addFlag" />
</resultMap>
<sql id="BaseQuerySql">
<where>
@@ -52,13 +54,13 @@
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
<choose>
<when test="paramsCollectManifestEO.userTypes == 'sdt'">
AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1'
AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7','8')
</when>
<when test="paramsCollectManifestEO.userTypes == 'dre'">
AND dre = #{paramsCollectManifestEO.dreForAuth}
AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8')
</when>
<when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
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')
</when>
<when test="paramsCollectManifestEO.userTypes == 'guest'">
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})
@@ -74,7 +76,7 @@
select *
from params_collect_manifest
<include refid="BaseQuerySql"/>
order by change_flag desc, create_time asc
order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
+1 -1
View File
@@ -57,6 +57,6 @@
select *
from params_collect_manifest_history
<include refid="BaseQuerySql"/>
order by create_time asc
order by nio_number asc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper">
<resultMap id="ParamsCollectManifestUserTypeLogEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="project_id" property="projectId" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="user_id" property="userId" />
<result column="user_type" property="userType" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+2 -1
View File
@@ -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}
<if test="projectName !=null and projectName !=''">
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+9
View File
@@ -80,6 +80,13 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
*/
boolean submit(List<Map<String, Object>> configDataList);
/**
* 保存
* @param configDataList
* @return
*/
boolean save(List<Map<String, Object>> configDataList);
/**
* 查询清单所用模版参数项列表（过滤清单已添加的参数项）
* @param paramsCollectManifestVO
@@ -95,6 +102,8 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
boolean getManifestConfigFlag(String paramsManifestId);
Map<String, List<ParamsCollectManifestEO>> queryByManifestIdList(List<String> manifestIdList);
// 退回
boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java
+63
View File
@@ -0,0 +1,63 @@
package com.jero.modules.cert.collect.service;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 参数项收集切换角色日志表
* @Author: jero-boot
* @Date: 2022-07-01
* @Version: V1.0
*/
public interface IParamsCollectManifestUserTypeLogEOService extends IService<ParamsCollectManifestUserTypeLogEO> {
/**
* 保存
*
* @param paramsCollectManifestUserTypeLogEO
* @return
*/
void add(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO);
/**
* 更新
*
* @param paramsCollectManifestUserTypeLogEO
* @return
*/
void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsCollectManifestUserTypeLogEO queryById(String id);
ParamsCollectManifestUserTypeLogEO queryCurrentType(String projectId, String paramsManifestId, String userId);
/**
* 列表查询
*
* @return
*/
List<ParamsCollectManifestUserTypeLogEO> queryList();
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java
+7
View File
@@ -62,4 +62,11 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
* @return
*/
List<ParamsConfigDataEO> queryList();
/**
* 查询清单的所有配置数据
* @param configIdList
* @return
*/
List<ParamsConfigDataEO> queryListByConfigIdList(List<String> configIdList);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java
+10
View File
@@ -1,8 +1,11 @@
package com.jero.modules.cert.collect.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
import java.util.List;
/**
* @Description: 参数配置数据历史版本
* @Author: jero-boot
@@ -19,4 +22,11 @@ public interface IParamsConfigDataHistoryEOService extends IService<ParamsConfig
* @return
*/
ParamsConfigDataHistoryEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
/**
* 查询清单的所有配置数据
* @param configIdList
* @return
*/
List<ParamsConfigDataHistoryEO> queryListByConfigIdList(List<String> configIdList);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+225 -36
View File
@@ -142,6 +142,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
target.setId(UUID.randomUUID().toString().replace("-",""));
target.setParamsManifestId(paramsManifestId);
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
target.setAddFlag(CollectManifestChangeFlagEnum.ADD_AFTER.getValue()); // 设置添加标识
target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
Date date = new Date();
target.setCreateBy(user.getUsername());
@@ -163,6 +166,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsCollectManifestEOList.add(target);
}
// 判断清单状态是否为已完成，若是，更改为收集中
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
if (ManifestStateEnum.FINISHED.getValue().equals(paramsManifestEO.getState())) {
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(paramsManifestId);
updateParamsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
updateParamsManifestEO.setFinishTime(null);
paramsManifestEOService.updateById(updateParamsManifestEO);
}
return saveBatch(paramsCollectManifestEOList);
}
@@ -214,6 +229,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return getById(id);
}
private ParamsConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsConfigDataEO> paramsConfigDataEOList) {
List<ParamsConfigDataEO> configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(configDataEOList)) {
return configDataEOList.get(0);
}
return null;
}
/**
* 列表查询
*
@@ -250,8 +273,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsCollectManifestEO.setSdt(loginUser.getUsername());
paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
}
List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
// 普通数据字典
List<SysDictItem> dictItemList = new ArrayList<>();
@@ -315,7 +340,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
@@ -715,6 +741,90 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return updateBatchById(updateCollectManifestEOList);
}
@Override
public boolean save(List<Map<String, Object>> configDataList) {
List<ParamsConfigDataEO> newConfigDataEOList = new ArrayList<>();
// 处理数据
for (Map<String, Object> map : configDataList) {
String paramsCollectManifestId = (String) map.get("id");
// 添加配置数据
for (Map.Entry<String, Object> entry : map.entrySet()) {
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
if ("id".equals(entry.getKey())) {
continue;
}
// 取值
String paramsConfigEOId = entry.getKey();
Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) 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<String, Object> 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<OSSFile> updateFileList = new ArrayList<>();
for (int i = 0; i < fileIdList.length; i++) {
OSSFile ossFile = new OSSFile();
ossFile.setId(fileIdList[i]);
ossFile.setConnectId(connectId);
updateFileList.add(ossFile);
}
ossFileService.updateBatchById(updateFileList);
dataValue = connectId;
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
String connectId = UUID.randomUUID().toString().replace("-", "");
//修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>();
for (String fileId : dataValue.split(",")) {
OSSFile ossFile = new OSSFile();
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
oSSFileList.add(ossFile);
}
ossFileService.updateFileInfo(oSSFileList);
dataValue = connectId;
}
}
paramsConfigDataEO.setFileConnectId(dataValue);
}
}
}
newConfigDataEOList.add(paramsConfigDataEO);
}
}
// 批量更新
return paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
}
/**
* 查询清单所用模版参数项列表（过滤清单已添加的参数项）
* @param paramsCollectManifestVO
@@ -728,7 +838,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber()), ParamsInfoPublishEO::getNioNumber, paramsCollectManifestVO.getNioNumber())
.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName()), ParamsInfoPublishEO::getParamsName, paramsCollectManifestVO.getParamsName())
.eq(StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory()), ParamsInfoPublishEO::getDutyTerritory, paramsCollectManifestVO.getDutyTerritory())
.orderByDesc(ParamsInfoPublishEO::getCreateTime);
.orderByAsc(ParamsInfoPublishEO::getNioNumber);
List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.list(queryWrapper);
@@ -940,6 +1050,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
@Override
public Map<String, List<ParamsCollectManifestEO>> queryByManifestIdList(List<String> manifestIdList){
Map<String, List<ParamsCollectManifestEO>> map = new HashMap<>();
LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, manifestIdList);
List<ParamsCollectManifestEO> list = list(queryWrapper);
for (String manifestId : manifestIdList) {
List<ParamsCollectManifestEO> collectManifestEOList = list.stream().filter(e->manifestId.equals(e.getParamsManifestId())).collect(Collectors.toList());
map.put(manifestId, collectManifestEOList);
}
return map;
}
@Override
public boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) {
@@ -953,7 +1077,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsCollectManifestEO paramsCollectManifestEO = getById(paramsCollectManifestIdStr[i]);
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestIdStr[i]);
updateEO.setState(String.valueOf(Integer.parseInt(paramsCollectManifestEO.getState()) + 1)); // 设置对应状态
if (CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())
|| CollectManifestStateEnum.DRE_BACK.getValue().equals(paramsCollectManifestEO.getState())
|| CollectManifestStateEnum.CERT_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
updateEO.setState(String.valueOf(Integer.parseInt(paramsCollectManifestEO.getState()) - 2)); // 设置对应状态
} else {
updateEO.setState(String.valueOf(Integer.parseInt(paramsCollectManifestEO.getState()) + 1)); // 设置对应状态
}
updateEOList.add(updateEO);
}
return updateBatchById(updateEOList);
@@ -973,14 +1105,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
Integer state = Integer.parseInt(paramsCollectManifestEO.getState());
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
if (CollectManifestStateEnum.WAIT_SDT.getValue().equals(state)
|| CollectManifestStateEnum.DRE_BACK.getValue().equals(state)) {
if (CollectManifestStateEnum.WAIT_SDT.getValue().equals(paramsCollectManifestEO.getState())) {
updateEO.setState(String.valueOf(state - 1)); // 设置对应状态
} else if (CollectManifestStateEnum.WAIT_FILL.getValue().equals(state)
|| CollectManifestStateEnum.SUBMIT.getValue().equals(state)) {
} else if (CollectManifestStateEnum.WAIT_FILL.getValue().equals(paramsCollectManifestEO.getState())
|| CollectManifestStateEnum.SUBMIT.getValue().equals(paramsCollectManifestEO.getState())) {
updateEO.setState(String.valueOf(state - 2)); // 设置对应状态
}else if (CollectManifestStateEnum.DRE_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
updateEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); // 设置对应状态
}
updateEO.setId(paramsCollectManifestIdStr[i]);
@@ -1025,12 +1158,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override
public boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
|| StringUtils.isEmpty(paramsCollectManifestVO.getDre()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
|| StringUtils.isEmpty(paramsCollectManifestVO.getDre())
|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
throw new JeroBootException("参数不能为空！");
}
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String dre = paramsCollectManifestVO.getDre();
String projectId = paramsCollectManifestVO.getProjectId();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1038,7 +1173,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
connectBuilder.append("You are required to fll in ");
for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
ParamsCollectManifestEO paramsCollectManifestEO = getById(paramsCollectManifestIdStr[i]);
connectBuilder.append(paramsCollectManifestEO.getNioNumber()).append("-").append(paramsCollectManifestEO.getParamsName()).append(",");
if (i < 3) {
connectBuilder.append(paramsCollectManifestEO.getNioNumber()).append("-").append(paramsCollectManifestEO.getParamsName()).append(",");
}
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestIdStr[i]);
@@ -1052,8 +1189,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
SysUser sysUser = sysUserService.getUserByName(dre);
String[] thirdIds = new String[1];
thirdIds[0] = sysUser.getThirdId();
String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
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 +1217,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override
public boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
throw new JeroBootException("参数不能为空！");
}
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String projectId = paramsCollectManifestVO.getProjectId();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1107,8 +1246,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
StringBuilder connectBuilder = new StringBuilder();
connectBuilder.append("You are required to fll in ");
for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
if (sdt.equals(paramsCollectManifestEO.getSdt())) {
for (int i=0; i<paramsCollectManifestEOList.size(); i++) {
ParamsCollectManifestEO paramsCollectManifestEO = paramsCollectManifestEOList.get(i);
if (sdt.equals(paramsCollectManifestEO.getSdt()) && i<3) {
connectBuilder.append(paramsCollectManifestEO.getNioNumber()).append("-").append(paramsCollectManifestEO.getParamsName()).append(",");
}
}
@@ -1117,8 +1257,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
SysUser sysUser = sysUserService.getUserByName(sdt);
String[] thirdIds = new String[1];
thirdIds[0] = sysUser.getThirdId();
String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
// 发送系统消息
@@ -1175,7 +1315,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override
public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
throw new JeroBootException("参数不能为空！");
}
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
@@ -1217,7 +1357,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String targetConfigIds = paramsCollectManifestVO.getTargetConfigIds();
if (targetConfigIds.contains(sourceConfigId)) {
throw new JeroBootException("引用到的配置不能包含被引用配置！");
if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
throw new JeroBootException("References to the configuration does not contain the referenced configuration!");
} else {
throw new JeroBootException("引用到的配置不能包含被引用配置！");
}
}
String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
String[] targetConfigIdStr = targetConfigIds.split(",");
@@ -1247,7 +1391,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
} else {
return false;
// 清空引用到的配置的数据
for (int j = 0; j < targetConfigIdStr.length; j++) {
ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
updateConfigDataEO.setId(targetConfigDataEO.getId());
updateConfigDataEO.setTextData(null);
updateConfigDataEO.setPullData(null);
updateConfigDataEO.setFileConnectId(null);
updateConfigDataEOList.add(updateConfigDataEO);
}
}
}
}
@@ -1267,13 +1422,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<String> 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 +1436,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
List<ParamsReportConfigEO> addReportConfigEOList = new ArrayList<>();
List<ReportCertCategoryParamsInfoEO> addReportCertCategoryParamsInfoEOList = new ArrayList<>();
Map<String, String> 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<ParamsReportConfigEO> paramsReportConfigEOList = paramsReportConfigEOService.queryList(reportId);
configIdMap = paramsReportConfigEOList.stream().collect(Collectors.toMap(ParamsReportConfigEO::getOldParamsConfigId, ParamsReportConfigEO::getId));
}
// 添加参数项到上报库
@@ -1312,6 +1476,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO);
@@ -1323,7 +1489,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<CertCategoryParamsInfoPublishEO> 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 +1500,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 添加参数项
paramsReportDetailEOService.saveBatch(addReportDetailEOList);
// 添加配置
paramsReportConfigEOService.saveBatch(addReportConfigEOList);
if (!isSync) { // 未上报
// 添加配置
paramsReportConfigEOService.saveBatch(addReportConfigEOList);
}
// 添加配置数据
paramsReportConfigDataEOService.saveBatch(addReportConfigDataEOList);
// 添加上报库
ParamsReportEO addReportEO = new ParamsReportEO();
addReportEO.setId(reportId);
addReportEO.setOldParamsManifestId(paramsManifestId);
addReportEO.setVersion(paramsManifestEO.getVersion());
paramsReportEOService.save(addReportEO);
if (!isSync) { // 未上报
// 添加上报库
ParamsReportEO addReportEO = new ParamsReportEO();
addReportEO.setId(reportId);
addReportEO.setOldParamsManifestId(paramsManifestId);
addReportEO.setVersion(paramsManifestEO.getVersion());
addReportEO.setParamsTemplatePublishVersion(paramsManifestEO.getParamsTemplatePublishVersion());
paramsReportEOService.add(addReportEO);
}
// 修改收集库参数项状态
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1355,7 +1527,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateEO.setState(CollectManifestStateEnum.SYNC_REPORT.getValue()); // 设置状态为：待工程接口人处理
updateEOList.add(updateEO);
}
return updateBatchById(updateEOList);
boolean isSuccess = updateBatchById(updateEOList);
// 判断清单是否已完成，修改清单状态
Map<String, Object> map = isCollectFinished(paramsManifestId);
Boolean finish = (Boolean) map.get("finish");
Date time = (Date) map.get("time");
if (finish) {
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(paramsManifestId);
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
paramsManifestEOService.updateById(updateParamsManifestEO);
}
return isSuccess;
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+64 -4
View File
@@ -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,17 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private IOSSFileService ossFileService;
private ParamsConfigDataHistoryEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsConfigDataHistoryEO> paramsConfigDataEOList) {
List<ParamsConfigDataHistoryEO> configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(configDataEOList)) {
return configDataEOList.get(0);
}
return null;
}
/**
* 列表查询
@@ -64,6 +77,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
List<ParamsConfigDataHistoryEO> paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
// 普通数据字典
List<SysDictItem> dictItemList = new ArrayList<>();
@@ -117,6 +133,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
String stateName = collectManifestStateMap.get(collectManifestEO.getState());
collectManifestEO.setState(stateName);
List<String> configIdList = new ArrayList<>(); // 配置列名
Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
String controlType = collectManifestEO.getControlType();
String paramsCollectManifestId = collectManifestEO.getId();
@@ -125,11 +143,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
manifestMap.put(paramsConfigEO.getId(), configMap);
configIdList.add(paramsConfigEO.getId());
});
}
@@ -141,6 +162,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
sdtMap.put("dataValue", collectManifestEO.getSdt());
manifestMap.put("sdt", sdtMap);
// 配置列名数组
manifestMap.put("configIds", configIdList);
listMap.add(manifestMap);
});
@@ -154,14 +178,24 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
* @param paramsCollectManifestEO
* @return
*/
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) {
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataHistoryEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) {
List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
String templateId = null;
String templateName = null;
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) {
List<OSSFile> 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 +207,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -184,6 +219,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -195,6 +231,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setTemplateId(templateId);
configDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -205,6 +244,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -214,6 +254,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -225,6 +266,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -234,6 +276,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -245,6 +288,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -254,6 +298,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -264,6 +311,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -273,6 +321,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -283,6 +334,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -292,6 +344,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -302,6 +357,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -311,6 +367,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -320,6 +377,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -336,7 +396,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
String[] controlValueStr = controlValue.split(",");
for (int i = 0; i < controlValueStr.length; i++) {
Map<String, String> controlValueMap = new HashMap<>();
controlValueMap.put("lable", controlValueStr[i]);
controlValueMap.put("label", controlValueStr[i]);
controlValueMap.put("value", controlValueStr[i]);
controlValueMapList.add(controlValueMap);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java
+105
View File
@@ -0,0 +1,105 @@
package com.jero.modules.cert.collect.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
import com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper;
import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
import org.apache.commons.collections4.CollectionUtils;
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-07-01
* @Version: V1.0
*/
@Service
public class ParamsCollectManifestUserTypeLogEOServiceImpl extends ServiceImpl<ParamsCollectManifestUserTypeLogEOMapper, ParamsCollectManifestUserTypeLogEO> implements IParamsCollectManifestUserTypeLogEOService {
/**
* 保存
*
* @param paramsCollectManifestUserTypeLogEO
* @return
*/
@Override
public void add(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
Date now = new Date();
paramsCollectManifestUserTypeLogEO.setCreateTime(now);
paramsCollectManifestUserTypeLogEO.setUpdateTime(now);
save(paramsCollectManifestUserTypeLogEO);
}
/**
* 更新
*
* @param paramsCollectManifestUserTypeLogEO
* @return
*/
@Override
public void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) {
Date now = new Date();
paramsCollectManifestUserTypeLogEO.setUpdateTime(now);
saveOrUpdate(paramsCollectManifestUserTypeLogEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ParamsCollectManifestUserTypeLogEO queryById(String id) {
return getById(id);
}
@Override
public ParamsCollectManifestUserTypeLogEO queryCurrentType(String projectId, String paramsManifestId, String userId) {
ParamsCollectManifestUserTypeLogEO result = new ParamsCollectManifestUserTypeLogEO();
LambdaQueryWrapper<ParamsCollectManifestUserTypeLogEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsCollectManifestUserTypeLogEO::getProjectId, projectId)
.eq(ParamsCollectManifestUserTypeLogEO::getParamsManifestId, paramsManifestId)
.eq(ParamsCollectManifestUserTypeLogEO::getUserId, userId);
List<ParamsCollectManifestUserTypeLogEO> resultList = list(queryWrapper);
if(CollectionUtils.isNotEmpty(resultList)){
result = resultList.get(0);
}
return result;
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsCollectManifestUserTypeLogEO> queryList() {
return list();
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
+16
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.collect.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
@@ -107,4 +108,19 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
public List<ParamsConfigDataEO> queryList() {
return list();
}
/**
* 查询清单的所有配置数据
* @param configIdList
* @return
*/
@Override
public List<ParamsConfigDataEO> queryListByConfigIdList(List<String> configIdList) {
if (CollectionUtil.isNotEmpty(configIdList)) {
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList);
return list(queryWrapper);
}
return null;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java
+19
View File
@@ -1,12 +1,16 @@
package com.jero.modules.cert.collect.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper;
import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 参数配置数据历史版本
* @Author: jero-boot
@@ -31,4 +35,19 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl<ParamsConf
getOne(queryWrapper);
return getOne(queryWrapper);
}
/**
* 查询清单的所有配置数据
* @param configIdList
* @return
*/
@Override
public List<ParamsConfigDataHistoryEO> queryListByConfigIdList(List<String> configIdList) {
if (CollectionUtil.isNotEmpty(configIdList)) {
LambdaQueryWrapper<ParamsConfigDataHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList);
return list(queryWrapper);
}
return null;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
+4 -2
View File
@@ -107,9 +107,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
});
// saveBatch(addConfigList);
// 修改所有参数项状态为：待发起收集
if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
List<ParamsCollectManifestEO> updateList = paramsCollectManifestEOList.stream()
.filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(updateList)) {
List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
paramsCollectManifestEOList.forEach(collectManifestEO -> {
updateList.forEach(collectManifestEO -> {
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(collectManifestEO.getId());
updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+156 -73
View File
@@ -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;
@@ -79,6 +80,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
@Autowired
private IParamsConfigEOService paramsConfigEOService;
@Autowired
private IParamsConfigDataEOService paramsConfigDataEOService;
/**
@@ -94,7 +99,11 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
List<ParamsManifestEO> 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 +119,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
target.setId(UUID.randomUUID().toString().replace("-",""));
target.setParamsManifestId(paramsManifestId);
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
target.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 设置添加标识
target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
@@ -152,7 +165,11 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId());
List<ParamsManifestEO> 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("标题已存在！");
}
}
}
@@ -275,47 +292,57 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
IPage rows = paramsManifestEOMapper.pageInfo(page, paramsManifestEO);
// 根据参数项状态更新清单状态
List<ParamsManifestEO> paramsManifestEOList = rows.getRecords();
paramsManifestEOList.forEach(manifestEO -> {
Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId());
if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
List<String> manifestIdList = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
Map<String, List<ParamsCollectManifestEO>> manifestMap = paramsCollectManifestEOService.queryByManifestIdList(manifestIdList);
paramsManifestEOList.forEach(manifestEO -> {
/*Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId());
Boolean finish = (Boolean) map.get("finish");
Date time = (Date) map.get("time");
if (finish) {
if (ManifestStateEnum.COLLECTING.getValue().equals(manifestEO.getState())) {
manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
manifestEO.setFinishTime(time);
manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
manifestEO.setFinishTime(time);
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(manifestEO.getId());
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
updateById(updateParamsManifestEO);
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(manifestEO.getId());
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
updateById(updateParamsManifestEO);
}
} else {
if (ManifestStateEnum.FINISHED.getValue().equals(manifestEO.getState())) {
manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
manifestEO.setFinishTime(null);
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(manifestEO.getId());
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
updateParamsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
updateParamsManifestEO.setFinishTime(null);
updateById(updateParamsManifestEO);
}
}
manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
manifestEO.setFinishTime(null);
// 添加配置标识，清单参数项状态为 待发起、变更时，可添加配置
boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(manifestEO.getId());
manifestEO.setConfigFlag(configFlag);
}*/
});
// 添加配置标识，清单参数项状态为 待发起、变更时，可添加配置
boolean configFlag = getManifestConfigFlag(manifestMap.get(manifestEO.getId()));
manifestEO.setConfigFlag(configFlag);
});
}
return rows;
}
@Autowired
private IParamsConfigDataEOService paramsConfigDataEOService;
private boolean getManifestConfigFlag(List<ParamsCollectManifestEO> list) {
int number = (int) list.stream().filter(e->CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
|| CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
if (number == list.size() && list.size() > 0) {
return true;
} else {
return false;
}
}
/**
* 变更扩展
@@ -370,51 +397,81 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 比较模板参数项 和 项目参数项
// nio编号一样时，比较参数填写规则（控件类型，控件备选值，控件校验）是否一样；nio编号不一样时，不用管，用户自己添加
List<String> nioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
List<ParamsInfoPublishEO> sameList = newParamsInfoPublishEOList.stream().filter(e->nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
List<String> oldNioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
List<ParamsInfoPublishEO> sameList = newParamsInfoPublishEOList.stream().filter(e->oldNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
List<String> newNioNumberList = sameList.stream().map(ParamsInfoPublishEO::getNioNumber).collect(Collectors.toList());
List<ParamsCollectManifestEO> diffList = oldParamsCollectManifestEOList.stream().filter(e->!newNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
List<String> delCollectManifestIdList = new ArrayList<>();
List<ParamsCollectManifestEO> 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);
@@ -427,6 +484,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
updateManifestEO.setId(id);
updateManifestEO.setVersion(paramsManifestEO.getVersion() + 1);
updateManifestEO.setParamsTemplatePublishVersion(newestVersion);
updateManifestEO.setState(ManifestStateEnum.COLLECTING.getValue()); // 变更扩展后，清单状态为收集中
return updateById(updateManifestEO);
}
@@ -444,9 +502,32 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
@Override
public ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId) {
// 判断清单收集状态，已完成状态才可复制
Map<String, Object> 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<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
List<ParamsManifestEO> 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<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsTemplateId, paramsTemplatePublishVersion);
@@ -500,24 +581,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
String addCollectManifestId = UUID.randomUUID().toString().replace("-",""); // 参数项id
if (CollectionUtil.isNotEmpty(manifestEOList)) {
ParamsCollectManifestEO manifestEO = manifestEOList.get(0);
ParamsCollectManifestEO collectManifestEO = manifestEOList.get(0);
// 配置数据： nio编号，控件类型，控件备选值，控件校验 均一致时 将清单参数项项复制到模板参数项，否则不复制
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), manifestEO.getId());
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
if (ObjectUtil.isNotEmpty(configDataEO)) {
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
addConfigDataEO.setId(null);
addConfigDataEO.setCreateBy(null);
addConfigDataEO.setCreateTime(null);
addConfigDataEO.setUpdateBy(null);
addConfigDataEO.setUpdateTime(null);
addConfigDataEO.setSysOrgCode(null);
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
addConfigDataEOList.add(addConfigDataEO);
addConfigDataEO.setId(null);
addConfigDataEO.setCreateBy(null);
addConfigDataEO.setCreateTime(null);
addConfigDataEO.setUpdateBy(null);
addConfigDataEO.setUpdateTime(null);
addConfigDataEO.setSysOrgCode(null);
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
addConfigDataEOList.add(addConfigDataEO);
}
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
+2
View File
@@ -11,6 +11,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.*;
import java.util.stream.Collectors;
@@ -21,6 +22,7 @@ import java.util.stream.Collectors;
* @Version: V1.0
*/
@Service
@Transactional
public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManifestHistoryEOMapper, ParamsManifestHistoryEO> implements IParamsManifestHistoryEOService {
@Autowired
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+2
View File
@@ -69,4 +69,6 @@ public class ParamsCollectManifestVO {
private String sourceConfigId; // 引用参数专用
@ApiModelProperty(value = "引用参数专用-到")
private String targetConfigIds; // 引用参数专用
private String cut; // 引用参数专用
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
+1
View File
@@ -21,4 +21,5 @@ public class ParamsManifestVO {
private String ids;
private String cut;
private String sourceManifestId;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
+3 -1
View File
@@ -61,10 +61,12 @@ public class ParamsExportTemplateEOController extends JeroController<ParamsExpor
}
LambdaQueryWrapper<ParamsExportTemplateEO> 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<ParamsExportTemplateEO> page = new Page<ParamsExportTemplateEO>(pageNo, pageSize);
IPage<ParamsExportTemplateEO> pageList = paramsExportTemplateEOService.page(page, queryWrapper);
List<ParamsExportTemplateEO> rows = pageList.getRecords();
// 处理 状态 中英文
Map<String, String> stateMap = ExportTemplateStateEnum.toMap(cut);
rows.forEach(exportTemplateEO -> {
exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState()));
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+41 -14
View File
@@ -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<ParamsReportD
@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
public Result<List<Map<String, Object>>> 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<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsCollectManifestEO, cut);
List<Map<String, Object>> 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<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);
return Result.OK(configLabelList);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+3 -3
View File
@@ -104,7 +104,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
*/
@AutoLog(value = "上报库-编辑")
@ApiOperation(value="上报库-编辑", notes="上报库-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsReportEO paramsReportEO) {
paramsReportEOService.editById(paramsReportEO);
return Result.OK("编辑成功!");
@@ -118,7 +118,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
*/
@AutoLog(value = "上报库-通过id删除")
@ApiOperation(value="上报库-通过id删除", notes="上报库-通过id删除")
@DeleteMapping(value = "/delete")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsReportEOService.deleteById(id);
return Result.OK("删除成功!");
@@ -132,7 +132,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
*/
@AutoLog(value = "上报库-批量删除")
@ApiOperation(value="上报库-批量删除", notes="上报库-批量删除")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paramsReportEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
+4
View File
@@ -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;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java
+7
View File
@@ -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;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
+1
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
+3
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
+5
View File
@@ -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;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java
+2 -2
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java
+5
View File
@@ -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<ParamsReportConfigDataEO> {
List<ParamsReportConfigDataEO> selectByConfigIdListAndCollectManifestId(@Param("configIdList") List<String> configIdList,
@Param("paramsCollectManifestId") String paramsCollectManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+7 -1
View File
@@ -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<ParamsReportDetailEO> {
List<ParamsReportDetailEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
@Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml
+12
View File
@@ -14,4 +14,16 @@
<result column="params_config_id" property="paramsConfigId" />
<result column="params_collect_manifest_id" property="paramsCollectManifestId" />
</resultMap>
<select id="selectByConfigIdListAndCollectManifestId" resultMap="ParamsReportConfigDataEOResultMap">
select *
from params_report_config_data prcd
left join params_report_config prc on prcd.params_config_id = prc.id
where prcd.params_collect_manifest_id = #{paramsCollectManifestId}
and prcd.params_config_id in
<foreach collection="configIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
order by prc.display_seq asc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml
+1
View File
@@ -16,5 +16,6 @@
<result column="params_manifest_id" property="paramsManifestId" />
<result column="is_lock" property="isLock" />
<result column="display_seq" property="displaySeq" />
<result column="old_params_config_id" property="oldParamsConfigId" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+63 -14
View File
@@ -31,24 +31,53 @@
<sql id="BaseQuerySql">
<where>
<if test="paramsCollectManifestEO != null">
<if test="paramsCollectManifestEO.nioNumber !=null and paramsCollectManifestEO.nioNumber !=''">
AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%')
<if test="paramsReportDetailEO != null">
<if test="paramsReportDetailEO.nioNumber !=null and paramsReportDetailEO.nioNumber !=''">
AND nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.nioNumber}),'%')
</if>
<if test="paramsCollectManifestEO.paramsName !=null and paramsCollectManifestEO.paramsName !=''">
AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%')
<if test="paramsReportDetailEO.paramsName !=null and paramsReportDetailEO.paramsName !=''">
AND params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.paramsName}),'%')
</if>
<if test="paramsCollectManifestEO.certCategory !=null and paramsCollectManifestEO.certCategory !=''">
AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%')
<if test="paramsReportDetailEO.certCategory !=null and paramsReportDetailEO.certCategory !=''">
AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%')
</if>
<if test="paramsCollectManifestEO.sdt !=null and paramsCollectManifestEO.sdt !=''">
AND sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%')
<if test="paramsReportDetailEO.sdt !=null and paramsReportDetailEO.sdt !=''">
AND sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.sdt}),'%')
</if>
<if test="paramsCollectManifestEO.dre !=null and paramsCollectManifestEO.dre !=''">
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
<if test="paramsReportDetailEO.dre !=null and paramsReportDetailEO.dre !=''">
AND dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
<if test="paramsReportDetailEO.paramsManifestId !=null and paramsReportDetailEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId}
</if>
</if>
</where>
</sql>
<sql id="BaseQuerySqlForExport">
<where>
<if test="paramsReportDetailVO != null">
<if test="paramsReportDetailVO.nioNumber !=null and paramsReportDetailVO.nioNumber !=''">
AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.nioNumber}),'%')
</if>
<if test="paramsReportDetailVO.paramsName !=null and paramsReportDetailVO.paramsName !=''">
AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%')
</if>
<if test="paramsReportDetailVO.certCategory !=null and paramsReportDetailVO.certCategory !=''">
AND rccpi.cert_category = #{paramsReportDetailVO.certCategory}
</if>
<if test="paramsReportDetailVO.paramsTemplatePublishVersion !=null and paramsReportDetailVO.paramsTemplatePublishVersion !=''">
AND rccpi.version = #{paramsReportDetailVO.paramsTemplatePublishVersion}
</if>
<if test="paramsReportDetailVO.sdt !=null and paramsReportDetailVO.sdt !=''">
AND prd.sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.sdt}),'%')
</if>
<if test="paramsReportDetailVO.dre !=null and paramsReportDetailVO.dre !=''">
AND prd.dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.dre}),'%')
</if>
<if test="paramsReportDetailVO.paramsManifestId !=null and paramsReportDetailVO.paramsManifestId !=''">
AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId}
</if>
</if>
@@ -59,6 +88,26 @@
select *
from params_report_detail
<include refid="BaseQuerySql"/>
order by create_time asc
order by nio_number asc, sync_time desc
</select>
<select id="listInfoForExport" resultType="java.util.LinkedHashMap">
select
prd.id as id,
prd.nio_number as nio_number,
prd.params_name as params_name,
rccpi.params_number as cert_number,
rccpi.params_name as cert_params_name
from params_report_detail prd
left join report_cert_category_params_info rccpi on prd.nio_number = rccpi.nio_number
<include refid="BaseQuerySqlForExport"/>
<if test="idList != null and idList.size > 0">
and prd.id in
<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by prd.nio_number ASC
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+7
View File
@@ -12,12 +12,18 @@
<result column="version" property="version" />
<result column="project_name" property="projectName" />
<result column="old_params_manifest_id" property="oldParamsManifestId" />
<result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
</resultMap>
<sql id="BaseColumnList">
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
</sql>
@@ -44,6 +50,7 @@
left join project_name_info as pni on plb.project_name_id = pni.id
) tmp_tb
<include refid="BaseQuerySql"/>
order by create_time desc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
+4
View File
@@ -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<ParamsReportC
* @return
*/
ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+10 -3
View File
@@ -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<ParamsReportDetai
/**
* 列表查询
* @param paramsCollectManifestEO
* @param paramsReportDetailEO
* @param cut
* @return
*/
List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut);
List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut);
/**
* 列表表头中英文切换
@@ -31,4 +33,9 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
* @return
*/
List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request);
// 配置-下拉选项
List<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java
+2 -2
View File
@@ -63,8 +63,8 @@ public interface IParamsReportEOService extends IService<ParamsReportEO> {
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);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
+27 -2
View File
@@ -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<ParamsExportT
*/
@Override
public boolean add(ParamsExportTemplateEO paramsExportTemplateEO) {
// 模板名称唯一校验
boolean isRepeat = verifyTemplateName(paramsExportTemplateEO.getTemplateName());
if (isRepeat) {
if (CutEnum.CN.equals(paramsExportTemplateEO.getCut())) {
throw new JeroBootException("模板名称已存在！");
} else {
throw new JeroBootException("Template Name already exists!");
}
}
// 处理附件模板 修改文件表关联信息connect_id 一个文件
if (StringUtils.isNotBlank(paramsExportTemplateEO.getFileConnectId())) {
String fileId = paramsExportTemplateEO.getFileConnectId();
@@ -66,6 +78,19 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl<ParamsExportT
*/
@Override
public boolean editById(ParamsExportTemplateEO paramsExportTemplateEO) {
ParamsExportTemplateEO templateEO = getById(paramsExportTemplateEO.getId());
if (!templateEO.getTemplateName().equals(paramsExportTemplateEO.getTemplateName())) {
// 模板名称唯一校验
boolean isRepeat = verifyTemplateName(paramsExportTemplateEO.getTemplateName());
if (isRepeat) {
if (CutEnum.CN.equals(paramsExportTemplateEO.getCut())) {
throw new JeroBootException("模板名称已存在！");
} else {
throw new JeroBootException("Template Name already exists!");
}
}
}
// 处理附件模板 若附件模板被修改，修改文件表关联信息connect_id 一个文件
if (StringUtils.isNotBlank(paramsExportTemplateEO.getFileConnectId())) {
String fileId = paramsExportTemplateEO.getFileConnectId();
@@ -136,9 +161,9 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl<ParamsExportT
queryWrapper.eq(ParamsExportTemplateEO::getTemplateName, templateName);
int repeatNum = count(queryWrapper);
if (repeatNum > 0) {
return false;
} else {
return true;
} else {
return false;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+7
View File
@@ -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<ParamsRepor
getOne(queryWrapper);
return getOne(queryWrapper);
}
@Override
public List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId) {
return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+455 -6
View File
@@ -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<ParamsReportDet
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private IOSSFileService ossFileService;
@Value(value = "${jero.path.upload}")
private String uploadpath;
/**
* 列表查询
@@ -62,10 +101,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
* @return
*/
@Override
public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
public List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) {
String paramsManifestId = paramsReportDetailEO.getParamsManifestId();
List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典
@@ -120,6 +159,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
String stateName = collectManifestStateMap.get(collectManifestEO.getState());
collectManifestEO.setState(stateName);
List<String> configIdList = new ArrayList<>(); // 配置列名
Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
String controlType = collectManifestEO.getControlType();
String paramsCollectManifestId = collectManifestEO.getId();
@@ -129,13 +170,26 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
manifestMap.put(paramsConfigEO.getId(), configMap);
configIdList.add(paramsConfigEO.getId());
});
}
// 处理工程接口人
// Map<String, Object> 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<ParamsReportDet
* @param paramsCollectManifestEO
* @return
*/
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) {
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) {
List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
String templateId = null;
String templateName = null;
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) {
List<OSSFile> 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<ParamsReportDet
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -179,6 +244,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -190,6 +256,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setTemplateId(templateId);
configDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -200,6 +269,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -209,6 +279,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -220,6 +291,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -229,6 +301,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -240,6 +313,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -249,6 +323,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -259,6 +336,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -268,6 +346,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -278,6 +359,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -287,6 +369,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -297,6 +382,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -306,6 +392,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -315,6 +402,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -331,7 +421,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
String[] controlValueStr = controlValue.split(",");
for (int i = 0; i < controlValueStr.length; i++) {
Map<String, String> 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<ParamsReportDet
return list;
}
@Override
public void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request) {
OutputStream os = null;
OutputStream excelOS = null;
XSSFWorkbook workbook = new XSSFWorkbook();
String fileOriName = "上报库参数项常规导出信息";
if (org.apache.commons.lang.StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
fileOriName = paramsReportDetailVO.getExportName();
}
//创建临时文件夹
String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + File.separator + fileOriName;
File nowFile = new File(fileNowPath);
if (nowFile.exists()){
nowFile.delete();
}
nowFile.mkdirs();
try{
String fileName = fileOriName + ".xlsx";
// 设置表格相关属性
XSSFSheet sheetItems = workbook.createSheet("上报库参数项信息");
String[] titles = getWorkbookTitleForExport(paramsReportDetailVO); // 获取表头
String[] headers = titles[1].split(",");
XSSFCellStyle cellStyle =workbook.createCellStyle();
cellStyle.setWrapText(true);
// cellStyle.setAlignment(XSSFCellStyle.ALIGN_CENTER);
cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
XSSFCellStyle cellStyle1 =workbook.createCellStyle();
cellStyle1.setAlignment(XSSFCellStyle.ALIGN_CENTER);
XSSFCellStyle cellStyleLink =workbook.createCellStyle();
XSSFFont font = workbook.createFont();
font.setColor(HSSFColor.LIGHT_BLUE.index);
cellStyleLink.setFont(font);
cellStyleLink.setWrapText(true);
// 查询需要导出的字段
String field = titles[0]; // 字符串形式
List<String> fieldList = Arrays.asList(field.split(",")); // list形式
// 查询导出数据
List<Map<String, Object>> allParamsInfoList = queryForExport(paramsReportDetailVO); // id记得去掉
// 开始处理工作表
List<OSSFile> 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<String, Object> exportDto = allParamsInfoList.get(rowNum);
// 处理文件
List<OSSFile> fileList = (List<OSSFile>) 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<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO) {
String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
// 查询配置列
LambdaQueryWrapper<ParamsReportConfigEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, paramsManifestId);
queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.list(queryWrapper);
List<Map<String, String>> configLabelList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
Map<String, String> map = new HashMap<>();
map.put("label", paramsConfigEO.getConfigName());
map.put("value", paramsConfigEO.getId());
configLabelList.add(map);
}
}
return configLabelList;
}
private void downLoadFileList(List<OSSFile> 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<Map<String, Object>> queryForExport(ParamsReportDetailVO paramsReportDetailVO) {
List<String> idList = new ArrayList<>();
if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) {
idList = Arrays.asList(paramsReportDetailVO.getIds().split(","));
}
List<String> configIdList = Arrays.asList(paramsReportDetailVO.getConfigIds().split(","));
List<Map<String, Object>> dataList = paramsReportDetailEOMapper.listInfoForExport(idList, paramsReportDetailVO);
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsReportDetailVO.getParamsManifestId()); // 查询所有配置列
// 查询配置列数据
for (Map<String, Object> record1 : dataList) {
String paramsCollectManifestId = (String) record1.get("id");
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
List<OSSFile> 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<OSSFile> 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<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData()))
.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
String pullDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getPullData()))
.map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
List<String> fileNameList = new ArrayList<>();
paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> {
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
List<OSSFile> 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<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_REPORT_DETAIL.getValue());
List<String> dbFieldNameList = new ArrayList<>();
List<String> 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<String, Object> 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<String> configIdList = Arrays.asList(paramsReportDetailVO.getConfigIds().split(","));
LambdaQueryWrapper<ParamsReportConfigEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ParamsReportConfigEO::getId, configIdList).orderByAsc(ParamsReportConfigEO::getDisplaySeq);
List<ParamsReportConfigEO> 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;
}
/**
* 获取一个类和其父类的所有属性
*
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
+7 -4
View File
@@ -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<ParamsReportEOMapper,
}
@Override
public boolean isSync(String oldParamsManifestId) {
public boolean isSync(String oldParamsManifestId, Integer version) {
LambdaQueryWrapper<ParamsReportEO> 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<ParamsReportEOMapper,
}
@Override
public ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId) {
public ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId, Integer version) {
LambdaQueryWrapper<ParamsReportEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId);
queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId)
.eq(ParamsReportEO::getVersion, version);
return getOne(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
+54
View File
@@ -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;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+14 -5
View File
@@ -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<ParamsInfoEO, IParams
if (StringUtils.isNotEmpty(paramsInfoEO.getParamsName())) {
paramsInfoEO.setParamsName(paramsInfoEO.getParamsName().replace("%","\\%"));
}
if (StringUtils.isEmpty(orderBy)) {
orderBy = "asc"; // 默认排序 nio编号升序
}
LambdaQueryWrapper<ParamsInfoEO> 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<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
// List<ParamsInfoEO> rows = pageList.getRecords();
@@ -231,9 +235,14 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@ApiOperation(value="参数项基本信息表-发布版本", notes="参数项基本信息表-发布版本")
@GetMapping(value = "/publish")
// @RequiresPermissions("params:paramsInfo:publish")
public Result<?> 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!");
}
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
+8 -2
View File
@@ -5,6 +5,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.ParamsTemplateEO;
import com.jero.modules.cert.template.service.IParamsTemplateEOService;
@@ -188,9 +189,14 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@GetMapping(value = "/copyById")
@RequiresPermissions("params:template:copy")
public Result<?> copyById(@RequestParam(name="id") String id,
@RequestParam(name="paramsTemplateName") String paramsTemplateName) {
@RequestParam(name="paramsTemplateName") String paramsTemplateName,
@RequestParam(name="cut") String cut) {
ParamsTemplateEO paramsTemplateEO = paramsTemplateEOService.copyById(id, paramsTemplateName);
return Result.OK("复制成功", paramsTemplateEO);
if (CutEnum.EN.getValue().equals(cut)) {
return Result.OK("Copy successful", paramsTemplateEO);
} else {
return Result.OK("复制成功", paramsTemplateEO);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+3
View File
@@ -135,4 +135,7 @@ public class ParamsInfoEO implements Serializable {
@TableField(exist = false)
private List<CertCategoryParamsInfoEO> certCategoryParamsInfoEOList; // 认证类别参数列表
@TableField(exist = false)
private String cut;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
+10 -10
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
+9 -9
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
+2 -2
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java
+1 -1
View File
@@ -61,7 +61,7 @@ public interface IParamsInfoPublishEOService extends IService<ParamsInfoPublishE
List<ParamsInfoPublishEO> getListByPublishVersion(String paramsTemplateId, int publishVersion);
int publishTemplate(String paramsTemplateId);
int publishTemplate(String paramsTemplateId, String cut);
Integer getNewestVersionByParamsTemplateId(String paramsTemplateId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
+2
View File
@@ -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<CertCategoryParamsInfoEOMapper, CertCategoryParamsInfoEO> implements ICertCategoryParamsInfoEOService {
@Autowired
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java
+2
View File
@@ -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<CertCategoryParamsInfoPublishEOMapper, CertCategoryParamsInfoPublishEO> implements ICertCategoryParamsInfoPublishEOService {
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+202 -53
View File
@@ -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<ParamsInfoEOMapper, Par
// 校验nio编号 格式：字母数字横杠（-）
String nioNumberRegex = "^[A-Za-z0-9-]+$";
if (!nioNumber.matches(nioNumberRegex)) {
throw new JeroBootException("nio编号格式错误，仅能为字母，数字，横杠(-)");
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)！");
} else {
throw new JeroBootException("NIO number formatting errors, can only letters, numbers, dash (-)!");
}
}
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId());
List<ParamsInfoEO> 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<ParamsInfoEOMapper, Par
// 校验认证类别参数项编号 同一nio下编号 不同类别间编号唯一
List<CertCategoryParamsInfoEO> 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<ParamsInfoEOMapper, Par
// 校验nio编号 格式：字母数字横杠（-）
String nioNumberRegex = "^[A-Za-z0-9-]+$";
if (!nioNumber.matches(nioNumberRegex)) {
throw new JeroBootException("nio编号格式错误，仅能为字母，数字，横杠(-)");
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)！");
} else {
throw new JeroBootException("NIO number formatting errors, can only letters, numbers, dash (-)!");
}
}
ParamsInfoEO oldParamsInfoEO = getById(paramsInfoId);
if (!oldParamsInfoEO.getNioNumber().equals(nioNumber)) {
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId());
List<ParamsInfoEO> 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<ParamsInfoEOMapper, Par
// 校验认证类别参数项编号 同一nio下编号 不同类别间编号唯一
List<CertCategoryParamsInfoEO> 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<ParamsInfoEOMapper, Par
String nioNumber = paramsInfoEO.getNioNumber();
String paramsTemplateId = paramsInfoEO.getParamsTemplateId();
certCategoryParamsInfoEOService.deleteByNioNumberList(Arrays.asList(nioNumber), paramsTemplateId);
// TODO 关联删除附件模板文件信息和文件
// 关联删除附件模板文件信息和文件 ---> 不能删 发布版用的同一文件
return removeById(id);
}
@@ -253,7 +280,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
List<String> 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<ParamsInfoEOMapper, Par
} else {
certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getEnName()));
}
for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOList) {
certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory()));
List<CertCategoryParamsInfoEO> certCategoryParamsInfoEOListOrdered = new ArrayList<>();
for (SysDictItem sysDictItem : sysDictItemList) {
List<CertCategoryParamsInfoEO> 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<ParamsInfoEOMapper, Par
workbook.write(os);
} catch (IOException e) {
log.error("发生异常，异常信息为："+e.getMessage(), e);
throw new JeroBootException("下载文件失败，请重试");
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("下载文件失败，请重试！");
} else {
throw new JeroBootException("Failed to download file, please try again!");
}
}finally {
IOUtils.closeQuietly(os);
try {
@@ -394,7 +435,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
//判断导出文件名称
String exportName = "";
if(StringUtils.isEmpty(exportName)){
exportName="参数项导出数据";
if (CutEnum.EN.getValue().equals(cut)) {
exportName = "Parameter Export Data";
} else {
exportName = "参数项导出数据";
}
}else{
exportName = exportExcelName;
}
@@ -446,19 +491,28 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
os.flush();
os.close(); // 后开先关
fis.close(); // 先开后关
} catch (JeroBootException e) {
log.error(e.getMessage(), e);
throw new JeroBootException(e.getMessage());
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new JeroBootException("下载文件失败，请重试");
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("下载文件失败，请重试！");
} else {
throw new JeroBootException("Failed to download file, please try again!");
}
} finally {
IOUtils.closeQuietly(os);
IOUtils.closeQuietly(excelOS);
File tempZipFile = new File(uploadpath + "/tempZip");
FileUtil.deleteContents(tempZipFile);
}
}
private List<Map<String, Object>> getCnExportSheetsList(List<ParamsInfoEO> paramsInfoEOList, String fileNowPath, String paramsTemplateId) throws IOException {
if (CollectionUtil.isEmpty(paramsInfoEOList)) {
throw new JeroBootException("没有可导出的数据");
throw new JeroBootException("没有可导出的数据！");
}
List<OSSFile> fileTemplateList = new ArrayList<>();
@@ -545,7 +599,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
private List<Map<String, Object>> getEnExportSheetsList(List<ParamsInfoEnExport> paramsInfoEnExportList, String fileNowPath, String paramsTemplateId) throws IOException {
if (CollectionUtil.isEmpty(paramsInfoEnExportList)) {
throw new JeroBootException("没有可导出的数据");
throw new JeroBootException("No data available for export!");
}
List<OSSFile> fileTemplateList = new ArrayList<>();
@@ -718,7 +772,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +File.separator+ file.getOriginalFilename()));
try{
//解压缩
String zipEntryName = FileUnZip.unZipFiles2(path +File.separator+ file.getOriginalFilename(),path);
String zipEntryName = FileUnZip.unZipFiles2(path +File.separator+ file.getOriginalFilename(), path);
// 数据相关处理,
// 1.获取其中的Excel,
List<File> excelfilelist = FileUnZip.readExcelFile(zipEntryName);
@@ -774,10 +828,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 第几个sheet页
if (numSheet == 0) { // 企业参数表
if (CutEnum.EN.getValue().equals(cut)) {
String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Technical Field","*Params Batch","*Duty Territory",
"Description", "*Control Type", "Control Verify", "Control Values", "File Template"};
params.setImportFields(fields);
ExcelImportResult<ParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params);
List<ParamsInfoEnImport> paramsInfoEOListEn = resultEn.getList();
copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
} else {
String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*技术领域","*参数批次","*责任领域",
"参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"};
params.setImportFields(fields);
ExcelImportResult<ParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, ParamsInfoCnImport.class, params);
paramsInfoEOList = result.getList();
}
@@ -785,10 +847,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
if (certCategoryMap.containsKey(sheetName)) {
List<CertCategoryParamsInfoCnImport> list = new ArrayList<>();
if (CutEnum.EN.getValue().equals(cut)) {
String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"};
params.setImportFields(fields);
ExcelImportResult<CertCategoryParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params);
List<CertCategoryParamsInfoEnImport> listEn = resultEn.getList();
copycertCategoryParamsInfoList(listEn, list);
} else {
String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"};
params.setImportFields(fields);
ExcelImportResult<CertCategoryParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params);
list = result.getList();
}
@@ -1027,12 +1095,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
//存放数据验证结果信息
List<String> stringMessage = new ArrayList<>();
List<String> 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<ParamsInfoEOMapper, Par
Map<String, Object> 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<ParamsInfoEOMapper, Par
// 参数名称
String paramsName = dto.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 technologyTerritory = dto.getTechnologyTerritory();
resultMap = validateMustAndLength(technologyTerritory, "技术领域", "technology territory", IsMustEnum.YES.getValue(), "1000", false, cut);
resultMap = validateMustAndLength(technologyTerritory, "技术领域", "Technical Field", IsMustEnum.YES.getValue(), "1000", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(technologyTerritory,"技术领域", "technology territory","treeDicCode",null,treeNameList,categoryList,cut);
resultMap = getCodeByName(technologyTerritory,"技术领域", "Technical Field","treeDicCode",null,treeNameList,categoryList,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
technologyTerritory = (String)resultMap.get("value");
@@ -1090,10 +1178,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 参数批次
String paramsBatch = dto.getParamsBatch();
resultMap = validateMustAndLength(paramsBatch, "参数批次", "params batch", IsMustEnum.YES.getValue(), "50", true, cut);
resultMap = validateMustAndLength(paramsBatch, "参数批次", "Params Batch", IsMustEnum.YES.getValue(), "50", true, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(paramsBatch,"参数批次", "params batch", "dicCode",null,itemNameList,dictItemList,cut);
resultMap = getCodeByName(paramsBatch,"参数批次", "Params Batch", "dicCode",null,itemNameList,dictItemList,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
paramsBatch = (String)resultMap.get("value");
@@ -1101,10 +1189,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 责任领域
String dutyTerritory = dto.getDutyTerritory();
resultMap = validateMustAndLength(dutyTerritory, "责任领域", "duty territory", IsMustEnum.YES.getValue(), "50",true, cut);
resultMap = validateMustAndLength(dutyTerritory, "责任领域", "Duty Territory", IsMustEnum.YES.getValue(), "50",true, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(dutyTerritory,"责任领域", "duty territory", "dicCode",null,itemNameList,dictItemList,cut);
resultMap = getCodeByName(dutyTerritory,"责任领域", "Duty Territory", "dicCode",null,itemNameList,dictItemList,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
dutyTerritory = (String)resultMap.get("value");
@@ -1112,13 +1200,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 参数说明
String description = dto.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");
// 认证类别
// 来源：认证类别sheet页
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "cert category", IsMustEnum.YES.getValue(), "1000", false, cut);
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
@@ -1135,10 +1223,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 控件类型
String controlType = dto.getControlType();
resultMap = validateMustAndLength(controlType, "控件类型", "control type", IsMustEnum.YES.getValue(), "50", false, cut);
resultMap = validateMustAndLength(controlType, "控件类型", "Control Type", IsMustEnum.YES.getValue(), "50", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(controlType,"控件类型", "control type", "enum",controlTypeEnumMap,null,null,cut);
resultMap = getCodeByName(controlType,"控件类型", "Control Type", "enum",controlTypeEnumMap,null,null,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
controlType = (String)resultMap.get("value");
@@ -1151,11 +1239,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|| ControlTypeEnum.PULL_MORE.getValue().equals(controlType)
|| ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
resultMap = validateMustAndLength(controlValues, "控件备选值", "control values", IsMustEnum.YES.getValue(), "500", false, cut);
resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.YES.getValue(), "500", false, cut);
} else {
resultMap = validateMustAndLength(controlValues, "控件备选值", "control values", IsMustEnum.NO.getValue(), "500", false, cut);
resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.NO.getValue(), "500", false, cut);
}
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
@@ -1167,13 +1255,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
resultMap = validateMustAndLength(controlVerify, "控件校验", "control verify", IsMustEnum.YES.getValue(), "50", false, cut);
resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.YES.getValue(), "50", false, cut);
} else {
resultMap = validateMustAndLength(controlVerify, "控件校验", "control verify", IsMustEnum.NO.getValue(), "50", false, cut);
resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.NO.getValue(), "50", false, cut);
}
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(controlVerify,"控件校验", "control verify", "enum",controlVerifyEnumMap,null,null,cut);
resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
controlVerify = (String)resultMap.get("value");
@@ -1192,7 +1280,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
}
}
for (String fileName : fileTemplateName.split(",")) {
List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName);
List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null);
// List<File> 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<ParamsInfoEOMapper, Par
for (Map.Entry<String, List<CertCategoryParamsInfoCnImport>> ccDtoMap : certCategoryParamsInfoEOListMap.entrySet()) {
String certCategory = ccDtoMap.getKey();
List<CertCategoryParamsInfoCnImport> ccDtoList = ccDtoMap.getValue();
List<String> 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<ParamsInfoEOMapper, Par
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg = certCategory + " 第" + j + "行：";
} else {
errorMsg = j + " line：";
errorMsg = certCategory + " " + j + " line：";
}
Map<String, Object> 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<ParamsInfoEOMapper, Par
stringMessage.add(errorMsg);
}
}
// 校验同 nio下认证类别唯一
List<CertCategoryParamsInfoCnImport> 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<CertCategoryParamsInfoCnImport> ccDtoAfterDistinct = certCategoryParamsInfoEOList.stream()
List<CertCategoryParamsInfoCnImport> 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<ParamsInfoEOMapper, Par
}
}
List<CertCategoryParamsInfoCnImport> 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 -> {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
+9 -2
View File
@@ -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<ParamsInfoPublishEOMapper, ParamsInfoPublishEO> implements IParamsInfoPublishEOService {
@Autowired
@@ -120,11 +123,15 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl<ParamsInfoPublis
@Override
public int publishTemplate(String paramsTemplateId) {
public int publishTemplate(String paramsTemplateId, String cut) {
ParamsTemplateEO source = paramsTemplateEOService.queryById(paramsTemplateId);
List<ParamsInfoEO> 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<CertCategoryParamsInfoEO> sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
+2
View File
@@ -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<ParamsTemplateEOMapper, ParamsTemplateEO> implements IParamsTemplateEOService {
@Autowired
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java
+1 -1
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+2 -2
View File
@@ -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;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+10
View File
@@ -111,6 +111,16 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> 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())) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java
+3
View File
@@ -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 = "状态")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
+1
View File
@@ -12,6 +12,7 @@
<id column="xin1_che1_xing2_shi2_shi1_ri4_qi1" property="xin1Che1Xing2Shi2Shi1Ri4Qi1" />
<id column="implement_time" property="implementTime" />
<id column="corresponding_standard" property="correspondingStandard" />
<id column="lei4_bie2" property="lei4Bie2" />
</resultMap>
<insert id="insertInfo">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+24 -1
View File
@@ -3574,8 +3574,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
@NotNull
private String getConditionStr(Map<String, Object> parameter) {
public String getConditionStr(Map<String, Object> 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<BussDocumentLi
}
//处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
String warnTime = (String) parameter.get("WarnTime");
if(StringUtils.isNotBlank(warnTime)){
if("0".equals(flag)){
//日期(区分单日期还时间范围)
if (warnTime.contains(",")) {
conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + 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<QueryConditionVO>
if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){
String queryConditionVOListStr = (String) parameter.get("queryConditionVOList");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java
+2 -1
View File
@@ -7,7 +7,8 @@ package com.jero.modules.dummy.enums;
*/
public enum InventoryStateEnum {
ISSUE("已发布","1"),
DRAFT("草稿","2");
DRAFT("草稿","2"),
TO_BE_RELEASED("待发布","2");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
+170
View File
@@ -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<LawsOpinionAssessmentResultEO, ILawsOpinionAssessmentResultEOService> {
@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<LawsOpinionAssessmentResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap());
Page<LawsOpinionAssessmentResultEO> page = new Page<LawsOpinionAssessmentResultEO>(pageNo, pageSize);
IPage<LawsOpinionAssessmentResultEO> pageList = lawsOpinionAssessmentResultEOService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "法规意见收集-评估结果表-列表查询")
@ApiOperation(value="法规意见收集-评估结果表-列表查询", notes="法规意见收集-评估结果表-列表查询")
@GetMapping(value = "/list")
public Result<List<LawsOpinionAssessmentResultEO>> queryList() {
List<LawsOpinionAssessmentResultEO> 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);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java
+184
View File
@@ -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<LawsOpinionGatherEO, ILawsOpinionGatherEOService> {
@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<LawsOpinionGatherEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap());
Page<LawsOpinionGatherEO> page = new Page<LawsOpinionGatherEO>(pageNo, pageSize);
IPage<LawsOpinionGatherEO> pageList = lawsOpinionGatherEOService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "法规意见收集表-列表查询")
@ApiOperation(value="法规意见收集表-列表查询", notes="法规意见收集表-列表查询")
@GetMapping(value = "/list")
public Result<List<LawsOpinionGatherEO>> queryList() {
List<LawsOpinionGatherEO> 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);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java
+184
View File
@@ -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<LawsProcessHistoryEO, ILawsProcessHistoryEOService> {
@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<LawsProcessHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsProcessHistoryEO, req.getParameterMap());
Page<LawsProcessHistoryEO> page = new Page<LawsProcessHistoryEO>(pageNo, pageSize);
IPage<LawsProcessHistoryEO> pageList = lawsProcessHistoryEOService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "法规-流程历史表-列表查询")
@ApiOperation(value="法规-流程历史表-列表查询", notes="法规-流程历史表-列表查询")
@GetMapping(value = "/list")
public Result<List<LawsProcessHistoryEO>> queryList() {
List<LawsProcessHistoryEO> 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);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java
+98
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java
+100
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java
+93
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java
+63
View File
@@ -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;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java
+64
View File
@@ -0,0 +1,64 @@
package com.jero.modules.lawsOpinionGather.job;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.jmreport.common.constant.CommonConstant;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 法规意见收集表 - 定时器
* 作用：当前日期大于等于截止日志的时候，把该数据的收集结果，更新为已完成，同时把当前这条数据的所有待办任务提交
*/
@Slf4j
public class LawsOpinionGatherJob implements Job {
@Autowired
private ILawsOpinionGatherEOService lawsOpinionGatherEOService;
@Autowired
private WorkFlowFeignClient workFlowFeignClient;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
log.info("法规意见收集流程，定时任务开启 =====================================================");
QueryWrapper<LawsOpinionGatherEO> lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>();
lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue());
List<LawsOpinionGatherEO> lawsOpinionGatherEOList = this.lawsOpinionGatherEOService.list(lawsOpinionGatherEOQueryWrapper);
if (CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)) {
Date currentDate = new Date();
List<LawsOpinionGatherEO> updateLawsOpinionGatherEOList = lawsOpinionGatherEOList.stream().filter(e -> {
boolean flag = false;
if(currentDate.after(e.getEndTime())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(updateLawsOpinionGatherEOList)){
List<String> actiProcInstIdList = updateLawsOpinionGatherEOList.stream().map(LawsOpinionGatherEO::getActiProcInstId).distinct().collect(Collectors.toList());
String actiProcInstIds = StringUtils.join(actiProcInstIdList,",");
//将这些流程实例下的待办任务提交
Result<String> result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds);
if(result.getCode().equals(CommonConstant.SC_OK_200)){
updateLawsOpinionGatherEOList.forEach(lawsOpinionGatherEO -> {
lawsOpinionGatherEO.setGatherResult(GatherResultEnum.COMPLETED.getValue());
});
this.lawsOpinionGatherEOService.updateBatchById(updateLawsOpinionGatherEOList);
}
}
}
log.info("法规意见收集流程，定时任务开启 =====================================================");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java
+17
View File
@@ -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<LawsOpinionAssessmentResultEO> {
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java
+17
View File
@@ -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<LawsOpinionGatherEO> {
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java
+17
View File
@@ -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<LawsProcessHistoryEO> {
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper">
<resultMap id="LawsOpinionAssessmentResultEOResultMap" type="com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="laws_opinion_gather_id" property="lawsOpinionGatherId" />
<result column="related_section" property="relatedSection" />
<result column="issue_or_suggest" property="issueOrSuggest" />
<result column="reason" property="reason" />
<result column="accessory_file" property="accessoryFile" />
<result column="submit_time" property="submitTime" />
<result column="acti_proc_inst_id" property="actiProcInstId" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper">
<resultMap id="LawsOpinionGatherEOResultMap" type="com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="serial_number" property="serialNumber" />
<result column="title" property="title" />
<result column="technology_territory" property="technologyTerritory" />
<result column="gather_result" property="gatherResult" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
<result column="acti_proc_inst_id" property="actiProcInstId" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper">
<resultMap id="LawsProcessHistoryEOResultMap" type="com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="acti_proc_inst_id" property="actiProcInstId" />
<result column="task_definition_key" property="taskDefinitionKey" />
<result column="operator_person_id" property="operatorPersonId" />
<result column="operator_role_code" property="operatorRoleCode" />
<result column="operator_time" property="operatorTime" />
<result column="flow_type" property="flowType" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
+61
View File
@@ -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<LawsOpinionAssessmentResultEO> {
/**
* 保存
*
* @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<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
LawsOpinionAssessmentResultEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<LawsOpinionAssessmentResultEO> queryList();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java
+70
View File
@@ -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<LawsOpinionGatherEO> {
/**
* 保存
*
* @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<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
LawsOpinionGatherEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<LawsOpinionGatherEO> queryList();
/**
* 流程调用
* @param jsonObject
* @return
*/
Result<?> processCall(JSONObject jsonObject);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java
+70
View File
@@ -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<LawsProcessHistoryEO> {
/**
* 保存
*
* @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<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
LawsProcessHistoryEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<LawsProcessHistoryEO> queryList();
/**
* 流程调用
* @param jsonObject
* @return
*/
Result<?> processCall(JSONObject jsonObject);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+89
View File
@@ -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<LawsOpinionAssessmentResultEOMapper, LawsOpinionAssessmentResultEO> 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<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public LawsOpinionAssessmentResultEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<LawsOpinionAssessmentResultEO> queryList() {
return list();
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+127
View File
@@ -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<LawsOpinionGatherEOMapper, LawsOpinionGatherEO> 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<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public LawsOpinionGatherEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<LawsOpinionGatherEO> 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("调用成功！");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
+126
View File
@@ -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<LawsProcessHistoryEOMapper, LawsProcessHistoryEO> 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<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public LawsProcessHistoryEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<LawsProcessHistoryEO> 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<LawsProcessHistoryEO> 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("调用成功！");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+3
View File
@@ -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;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+4 -8
View File
@@ -156,13 +156,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 = "<a href='"
+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
@@ -193,13 +191,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 = "<a href='"
+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+4 -8
View File
@@ -153,13 +153,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 = "<a href='"
+ JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
@@ -190,13 +188,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 = "<a href='"
+ JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+3 -12
View File
@@ -150,17 +150,10 @@ public class designComplianceJob implements Job {
feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
//飞书跳转链接
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 = "<a href='"
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
@@ -190,13 +183,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 = "<a href='"
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+23 -55
View File
@@ -2030,7 +2030,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
feishuMsgVo.setDueDate(taskAffirmDueDate);
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
String hrefFeishu = backUrl
+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink()
+ "&projectName=" + projectNameInfoEO.getProjectName();
//系统内部跳转链接
String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
@@ -2049,17 +2051,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(",")));
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapper);
List<ProjectTaskInventoryEO> 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);
@@ -2072,9 +2065,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String enContentLog = username+" copied “"+serialNumber+"”";
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
//项目任务清单数据初始化。
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
}
}
@@ -2101,38 +2091,33 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//实施类别 implementType
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){
projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType());
}else{
projectLawsInventoryEOTemp.setImplementType("");
}
// else{
// projectLawsInventoryEOTemp.setImplementType("");
// }
//认证类型 attestationType
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){
projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType());
}else{
projectLawsInventoryEOTemp.setAttestationType("");
}
// else{
// projectLawsInventoryEOTemp.setAttestationType("");
// }
//认证级别 attestationRank
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){
projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank());
}else{
projectLawsInventoryEOTemp.setAttestationRank("");
}
// else{
// projectLawsInventoryEOTemp.setAttestationRank("");
// }
//责任领域 dutyTerritory
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
}else{
projectLawsInventoryEOTemp.setDutyTerritory("");
}
// else{
// projectLawsInventoryEOTemp.setDutyTerritory("");
// }
//适用地区region
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
}else{
projectLawsInventoryEOTemp.setRegion("");
}
// else{
// projectLawsInventoryEOTemp.setRegion("");
// }
//在产车实施日期implementTime
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
@@ -2156,14 +2141,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
}
this.updateBatchById(projectLawsInventoryEOList);
// for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
// LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
// updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
// setDateNull(lawsInventoryEO, updateWrapper);
// //保存
// this.update(lawsInventoryEO,updateWrapper);
// }
// this.updateBatchById(projectLawsInventoryEOList);
for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
setDateNull(lawsInventoryEO, updateWrapper);
//保存
this.update(lawsInventoryEO,updateWrapper);
}
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -3325,14 +3310,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
fileTemp.mkdirs();
//文件
exportFile(dataList,fileInfos);
String excelName = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
excelName = "法规清单.xlsx";
}else{
excelName = "Regulation List.xlsx";
}
//excel
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
OutputStream excelOS = new FileOutputStream(path + File.separator + "法规清单.xlsx");
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -3471,17 +3450,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(StringUtils.isNotBlank(pullVerifyDeliverableType)){
projectLawsInventoryEOEn.setVerifyDeliverableType(pullVerifyDeliverableType);
}
//清单确认状态
String inventoryAffirmStatus = projectLawsInventoryEOEn.getInventoryAffirmStatus();
if(StringUtils.isNotBlank(inventoryAffirmStatus)){
projectLawsInventoryEOEn.setInventoryAffirmStatusName(inventoryAffirmStatus);
}
//任务确认状态
String taskAffirmStatus = projectLawsInventoryEOEn.getTaskAffirmStatus();
if(StringUtils.isNotBlank(taskAffirmStatus)){
projectLawsInventoryEOEn.setTaskAffirmStatusName(taskAffirmStatus);
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+2 -4
View File
@@ -320,13 +320,11 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
+ projectLibraryBase.getId()
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName();
+ "&projectName=" + projectNameInfoEO.getProjectName();
//系统内部跳转链接
String href = "<a href='"
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+3 -1
View File
@@ -666,12 +666,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
+ projectLibraryBase.getId()
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName();
+ projectYearNameInfoEO.getYearName()
+ projectLibraryBase.getTargetMarket();
//系统内部跳转链接
String href = "<a href='"
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+ projectYearNameInfoEO.getYearName()
+ projectLibraryBase.getTargetMarket()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();

Some files were not shown because too many files have changed in this diff Show More