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

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -69,4 +69,4 @@ ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
 ALTER TABLE `laws_weilai`.`params_manifest`
     ADD COLUMN `references_col_name` varchar(255) NULL COMMENT '参数项清单的参考列名称' AFTER `project_version_id`;
 
-INSERT INTO `laws_weilai`.`onl_cgform_field`(`id`, `cgform_head_id`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `is_delete`, `is_model`, `dict_id`) VALUES ('a183d186bc94f0db002bbb070017f14c', '9ca1773d2a484d2fadae38491ad51aa1', 'references_col', ' References Column', '参考列', 14, NULL, 0, 1, 'string', 500, 0, '', '', '', '', 'text', '', 120, NULL, '0', '', '', 0, 0, 1, 0, 'single', '', '', NULL, NULL, '2022-12-06 14:29:12', 'admin', '', '', '', '', '', 'text', '0', NULL, NULL, '0', NULL, NULL, NULL, 0, '7', NULL);
+INSERT INTO `laws_weilai`.`onl_cgform_field`(`id`, `cgform_head_id`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `is_delete`, `is_model`, `dict_id`) VALUES ('a183d186bc94f0db002bbb070017f14c', '9ca1773d2a484d2fadae38491ad51aa1', 'references_col', 'References Column', '参考列', 14, NULL, 0, 1, 'string', 500, 0, '', '', '', '', 'text', '', 120, NULL, '0', '', '', 0, 0, 1, 0, 'single', '', '', NULL, NULL, '2022-12-06 14:29:12', 'admin', '', '', '', '', '', 'text', '0', NULL, NULL, '0', NULL, NULL, NULL, 0, '7', NULL);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -436,6 +436,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			String controlType = collectManifestEO.getControlType();
 			String paramsCollectManifestId = collectManifestEO.getId();
 
+			if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
 				Map<String, Object> referencesColMap = new HashMap<>();
 				String referencesCol = collectManifestEO.getReferencesCol();
 				if (StringUtils.isNotBlank(referencesCol)) {
@@ -449,6 +450,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					referencesColMap.put("list", referencesColVOList);
 					manifestMap.put("referencesCol", referencesColMap);
 				}
+			}
 
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
 				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
@@ -1116,8 +1118,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						map.put("flag", true); // 标识
 						map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
 						String[] references = projectName.split("-");
-						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + onlCgformField.getDbFieldTxt());//字段中文名
+						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
 
+					} else {
+						continue;
 					}
 				} else {
 					map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1129,8 +1133,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						map.put("flag", true); // 标识
 						map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
 						String[] references = projectName.split("-");
-						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + onlCgformField.getDbFieldEnName());//字段中文名
+						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
 
+					} else {
+						continue;
 					}
 				} else {
 					map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
@@ -3362,6 +3368,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	private String[] getWorkbookTitleForExportDre(ParamsCollectManifestVO paramsCollectManifestVO) {
 		String cut = paramsCollectManifestVO.getCut();
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
 
 		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue());
 
@@ -3373,9 +3380,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		for (int i = 0; i < fieldList.size(); i++) {
 			OnlCgformField onlCgformField = fieldList.get(i);
 			String dbFieldName = onlCgformField.getDbFieldName();
+			if ("references_col".equals(dbFieldName) && StringUtils.isEmpty(paramsManifestEO.getReferencesColName())) {
+				continue;
+			}
 			if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName) || "description".equals(dbFieldName)
 					|| "control_type".equals(dbFieldName) || "control_verify".equals(dbFieldName) || "control_values".equals(dbFieldName)
-					|| "is_must".equals(dbFieldName)) {
+					|| "is_must".equals(dbFieldName) || "references_col".equals(dbFieldName)) {
 				dbFieldList.add(dbFieldName);
 
 				if(CutEnum.CN.getValue().equals(cut)){
@@ -3573,6 +3583,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}};
 
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
 
 		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
 		BeanUtils.copyProperties(paramsCollectManifestVO, paramsCollectManifestEO);
@@ -3620,6 +3631,32 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			record1.put("control_type", controlTypeMap.get(controlType));
 			record1.put("control_verify", controlVerifyMap.get(controlVerify));
 
+			// 处理参考列，没引用过则不显示该列
+			if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
+				List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#"));
+				StringBuilder referencesColBuilder = new StringBuilder();
+				if (!" ".equals(referencesColList.get(0))) {
+					referencesColBuilder.append(referencesColList.get(0)).append("#");
+				}
+				if (!" ".equals(referencesColList.get(1))) {
+					referencesColBuilder.append(referencesColList.get(1).replaceAll(",", "！")).append("#");
+				}
+				if (!" ".equals(referencesColList.get(2))) {
+					List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(referencesColList.get(2));
+					if (CollectionUtil.isNotEmpty(ossFileList)) {
+						referencesColBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()).append("#");
+					}
+				}
+
+				String referencesCol = referencesColBuilder.toString();
+				if (referencesCol.endsWith("#")) {
+					referencesCol = referencesCol.substring(0, referencesCol.lastIndexOf("#"));
+				}
+				record1.put("references_col", referencesCol);
+
+			} else {
+				record1.remove("references_col");
+			}
 			// 配置列
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
 				List<OSSFile> fileList = new ArrayList<>();
