[task-2090]设备档案功能调整 / 【后端】设备档案卡相关接口开发

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/api/IMaintenanceRecordService.java

@@ -26,7 +26,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  * 构建组：ibps-provider-maintenanceRecord-api
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:05
+ * 创建时间：2024-08-13 10:41:30
  *</pre>
  */
 @Validated

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/domain/MaintenanceRecord.java

@@ -23,7 +23,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:05
+ * 创建时间：2024-08-13 10:41:30
  *</pre>
  */
 @SuppressWarnings("serial")

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/dao/MaintenanceRecordDao.java

@@ -9,7 +9,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:04
+ * 创建时间：2024-08-13 10:41:29
  *</pre>
  */
 public interface MaintenanceRecordDao extends IDao<String, MaintenanceRecordPo> {

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/dao/MaintenanceRecordQueryDao.java

@@ -9,7 +9,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:02
+ * 创建时间：2024-08-13 10:41:28
  *</pre>
  */
 public interface MaintenanceRecordQueryDao extends IQueryDao<String, MaintenanceRecordPo> {

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/dao/impl/MaintenanceRecordDaoImpl.java

@@ -12,7 +12,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:03
+ * 创建时间：2024-08-13 10:41:28
  *</pre>
  */
 @SuppressWarnings("serial")

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/dao/impl/MaintenanceRecordQueryDaoImpl.java

@@ -13,7 +13,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:02
+ * 创建时间：2024-08-13 10:41:28
  *</pre>
  */
  @SuppressWarnings("serial")

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/entity/MaintenanceRecordPo.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModel;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:01
+ * 创建时间：2024-08-13 10:41:27
  *</pre>
  */
 @SuppressWarnings("serial")

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/persistence/entity/MaintenanceRecordTbl.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:01
+ * 创建时间：2024-08-13 10:41:27
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -20,8 +20,6 @@ import io.swagger.annotations.ApiModelProperty;
 public class MaintenanceRecordTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "主键")
 	protected String  id; 		/*主键*/
-	@ApiModelProperty(value = "外键")
-	protected String  parentId; 		/*外键*/
 	@ApiModelProperty(value = "租户ID")
 	protected String  tenantId; 		/*租户ID*/
 	@ApiModelProperty(value = "IP地址")
@@ -34,30 +32,54 @@ public class MaintenanceRecordTbl extends AbstractPo<String>{
 	protected String  bianZhiBuMen; 		/*编制部门*/
 	@ApiModelProperty(value = "编制时间")
 	protected String  bianZhiShiJian; 		/*编制时间*/
-	@ApiModelProperty(value = "故障处理")
-	protected String  qingXiHuoHuaT; 		/*故障处理*/
-	@ApiModelProperty(value = "维护周期")
-	protected String  yiQiQingLi; 		/*维护周期*/
-	@ApiModelProperty(value = "故障描述")
-	protected String  biaoZhunHua; 		/*故障描述*/
-	@ApiModelProperty(value = "维护人")
-	protected String  qianMing; 		/*维护人*/
+	@ApiModelProperty(value = "设备名称")
+	protected String  sheBeiMingChen; 		/*设备名称*/
+	@ApiModelProperty(value = "设备编号")
+	protected String  sheBeiBianHao; 		/*设备编号*/
 	@ApiModelProperty(value = "日期")
 	protected String  riQi; 		/*日期*/
-	@ApiModelProperty(value = "备注")
-	protected String  beiZhu; 		/*备注*/
-	@ApiModelProperty(value = "操作内容")
-	protected String  weiHuXiangMu; 		/*操作内容*/
-	@ApiModelProperty(value = "工作状况")
-	protected String  weiHuZhuangTai; 		/*工作状况*/
-	@ApiModelProperty(value = "开机时间")
-	protected String  kaiJiShiJian; 		/*开机时间*/
-	@ApiModelProperty(value = "关机时间")
-	protected String  guanJiShiJian; 		/*关机时间*/
-	@ApiModelProperty(value = "日期")
-	protected String  weiHuRiQi; 		/*日期*/
-	@ApiModelProperty(value = "24h开机")
-	protected String  shiFouKaiJi; 		/*24h开机*/
+	@ApiModelProperty(value = "外键")
+	protected String  waiJian; 		/*外键*/
+	@ApiModelProperty(value = "往年计划")
+	protected String  wangNianJiHua; 		/*往年计划*/
+	@ApiModelProperty(value = "计划年度")
+	protected String  jiHuaNianDu; 		/*计划年度*/
+	@ApiModelProperty(value = "情况记录")
+	protected String  qingKuangJiLu; 		/*情况记录*/
+	@ApiModelProperty(value = "记录附件")
+	protected String  jiLuFuJian; 		/*记录附件*/
+	@ApiModelProperty(value = "生效日期")
+	protected String  shengXiaoRiQi; 		/*生效日期*/
+	@ApiModelProperty(value = "事务说明")
+	protected String  shiWuShuoMing; 		/*事务说明*/
+	@ApiModelProperty(value = "快照")
+	protected String  kuaiZhao; 		/*快照*/
+	@ApiModelProperty(value = "地点")
+	protected String  diDian; 		/*地点*/
+	@ApiModelProperty(value = "计划总外键")
+	protected String  jiHuaZongWaiJ; 		/*计划总外键*/
+	@ApiModelProperty(value = "计划外键")
+	protected String  jiHuaWaiJian; 		/*计划外键*/
+	@ApiModelProperty(value = "网关")
+	protected String  wangGuan; 		/*网关*/
+	@ApiModelProperty(value = "主周期")
+	protected String  zhuZhouQi; 		/*主周期*/
+	@ApiModelProperty(value = "维护内容及情况")
+	protected String  neiRongQingKua; 		/*维护内容及情况*/
+	@ApiModelProperty(value = "维护周期选择")
+	protected String  weiHuZhouQiXu; 		/*维护周期选择*/
+	@ApiModelProperty(value = "部门过滤ID")
+	protected String  buMenGuoLvId; 		/*部门过滤ID*/
+	@ApiModelProperty(value = "计划时间")
+	protected String  jiHuaShiJian; 		/*计划时间*/
+	@ApiModelProperty(value = "维护岗位")
+	protected String  weiHuGangWei; 		/*维护岗位*/
+	@ApiModelProperty(value = "设备状况")
+	protected String  sheBeiZhuangKu; 		/*设备状况*/
+	@ApiModelProperty(value = "周期号")
+	protected String  periodNum; 		/*周期号*/
+	@ApiModelProperty(value = "原设备编号")
+	protected String  originalDeviceN; 		/*原设备编号*/
 
 	public void setId(String id) 
 	{
@@ -71,18 +93,6 @@ public class MaintenanceRecordTbl extends AbstractPo<String>{
 	{
 		return this.id;
 	}
-	public void setParentId(String parentId) 
-	{
-		this.parentId = parentId;
-	}
-	/**
-	 * 返回 外键
-	 * @return
-	 */
-	public String getParentId() 
-	{
-		return this.parentId;
-	}
 	public void setTenantId(String tenantId) 
 	{
 		this.tenantId = tenantId;
@@ -155,149 +165,293 @@ public class MaintenanceRecordTbl extends AbstractPo<String>{
 	{
 		return this.bianZhiShiJian;
 	}
-	public void setQingXiHuoHuaT(String qingXiHuoHuaT) 
+	public void setSheBeiMingChen(String sheBeiMingChen) 
 	{
-		this.qingXiHuoHuaT = qingXiHuoHuaT;
+		this.sheBeiMingChen = sheBeiMingChen;
 	}
 	/**
-	 * 返回 故障处理
+	 * 返回 设备名称
 	 * @return
 	 */
-	public String getQingXiHuoHuaT() 
+	public String getSheBeiMingChen() 
 	{
-		return this.qingXiHuoHuaT;
+		return this.sheBeiMingChen;
 	}
-	public void setYiQiQingLi(String yiQiQingLi) 
+	public void setSheBeiBianHao(String sheBeiBianHao) 
 	{
-		this.yiQiQingLi = yiQiQingLi;
+		this.sheBeiBianHao = sheBeiBianHao;
 	}
 	/**
-	 * 返回 维护周期
+	 * 返回 设备编号
 	 * @return
 	 */
-	public String getYiQiQingLi() 
+	public String getSheBeiBianHao() 
 	{
-		return this.yiQiQingLi;
+		return this.sheBeiBianHao;
 	}
-	public void setBiaoZhunHua(String biaoZhunHua) 
+	public void setRiQi(String riQi) 
 	{
-		this.biaoZhunHua = biaoZhunHua;
+		this.riQi = riQi;
 	}
 	/**
-	 * 返回 故障描述
+	 * 返回 日期
 	 * @return
 	 */
-	public String getBiaoZhunHua() 
+	public String getRiQi() 
 	{
-		return this.biaoZhunHua;
+		return this.riQi;
 	}
-	public void setQianMing(String qianMing) 
+	public void setWaiJian(String waiJian) 
 	{
-		this.qianMing = qianMing;
+		this.waiJian = waiJian;
 	}
 	/**
-	 * 返回 维护人
+	 * 返回 外键
 	 * @return
 	 */
-	public String getQianMing() 
+	public String getWaiJian() 
 	{
-		return this.qianMing;
+		return this.waiJian;
 	}
-	public void setRiQi(String riQi) 
+	public void setWangNianJiHua(String wangNianJiHua) 
 	{
-		this.riQi = riQi;
+		this.wangNianJiHua = wangNianJiHua;
 	}
 	/**
-	 * 返回 日期
+	 * 返回 往年计划
 	 * @return
 	 */
-	public String getRiQi() 
+	public String getWangNianJiHua() 
 	{
-		return this.riQi;
+		return this.wangNianJiHua;
 	}
-	public void setBeiZhu(String beiZhu) 
+	public void setJiHuaNianDu(String jiHuaNianDu) 
 	{
-		this.beiZhu = beiZhu;
+		this.jiHuaNianDu = jiHuaNianDu;
 	}
 	/**
-	 * 返回 备注
+	 * 返回 计划年度
 	 * @return
 	 */
-	public String getBeiZhu() 
+	public String getJiHuaNianDu() 
 	{
-		return this.beiZhu;
+		return this.jiHuaNianDu;
 	}
-	public void setWeiHuXiangMu(String weiHuXiangMu) 
+	public void setQingKuangJiLu(String qingKuangJiLu) 
 	{
-		this.weiHuXiangMu = weiHuXiangMu;
+		this.qingKuangJiLu = qingKuangJiLu;
 	}
 	/**
-	 * 返回 操作内容
+	 * 返回 情况记录
 	 * @return
 	 */
-	public String getWeiHuXiangMu() 
+	public String getQingKuangJiLu() 
 	{
-		return this.weiHuXiangMu;
+		return this.qingKuangJiLu;
 	}
-	public void setWeiHuZhuangTai(String weiHuZhuangTai) 
+	public void setJiLuFuJian(String jiLuFuJian) 
 	{
-		this.weiHuZhuangTai = weiHuZhuangTai;
+		this.jiLuFuJian = jiLuFuJian;
 	}
 	/**
-	 * 返回 工作状况
+	 * 返回 记录附件
 	 * @return
 	 */
-	public String getWeiHuZhuangTai() 
+	public String getJiLuFuJian() 
 	{
-		return this.weiHuZhuangTai;
+		return this.jiLuFuJian;
 	}
-	public void setKaiJiShiJian(String kaiJiShiJian) 
+	public void setShengXiaoRiQi(String shengXiaoRiQi) 
 	{
-		this.kaiJiShiJian = kaiJiShiJian;
+		this.shengXiaoRiQi = shengXiaoRiQi;
 	}
 	/**
-	 * 返回 开机时间
+	 * 返回 生效日期
 	 * @return
 	 */
-	public String getKaiJiShiJian() 
+	public String getShengXiaoRiQi() 
 	{
-		return this.kaiJiShiJian;
+		return this.shengXiaoRiQi;
 	}
-	public void setGuanJiShiJian(String guanJiShiJian) 
+	public void setShiWuShuoMing(String shiWuShuoMing) 
 	{
-		this.guanJiShiJian = guanJiShiJian;
+		this.shiWuShuoMing = shiWuShuoMing;
 	}
 	/**
-	 * 返回 关机时间
+	 * 返回 事务说明
 	 * @return
 	 */
-	public String getGuanJiShiJian() 
+	public String getShiWuShuoMing() 
 	{
-		return this.guanJiShiJian;
+		return this.shiWuShuoMing;
 	}
-	public void setWeiHuRiQi(String weiHuRiQi) 
+	public void setKuaiZhao(String kuaiZhao) 
 	{
-		this.weiHuRiQi = weiHuRiQi;
+		this.kuaiZhao = kuaiZhao;
 	}
 	/**
-	 * 返回 日期
+	 * 返回 快照
+	 * @return
+	 */
+	public String getKuaiZhao() 
+	{
+		return this.kuaiZhao;
+	}
+	public void setDiDian(String diDian) 
+	{
+		this.diDian = diDian;
+	}
+	/**
+	 * 返回 地点
+	 * @return
+	 */
+	public String getDiDian() 
+	{
+		return this.diDian;
+	}
+	public void setJiHuaZongWaiJ(String jiHuaZongWaiJ) 
+	{
+		this.jiHuaZongWaiJ = jiHuaZongWaiJ;
+	}
+	/**
+	 * 返回 计划总外键
+	 * @return
+	 */
+	public String getJiHuaZongWaiJ() 
+	{
+		return this.jiHuaZongWaiJ;
+	}
+	public void setJiHuaWaiJian(String jiHuaWaiJian) 
+	{
+		this.jiHuaWaiJian = jiHuaWaiJian;
+	}
+	/**
+	 * 返回 计划外键
+	 * @return
+	 */
+	public String getJiHuaWaiJian() 
+	{
+		return this.jiHuaWaiJian;
+	}
+	public void setWangGuan(String wangGuan) 
+	{
+		this.wangGuan = wangGuan;
+	}
+	/**
+	 * 返回 网关
+	 * @return
+	 */
+	public String getWangGuan() 
+	{
+		return this.wangGuan;
+	}
+	public void setZhuZhouQi(String zhuZhouQi) 
+	{
+		this.zhuZhouQi = zhuZhouQi;
+	}
+	/**
+	 * 返回 主周期
+	 * @return
+	 */
+	public String getZhuZhouQi() 
+	{
+		return this.zhuZhouQi;
+	}
+	public void setNeiRongQingKua(String neiRongQingKua) 
+	{
+		this.neiRongQingKua = neiRongQingKua;
+	}
+	/**
+	 * 返回 维护内容及情况
+	 * @return
+	 */
+	public String getNeiRongQingKua() 
+	{
+		return this.neiRongQingKua;
+	}
+	public void setWeiHuZhouQiXu(String weiHuZhouQiXu) 
+	{
+		this.weiHuZhouQiXu = weiHuZhouQiXu;
+	}
+	/**
+	 * 返回 维护周期选择
+	 * @return
+	 */
+	public String getWeiHuZhouQiXu() 
+	{
+		return this.weiHuZhouQiXu;
+	}
+	public void setBuMenGuoLvId(String buMenGuoLvId) 
+	{
+		this.buMenGuoLvId = buMenGuoLvId;
+	}
+	/**
+	 * 返回 部门过滤ID
+	 * @return
+	 */
+	public String getBuMenGuoLvId() 
+	{
+		return this.buMenGuoLvId;
+	}
+	public void setJiHuaShiJian(String jiHuaShiJian) 
+	{
+		this.jiHuaShiJian = jiHuaShiJian;
+	}
+	/**
+	 * 返回 计划时间
+	 * @return
+	 */
+	public String getJiHuaShiJian() 
+	{
+		return this.jiHuaShiJian;
+	}
+	public void setWeiHuGangWei(String weiHuGangWei) 
+	{
+		this.weiHuGangWei = weiHuGangWei;
+	}
+	/**
+	 * 返回 维护岗位
+	 * @return
+	 */
+	public String getWeiHuGangWei() 
+	{
+		return this.weiHuGangWei;
+	}
+	public void setSheBeiZhuangKu(String sheBeiZhuangKu) 
+	{
+		this.sheBeiZhuangKu = sheBeiZhuangKu;
+	}
+	/**
+	 * 返回 设备状况
+	 * @return
+	 */
+	public String getSheBeiZhuangKu() 
+	{
+		return this.sheBeiZhuangKu;
+	}
+	public void setPeriodNum(String periodNum) 
+	{
+		this.periodNum = periodNum;
+	}
+	/**
+	 * 返回 周期号
 	 * @return
 	 */
-	public String getWeiHuRiQi() 
+	public String getPeriodNum() 
 	{
-		return this.weiHuRiQi;
+		return this.periodNum;
 	}
-	public void setShiFouKaiJi(String shiFouKaiJi) 
+	public void setOriginalDeviceN(String originalDeviceN) 
 	{
-		this.shiFouKaiJi = shiFouKaiJi;
+		this.originalDeviceN = originalDeviceN;
 	}
 	/**
-	 * 返回 24h开机
+	 * 返回 原设备编号
 	 * @return
 	 */
-	public String getShiFouKaiJi() 
+	public String getOriginalDeviceN() 
 	{
-		return this.shiFouKaiJi;
+		return this.originalDeviceN;
 	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/provider/MaintenanceRecordProvider.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ExtensionProperty;
  * 构建组：ibps-provider-maintenanceRecord
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:06
+ * 创建时间：2024-08-13 10:41:31
  *</pre>
  */
 @Api(tags = "设备维护记录表管理", value = "设备维护记录表数据")

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/repository/MaintenanceRecordRepository.java

@@ -10,7 +10,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:04
+ * 创建时间：2024-08-13 10:41:29
  *</pre>
  */
 public interface MaintenanceRecordRepository extends IRepository<String, MaintenanceRecordPo,MaintenanceRecord>{

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/repository/impl/MaintenanceRecordRepositoryImpl.java

@@ -19,7 +19,7 @@ import com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:04
+ * 创建时间：2024-08-13 10:41:29
  *</pre>
  */
 @Repository

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/equipment/persistence/mapping/MaintenanceRecord.map.xml

@@ -4,7 +4,6 @@
 	<!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
 	<resultMap id="MaintenanceRecordPo" type="com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo">
 		<id property="id" column="ID_" jdbcType="VARCHAR"/>
-		<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR"/>
 		<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
 		<result property="ip" column="IP_" jdbcType="VARCHAR"/>
 		<result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
@@ -15,40 +14,52 @@
 		<result property="bianZhiRen" column="BIAN_ZHI_REN_" jdbcType="VARCHAR"/>
 		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
 		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
-		<result property="qingXiHuoHuaT" column="QING_XI_HUO_HUA_T" jdbcType="VARCHAR"/>
-		<result property="yiQiQingLi" column="YI_QI_QING_LI_" jdbcType="VARCHAR"/>
-		<result property="biaoZhunHua" column="BIAO_ZHUN_HUA_" jdbcType="VARCHAR"/>
-		<result property="qianMing" column="QIAN_MING_" jdbcType="VARCHAR"/>
+		<result property="sheBeiMingChen" column="SHE_BEI_MING_CHEN" jdbcType="VARCHAR"/>
+		<result property="sheBeiBianHao" column="SHE_BEI_BIAN_HAO_" jdbcType="VARCHAR"/>
 		<result property="riQi" column="RI_QI_" jdbcType="VARCHAR"/>
-		<result property="beiZhu" column="BEI_ZHU_" jdbcType="VARCHAR"/>
-		<result property="weiHuXiangMu" column="WEI_HU_XIANG_MU_" jdbcType="VARCHAR"/>
-		<result property="weiHuZhuangTai" column="WEI_HU_ZHUANG_TAI" jdbcType="VARCHAR"/>
-		<result property="kaiJiShiJian" column="KAI_JI_SHI_JIAN_" jdbcType="VARCHAR"/>
-		<result property="guanJiShiJian" column="GUAN_JI_SHI_JIAN_" jdbcType="VARCHAR"/>
-		<result property="weiHuRiQi" column="WEI_HU_RI_QI_" jdbcType="VARCHAR"/>
-		<result property="shiFouKaiJi" column="SHI_FOU_KAI_JI_" jdbcType="VARCHAR"/>
+		<result property="waiJian" column="WAI_JIAN_" jdbcType="VARCHAR"/>
+		<result property="wangNianJiHua" column="WANG_NIAN_JI_HUA_" jdbcType="VARCHAR"/>
+		<result property="jiHuaNianDu" column="JI_HUA_NIAN_DU_" jdbcType="VARCHAR"/>
+		<result property="qingKuangJiLu" column="QING_KUANG_JI_LU_" jdbcType="VARCHAR"/>
+		<result property="jiLuFuJian" column="JI_LU_FU_JIAN_" jdbcType="BLOB"/>
+		<result property="shengXiaoRiQi" column="SHENG_XIAO_RI_QI_" jdbcType="VARCHAR"/>
+		<result property="shiWuShuoMing" column="SHI_WU_SHUO_MING_" jdbcType="BLOB"/>
+		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
+		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="jiHuaZongWaiJ" column="JI_HUA_ZONG_WAI_J" jdbcType="VARCHAR"/>
+		<result property="jiHuaWaiJian" column="JI_HUA_WAI_JIAN_" jdbcType="VARCHAR"/>
+		<result property="wangGuan" column="WANG_GUAN_" jdbcType="VARCHAR"/>
+		<result property="zhuZhouQi" column="ZHU_ZHOU_QI_" jdbcType="VARCHAR"/>
+		<result property="neiRongQingKua" column="NEI_RONG_QING_KUA" jdbcType="BLOB"/>
+		<result property="weiHuZhouQiXu" column="WEI_HU_ZHOU_QI_XU" jdbcType="VARCHAR"/>
+		<result property="buMenGuoLvId" column="BU_MEN_GUO_LV_ID_" jdbcType="VARCHAR"/>
+		<result property="jiHuaShiJian" column="JI_HUA_SHI_JIAN_" jdbcType="VARCHAR"/>
+		<result property="weiHuGangWei" column="WEI_HU_GANG_WEI_" jdbcType="VARCHAR"/>
+		<result property="sheBeiZhuangKu" column="SHE_BEI_ZHUANG_KU" jdbcType="VARCHAR"/>
+		<result property="periodNum" column="PERIOD_NUM" jdbcType="VARCHAR"/>
+		<result property="originalDeviceN" column="ORIGINAL_DEVICE_N" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,QING_XI_HUO_HUA_T,YI_QI_QING_LI_,BIAO_ZHUN_HUA_,QIAN_MING_,RI_QI_,BEI_ZHU_,WEI_HU_XIANG_MU_,WEI_HU_ZHUANG_TAI,KAI_JI_SHI_JIAN_,GUAN_JI_SHI_JIAN_,WEI_HU_RI_QI_,SHI_FOU_KAI_JI_
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,SHE_BEI_MING_CHEN,SHE_BEI_BIAN_HAO_,RI_QI_,WAI_JIAN_,WANG_NIAN_JI_HUA_,JI_HUA_NIAN_DU_,QING_KUANG_JI_LU_,JI_LU_FU_JIAN_,SHENG_XIAO_RI_QI_,SHI_WU_SHUO_MING_,KUAI_ZHAO_,DI_DIAN_,JI_HUA_ZONG_WAI_J,JI_HUA_WAI_JIAN_,WANG_GUAN_,ZHU_ZHOU_QI_,NEI_RONG_QING_KUA,WEI_HU_ZHOU_QI_XU,BU_MEN_GUO_LV_ID_,JI_HUA_SHI_JIAN_,WEI_HU_GANG_WEI_,SHE_BEI_ZHUANG_KU,PERIOD_NUM,ORIGINAL_DEVICE_N
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo">
-		INSERT INTO T_MJSBWHBYJLZBY
+		INSERT INTO T_MJSBWHBYJLBY
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{qingXiHuoHuaT,jdbcType=VARCHAR}, #{yiQiQingLi,jdbcType=VARCHAR}, #{biaoZhunHua,jdbcType=VARCHAR}, #{qianMing,jdbcType=VARCHAR}, #{riQi,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{weiHuXiangMu,jdbcType=VARCHAR}, #{weiHuZhuangTai,jdbcType=VARCHAR}, #{kaiJiShiJian,jdbcType=VARCHAR}, #{guanJiShiJian,jdbcType=VARCHAR}, #{weiHuRiQi,jdbcType=VARCHAR}, #{shiFouKaiJi,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{sheBeiMingChen,jdbcType=VARCHAR}, #{sheBeiBianHao,jdbcType=VARCHAR}, #{riQi,jdbcType=VARCHAR}, #{waiJian,jdbcType=VARCHAR}, #{wangNianJiHua,jdbcType=VARCHAR}, #{jiHuaNianDu,jdbcType=VARCHAR}, #{qingKuangJiLu,jdbcType=VARCHAR}, #{jiLuFuJian,jdbcType=BLOB}, #{shengXiaoRiQi,jdbcType=VARCHAR}, #{shiWuShuoMing,jdbcType=BLOB}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{jiHuaZongWaiJ,jdbcType=VARCHAR}, #{jiHuaWaiJian,jdbcType=VARCHAR}, #{wangGuan,jdbcType=VARCHAR}, #{zhuZhouQi,jdbcType=VARCHAR}, #{neiRongQingKua,jdbcType=BLOB}, #{weiHuZhouQiXu,jdbcType=VARCHAR}, #{buMenGuoLvId,jdbcType=VARCHAR}, #{jiHuaShiJian,jdbcType=VARCHAR}, #{weiHuGangWei,jdbcType=VARCHAR}, #{sheBeiZhuangKu,jdbcType=VARCHAR}, #{periodNum,jdbcType=VARCHAR}, #{originalDeviceN,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="MaintenanceRecordPo">
-		SELECT <include refid="columns"/> FROM T_MJSBWHBYJLZBY 
+		SELECT <include refid="columns"/> FROM T_MJSBWHBYJLBY 
 		WHERE 
 		ID_=#{id}
 	</select>
 	
 	
 	<sql id="querySql" >
-		SELECT <include refid="columns"/> FROM T_MJSBWHBYJLZBY
+		SELECT <include refid="columns"/> FROM T_MJSBWHBYJLBY
 		<where>
 			<if test="@o.Ognl@isNotEmpty(whereSql)">
 				${whereSql}
@@ -71,7 +82,7 @@
 	</select>
 	
 	<select id="findByIds" resultMap="MaintenanceRecordPo">
-		SELECT <include refid="columns"/> FROM T_MJSBWHBYJLZBY
+		SELECT <include refid="columns"/> FROM T_MJSBWHBYJLBY
 			WHERE ID_ in 
 			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
 				#{id}  
@@ -80,8 +91,7 @@
 	</select>	
 	
 	<update id="update" parameterType="com.lc.ibps.components.equipment.persistence.entity.MaintenanceRecordPo">
-		UPDATE T_MJSBWHBYJLZBY SET
-		PARENT_ID_=#{parentId,jdbcType=VARCHAR},
+		UPDATE T_MJSBWHBYJLBY SET
 		TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
 		IP_=#{ip,jdbcType=VARCHAR},
 		UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
@@ -90,24 +100,36 @@
 		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
 		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
 		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
-		QING_XI_HUO_HUA_T=#{qingXiHuoHuaT,jdbcType=VARCHAR},
-		YI_QI_QING_LI_=#{yiQiQingLi,jdbcType=VARCHAR},
-		BIAO_ZHUN_HUA_=#{biaoZhunHua,jdbcType=VARCHAR},
-		QIAN_MING_=#{qianMing,jdbcType=VARCHAR},
+		SHE_BEI_MING_CHEN=#{sheBeiMingChen,jdbcType=VARCHAR},
+		SHE_BEI_BIAN_HAO_=#{sheBeiBianHao,jdbcType=VARCHAR},
 		RI_QI_=#{riQi,jdbcType=VARCHAR},
-		BEI_ZHU_=#{beiZhu,jdbcType=VARCHAR},
-		WEI_HU_XIANG_MU_=#{weiHuXiangMu,jdbcType=VARCHAR},
-		WEI_HU_ZHUANG_TAI=#{weiHuZhuangTai,jdbcType=VARCHAR},
-		KAI_JI_SHI_JIAN_=#{kaiJiShiJian,jdbcType=VARCHAR},
-		GUAN_JI_SHI_JIAN_=#{guanJiShiJian,jdbcType=VARCHAR},
-		WEI_HU_RI_QI_=#{weiHuRiQi,jdbcType=VARCHAR},
-		SHI_FOU_KAI_JI_=#{shiFouKaiJi,jdbcType=VARCHAR}
+		WAI_JIAN_=#{waiJian,jdbcType=VARCHAR},
+		WANG_NIAN_JI_HUA_=#{wangNianJiHua,jdbcType=VARCHAR},
+		JI_HUA_NIAN_DU_=#{jiHuaNianDu,jdbcType=VARCHAR},
+		QING_KUANG_JI_LU_=#{qingKuangJiLu,jdbcType=VARCHAR},
+		JI_LU_FU_JIAN_=#{jiLuFuJian,jdbcType=BLOB},
+		SHENG_XIAO_RI_QI_=#{shengXiaoRiQi,jdbcType=VARCHAR},
+		SHI_WU_SHUO_MING_=#{shiWuShuoMing,jdbcType=BLOB},
+		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		JI_HUA_ZONG_WAI_J=#{jiHuaZongWaiJ,jdbcType=VARCHAR},
+		JI_HUA_WAI_JIAN_=#{jiHuaWaiJian,jdbcType=VARCHAR},
+		WANG_GUAN_=#{wangGuan,jdbcType=VARCHAR},
+		ZHU_ZHOU_QI_=#{zhuZhouQi,jdbcType=VARCHAR},
+		NEI_RONG_QING_KUA=#{neiRongQingKua,jdbcType=BLOB},
+		WEI_HU_ZHOU_QI_XU=#{weiHuZhouQiXu,jdbcType=VARCHAR},
+		BU_MEN_GUO_LV_ID_=#{buMenGuoLvId,jdbcType=VARCHAR},
+		JI_HUA_SHI_JIAN_=#{jiHuaShiJian,jdbcType=VARCHAR},
+		WEI_HU_GANG_WEI_=#{weiHuGangWei,jdbcType=VARCHAR},
+		SHE_BEI_ZHUANG_KU=#{sheBeiZhuangKu,jdbcType=VARCHAR},
+		PERIOD_NUM=#{periodNum,jdbcType=VARCHAR},
+		ORIGINAL_DEVICE_N=#{originalDeviceN,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>
 	
 	<delete id="remove" parameterType="java.lang.String">
-		DELETE FROM T_MJSBWHBYJLZBY 
+		DELETE FROM T_MJSBWHBYJLBY 
 		WHERE
 		ID_=#{id}
 	</delete>

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/EquipmentBaseTest.java

@@ -14,7 +14,7 @@ import com.lc.ibps.api.base.id.IdGenerator;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 15:19:07
+ * 创建时间：2024-08-13 10:41:29
  *</pre>
  */
 @ContextConfiguration({"classpath:conf/components-test.xml"})

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/equipment/domain/MaintenanceRecordTest.java

@@ -20,7 +20,7 @@ import com.lc.ibps.components.EquipmentBaseTest;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:05
+ * 创建时间：2024-08-13 10:41:30
  *</pre>
  */
 public class MaintenanceRecordTest extends EquipmentBaseTest{

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/equipment/persistence/dao/MaintenanceRecordDaoTest.java

@@ -17,7 +17,7 @@ import com.lc.ibps.components.EquipmentBaseTest;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 16:50:02
+ * 创建时间：2024-08-13 10:41:28
  *</pre>
  */
 public class MaintenanceRecordDaoTest extends EquipmentBaseTest{