认证-参数项-修改继承实体

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java

@@ -0,0 +1,140 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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;
+
+import java.io.Serializable;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 15:15 2022/5/27
+ */
+@Data
+public class ParamsCollectManifestBaseEO implements Serializable {
+    /**主键*/
+    @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;
+
+    /**nio编号*/
+    @Excel(name = "nio编号", width = 15)
+    @ApiModelProperty(value = "nio编号")
+    private String nioNumber;
+
+    /**是否必填*/
+    @Excel(name = "是否必填", width = 15)
+    @ApiModelProperty(value = "是否必填")
+    private String isMust;
+
+    /**参数名称*/
+    @Excel(name = "参数名称", width = 15)
+    @ApiModelProperty(value = "参数名称")
+    private String paramsName;
+
+    /**技术领域*/
+    @Excel(name = "技术领域", width = 15)
+    @ApiModelProperty(value = "技术领域")
+    private String technologyTerritory;
+
+    /**参数批次*/
+    @Excel(name = "参数批次", width = 15)
+    @ApiModelProperty(value = "参数批次")
+    private String paramsBatch;
+
+    /**责任领域*/
+    @Excel(name = "责任领域", width = 15)
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+
+    /**参数说明*/
+    @Excel(name = "参数说明", width = 15)
+    @ApiModelProperty(value = "参数说明")
+    private String description;
+
+    /**认证类别*/
+    @Excel(name = "认证类别", width = 15)
+    @ApiModelProperty(value = "认证类别")
+    private String certCategory;
+
+    /**控件类型*/
+    @Excel(name = "控件类型", width = 15)
+    @ApiModelProperty(value = "控件类型")
+    private String controlType;
+
+    /**控件备选值*/
+    @Excel(name = "控件备选值", width = 15)
+    @ApiModelProperty(value = "控件备选值")
+    private String controlValues;
+
+    /**控件校验*/
+    @Excel(name = "控件校验", width = 15)
+    @ApiModelProperty(value = "控件校验")
+    private String controlVerify;
+
+    /**附件模板*/
+    @Excel(name = "附件模板", width = 15)
+    @ApiModelProperty(value = "附件模板")
+    private String fileTemplate;
+
+    /**参数模板id*/
+    @Excel(name = "参数模板id", width = 15)
+    @ApiModelProperty(value = "参数模板id")
+    private String paramsTemplateId;
+
+    /**状态*/
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+    /**工程接口人*/
+    @Excel(name = "工程接口人", width = 15)
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+
+    /**填写人*/
+    @Excel(name = "填写人", width = 15)
+    @ApiModelProperty(value = "填写人")
+    private String dre;
+
+    /**截止时间*/
+    @Excel(name = "截止时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止时间")
+    private java.util.Date deadline;
+
+    /**参数清单id*/
+    @Excel(name = "参数清单id", width = 15)
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId;
+}

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java

