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

认证-参数清单-复制bug修改

Browse Source
This commit is contained in:
liyawei
2022-06-27 17:00:57 +08:00
parent 4caa6aa6f1
commit af9410acc5
5 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+13 -1
View File
@@ -60,4 +60,16 @@ CREATE TABLE `laws_process_history` (
-- 参数项收集清单表 添加字段
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`;
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_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`;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+2 -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;
/**版本*/
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -250,7 +250,7 @@ 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); // 查询配置列
// 普通数据字典
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+29 -17
View File
@@ -300,15 +300,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
updateById(updateParamsManifestEO);
} else {
manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
manifestEO.setFinishTime(null);
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);
}
}
@@ -479,6 +478,17 @@ 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();
@@ -547,24 +557,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/template/service/impl/ParamsInfoEOServiceImpl.java
+13 -2
View File
@@ -299,15 +299,26 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 认证类别 数据字典 map
List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
sysDictItemList.sort(Comparator.comparing(SysDictItem::getSortOrder)); // 升序
Map<String, String> certCategoryMap = new HashMap<>();
if (CutEnum.CN.getValue().equals(cut)) {
certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getItemText()));
} 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);
return paramsInfoEO;
}