@@ -4214,7 +4251,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 				if ("nio_number".equals(key) || "params_name".equals(key) || "description".equals(key)
 						|| "control_type".equals(key) || "control_verify".equals(key) || "control_values".equals(key)
-						|| "is_must".equals(key)) {
+						|| "is_must".equals(key) || "references_col".equals(key)) {
 					continue;
 				}
 				//
@@ -5001,21 +5038,50 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			// 添加配置数据
 			for (Map.Entry<String, Object> entry : map.entrySet()) {
 				StringBuilder referncesColBuilder = new StringBuilder();
-				ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
 				if ("id".equals(entry.getKey())) {
 					continue;
 				}
 
 				// 取值
 				Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
+				String controlType = (String) paramsConfigDataMap.get("controlType");
 				// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
 				List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
 				if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
-					for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
+					// TEXT
-						String type = (String) paramsConfigDataVO.get("type");
+					List<Map<String, Object>> textList = paramsConfigDataVOList.stream()
-						String dataValue = (String) paramsConfigDataVO.get("dataValue");
+							.filter(e->e.get("type").equals(ConfigDataTypeEnum.TEXT.getValue())).collect(Collectors.toList());
+					if (CollectionUtil.isNotEmpty(textList)) {
+						String dataValue = (String) textList.get(0).get("dataValue");
+						if (StringUtils.isNotEmpty(dataValue)) {
+							referncesColBuilder.append(dataValue).append("#");
+						}  else {
+							referncesColBuilder.append(" ").append("#");
+						}
+					} else {
+						referncesColBuilder.append(" ").append("#");
+					}
 
-						if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
+					// PULL
+					List<Map<String, Object>> pullList = paramsConfigDataVOList.stream()
+							.filter(e->e.get("type").equals(ConfigDataTypeEnum.PULL.getValue())
+									|| e.get("type").equals(ConfigDataTypeEnum.PULL_MORE.getValue())).collect(Collectors.toList());
+					if (CollectionUtil.isNotEmpty(pullList)) {
+						String dataValue = (String) pullList.get(0).get("dataValue");
+						if (StringUtils.isNotEmpty(dataValue)) {
+							referncesColBuilder.append(dataValue).append("#");
+						}  else {
+							referncesColBuilder.append(" ").append("#");
+						}
+					} else {
+						referncesColBuilder.append(" ").append("#");
+					}
+
+					// FILE
+					List<Map<String, Object>> fileList = paramsConfigDataVOList.stream()
+							.filter(e->e.get("type").equals(ConfigDataTypeEnum.FILE.getValue())).collect(Collectors.toList());
+					if (CollectionUtil.isNotEmpty(fileList)) {
+						String dataValue = (String) fileList.get(0).get("dataValue");
 						if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
 							// 处理文件connectId
 							String[] fileIdList = dataValue.split(",");
@@ -5031,7 +5097,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 							dataValue = connectId;
 						} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
 							List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
-								if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
+							if (CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件
 								String connectId = UUID.randomUUID().toString().replace("-", "");
 								//修改文件表关联信息connect_id
 								List<OSSFile> oSSFileList = new ArrayList<>();
@@ -5046,15 +5112,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 							}
 						}
 
-						}
-
 						if (StringUtils.isNotEmpty(dataValue)) {
 							referncesColBuilder.append(dataValue).append("#");
 						}  else {
 							referncesColBuilder.append(" ").append("#");
 						}
+					} else {
+						referncesColBuilder.append(" ").append("#");
 					}
-				}
+
 
 					String referencesCol = referncesColBuilder.toString();
 					if (StringUtils.isNotEmpty(referencesCol)) {
@@ -5065,6 +5131,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					}
 
 				}
+
+			}
 		}
 
 		// 批量更新

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java

@@ -67,7 +67,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 								   @RequestParam(name="orderByField", required = false) String orderByField,
 								   @RequestParam(name="orderBy", required = false) String orderBy,
 								   @RequestParam(name="cut") String cut,
-								   @RequestParam(name="allNumber") String allNumber,
+								   @RequestParam(name="allNumber", required = false) String allNumber,
 								   HttpServletRequest req) {
 
 		if (StringUtils.isNotEmpty(allNumber)) {