@@ -27,130 +27,9 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="params_collect_manifest对象", description="参数收集清单")
-public class ParamsCollectManifestEO implements Serializable {
+public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO 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;
-
-	/**nio编号*/
-	@Excel(name = "nio编号", width = 15)
-    @ApiModelProperty(value = "nio编号")
-    private String nioNumber;
-
-	/**是否必填*/
-	@Excel(name = "是否必填", width = 15)
-    @ApiModelProperty(value = "是否必填")
-    private String isMust;
-
-	/**参数名称*/
-	@Excel(name = "参数名称", width = 15)
-    @ApiModelProperty(value = "参数名称")
-    private String paramsName;
-
-	/**技术领域*/
-	@Excel(name = "技术领域", width = 15)
-    @ApiModelProperty(value = "技术领域")
-    private String technologyTerritory;
-
-	/**参数批次*/
-	@Excel(name = "参数批次", width = 15)
-    @ApiModelProperty(value = "参数批次")
-    private String paramsBatch;
-
-	/**责任领域*/
-	@Excel(name = "责任领域", width = 15)
-    @ApiModelProperty(value = "责任领域")
-    private String dutyTerritory;
-
-	/**参数说明*/
-	@Excel(name = "参数说明", width = 15)
-    @ApiModelProperty(value = "参数说明")
-    private String description;
-
-	/**认证类别*/
-	@Excel(name = "认证类别", width = 15)
-    @ApiModelProperty(value = "认证类别")
-    private String certCategory;
-
-	/**控件类型*/
-	@Excel(name = "控件类型", width = 15)
-    @ApiModelProperty(value = "控件类型")
-    private String controlType;
-
-	/**控件备选值*/
-	@Excel(name = "控件备选值", width = 15)
-    @ApiModelProperty(value = "控件备选值")
-    private String controlValues;
-
-	/**控件校验*/
-	@Excel(name = "控件校验", width = 15)
-    @ApiModelProperty(value = "控件校验")
-    private String controlVerify;
-
-	/**附件模板*/
-	@Excel(name = "附件模板", width = 15)
-    @ApiModelProperty(value = "附件模板")
-    private String fileTemplate;
-
-	/**参数模板id*/
-	@Excel(name = "参数模板id", width = 15)
-    @ApiModelProperty(value = "参数模板id")
-    private String paramsTemplateId;
-
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private String state;
-
-	/**工程接口人*/
-	@Excel(name = "工程接口人", width = 15)
-    @ApiModelProperty(value = "工程接口人")
-    private String sdt;
-
-	/**填写人*/
-	@Excel(name = "填写人", width = 15)
-    @ApiModelProperty(value = "填写人")
-    private String dre;
-
-	/**截止时间*/
-	@Excel(name = "截止时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "截止时间")
-    private java.util.Date deadline;
-
-	/**参数清单id*/
-	@Excel(name = "参数清单id", width = 15)
-    @ApiModelProperty(value = "参数清单id")
-    private String paramsManifestId;
-
 	/**变更标识*/
 	@Excel(name = "变更标识", width = 15)
     @ApiModelProperty(value = "变更标识")

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.io.Serializable;
 
@@ -20,6 +21,6 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="params_collect_manifest_history对象", description="参数项收集清单历史版本")
-public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestEO implements Serializable {
+public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestBaseEO implements Serializable {
 
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
@@ -1165,27 +1166,84 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return updateBatchById(updateEOList);
 	}
 
+	/**
+	 * 获取一个类和其父类的所有属性
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	private List<Field> findAllFieldsOfSelfAndSuperClass(Class clazz) {
+		Field[] fields = null;
+		List fieldList = Lists.newArrayList();
+		while (true) {
+			if (clazz == null) {
+				break;
+			} else {
+				fields = clazz.getDeclaredFields();
+				for (int i = 0; i < fields.length; i++) {
+					fieldList.add(fields[i]);
+				}
+				clazz = clazz.getSuperclass();
+			}
+		}
+		return fieldList;
+	}
+
+	/**
+	 * 将对象转Map
+	 * @param obj 待转对象
+	 * @return
+	 */
+	private Map<String, Object> objectToMap(Object obj) {
+
+		Map<String, Object> map = new HashMap<>();
+		// 获取f对象对应类中的所有属性域
+		List<Field> list = findAllFieldsOfSelfAndSuperClass(obj.getClass());
+		for (Field field : list) {
+
+			String varName = field.getName();
+			try {
+				// 获取原来的访问控制权限
+				boolean accessFlag = field.isAccessible();
+				// 修改访问控制权限
+				field.setAccessible(true);
+				// 获取在对象f中属性fields[i]对应的对象中的变量
+				Object o = field.get(obj);
+				if (o != null)
+					map.put(varName, o);
+				// 恢复访问控制权限
+				field.setAccessible(accessFlag);
+			} catch (IllegalArgumentException ex) {
+				ex.printStackTrace();
+			} catch (IllegalAccessException ex) {
+				ex.printStackTrace();
+			}
+		}
+		return map;
+
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象
 	 * @return
 	 */
-	private Map<String, Object> objectToMap(Object obj) {
-		Map<String, Object> map = new HashMap<>();
-		if (obj == null) {
-			return map;
-		}
-		Class clazz = obj.getClass();
-		Field[] fields = clazz.getDeclaredFields();
-		try {
-			for (Field field : fields) {
-				field.setAccessible(true);
-				map.put(field.getName(), field.get(obj));
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return map;
-	}
+//	private Map<String, Object> objectToMap(Object obj) {
+//		Map<String, Object> map = new HashMap<>();
+//		if (obj == null) {
+//			return map;
+//		}
+//		Class clazz = obj.getClass();
+//		Field[] fields = clazz.getDeclaredFields();
+//		try {
+//			for (Field field : fields) {
+//				field.setAccessible(true);
+//				map.put(field.getName(), field.get(obj));
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//		return map;
+//	}
 
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.cert.collect.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.YesOrNoEnum;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -145,7 +146,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	 * @param paramsCollectManifestEO
 	 * @return
 	 */
-	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
+	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) {
 		List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
 
 		if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
@@ -382,26 +383,83 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 		return list;
 	}
 
+	/**
+	 * 获取一个类和其父类的所有属性
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	private List<Field> findAllFieldsOfSelfAndSuperClass(Class clazz) {
+		Field[] fields = null;
+		List fieldList = Lists.newArrayList();
+		while (true) {
+			if (clazz == null) {
+				break;
+			} else {
+				fields = clazz.getDeclaredFields();
+				for (int i = 0; i < fields.length; i++) {
+					fieldList.add(fields[i]);
+				}
+				clazz = clazz.getSuperclass();
+			}
+		}
+		return fieldList;
+	}
+
+	/**
+	 * 将对象转Map
+	 * @param obj 待转对象
+	 * @return
+	 */
+	private Map<String, Object> objectToMap(Object obj) {
+
+		Map<String, Object> map = new HashMap<>();
+		// 获取f对象对应类中的所有属性域
+		List<Field> list = findAllFieldsOfSelfAndSuperClass(obj.getClass());
+		for (Field field : list) {
+
+			String varName = field.getName();
+			try {
+				// 获取原来的访问控制权限
+				boolean accessFlag = field.isAccessible();
+				// 修改访问控制权限
+				field.setAccessible(true);
+				// 获取在对象f中属性fields[i]对应的对象中的变量
+				Object o = field.get(obj);
+				if (o != null)
+					map.put(varName, o);
+				// 恢复访问控制权限
+				field.setAccessible(accessFlag);
+			} catch (IllegalArgumentException ex) {
+				ex.printStackTrace();
+			} catch (IllegalAccessException ex) {
+				ex.printStackTrace();
+			}
+		}
+		return map;
+
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象
 	 * @return
 	 */
-	private Map<String, Object> objectToMap(Object obj) {
-		Map<String, Object> map = new HashMap<>();
-		if (obj == null) {
-			return map;
-		}
-		Class clazz = obj.getClass();
-		Field[] fields = clazz.getDeclaredFields();
-		try {
-			for (Field field : fields) {
-				field.setAccessible(true);
-				map.put(field.getName(), field.get(obj));
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return map;
-	}
+//	private Map<String, Object> objectToMap(Object obj) {
+//		Map<String, Object> map = new HashMap<>();
+//		if (obj == null) {
+//			return map;
+//		}
+//		Class clazz = obj.getClass();
+//		Field[] fields = clazz.getDeclaredFields();
+//		try {
+//			for (Field field : fields) {
+//				field.setAccessible(true);
+//				map.put(field.getName(), field.get(obj));
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//		return map;
+//	}
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java

@@ -2,6 +2,7 @@ package com.jero.modules.cert.report.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +26,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="params_report_detail对象", description="上报库参数项")
-public class ParamsReportDetailEO extends ParamsCollectManifestEO implements Serializable {
+public class ParamsReportDetailEO extends ParamsCollectManifestBaseEO implements Serializable {
 //    private static final long serialVersionUID = 1L;
 
 	/**同步时间*/

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.cert.report.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.YesOrNoEnum;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -148,7 +149,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	 * @param paramsCollectManifestEO
 	 * @return
 	 */
-	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
+	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) {
 		List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
 
 		if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
@@ -385,26 +386,83 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		return list;
 	}
 
+	/**
+	 * 获取一个类和其父类的所有属性
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	private List<Field> findAllFieldsOfSelfAndSuperClass(Class clazz) {
+		Field[] fields = null;
+		List fieldList = Lists.newArrayList();
+		while (true) {
+			if (clazz == null) {
+				break;
+			} else {
+				fields = clazz.getDeclaredFields();
+				for (int i = 0; i < fields.length; i++) {
+					fieldList.add(fields[i]);
+				}
+				clazz = clazz.getSuperclass();
+			}
+		}
+		return fieldList;
+	}
+
+	/**
+	 * 将对象转Map
+	 * @param obj 待转对象
+	 * @return
+	 */
+	private Map<String, Object> objectToMap(Object obj) {
+
+		Map<String, Object> map = new HashMap<>();
+		// 获取f对象对应类中的所有属性域
+		List<Field> list = findAllFieldsOfSelfAndSuperClass(obj.getClass());
+		for (Field field : list) {
+
+			String varName = field.getName();
+			try {
+				// 获取原来的访问控制权限
+				boolean accessFlag = field.isAccessible();
+				// 修改访问控制权限
+				field.setAccessible(true);
+				// 获取在对象f中属性fields[i]对应的对象中的变量
+				Object o = field.get(obj);
+				if (o != null)
+					map.put(varName, o);
+				// 恢复访问控制权限
+				field.setAccessible(accessFlag);
+			} catch (IllegalArgumentException ex) {
+				ex.printStackTrace();
+			} catch (IllegalAccessException ex) {
+				ex.printStackTrace();
+			}
+		}
+		return map;
+
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象
 	 * @return
 	 */
-	private Map<String, Object> objectToMap(Object obj) {
-		Map<String, Object> map = new HashMap<>();
-		if (obj == null) {
-			return map;
-		}
-		Class clazz = obj.getClass();
-		Field[] fields = clazz.getDeclaredFields();
-		try {
-			for (Field field : fields) {
-				field.setAccessible(true);
-				map.put(field.getName(), field.get(obj));
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return map;
-	}
+//	private Map<String, Object> objectToMap(Object obj) {
+//		Map<String, Object> map = new HashMap<>();
+//		if (obj == null) {
+//			return map;
+//		}
+//		Class clazz = obj.getClass();
+//		Field[] fields = clazz.getDeclaredFields();
+//		try {
+//			for (Field field : fields) {
+//				field.setAccessible(true);
+//				map.put(field.getName(), field.get(obj));
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//		return map;
+//	}
 }