[task-2210] 设备维护推送频率增加按时间间隔推送

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

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-12 15:19:05
+ * 创建时间：2024-09-11 14:25:13
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -46,6 +46,8 @@ public class MaintenanceItemTbl extends AbstractPo<String>{
 	protected String  weiHuLeiXing; 		/*维护类型*/
 	@ApiModelProperty(value = "日期数字")
 	protected String  riQiShuZi; 		/*日期数字*/
+	@ApiModelProperty(value = "开始时间")
+	protected String  kaiShiShiJian; 		/*开始时间*/
 
 	public void setId(String id) 
 	{
@@ -215,5 +217,17 @@ public class MaintenanceItemTbl extends AbstractPo<String>{
 	{
 		return this.riQiShuZi;
 	}
+	public void setKaiShiShiJian(String kaiShiShiJian) 
+	{
+		this.kaiShiShiJian = kaiShiShiJian;
+	}
+	/**
+	 * 返回 开始时间
+	 * @return
+	 */
+	public String getKaiShiShiJian() 
+	{
+		return this.kaiShiShiJian;
+	}
 	
 }

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

@@ -21,17 +21,18 @@
 		<result property="weiHuRiQi" column="WEI_HU_RI_QI_" jdbcType="VARCHAR"/>
 		<result property="weiHuLeiXing" column="WEI_HU_LEI_XING_" jdbcType="VARCHAR"/>
 		<result property="riQiShuZi" column="RI_QI_SHU_ZI_" jdbcType="VARCHAR"/>
+		<result property="kaiShiShiJian" column="KAI_SHI_SHI_JIAN_" 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,KUAI_ZHAO_,WEI_HU_ZHOU_QI_C_,WEI_HU_XIANG_MU_C,WEI_HU_RI_QI_,WEI_HU_LEI_XING_,RI_QI_SHU_ZI_
+		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,KUAI_ZHAO_,WEI_HU_ZHOU_QI_C_,WEI_HU_XIANG_MU_C,WEI_HU_RI_QI_,WEI_HU_LEI_XING_,RI_QI_SHU_ZI_,KAI_SHI_SHI_JIAN_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.equipment.persistence.entity.MaintenanceItemPo">
 		INSERT INTO T_WHZQJXM
 		(<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}, #{kuaiZhao,jdbcType=VARCHAR}, #{weiHuZhouQiC,jdbcType=VARCHAR}, #{weiHuXiangMuC,jdbcType=VARCHAR}, #{weiHuRiQi,jdbcType=VARCHAR}, #{weiHuLeiXing,jdbcType=VARCHAR}, #{riQiShuZi,jdbcType=VARCHAR})
+		(#{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}, #{kuaiZhao,jdbcType=VARCHAR}, #{weiHuZhouQiC,jdbcType=VARCHAR}, #{weiHuXiangMuC,jdbcType=VARCHAR}, #{weiHuRiQi,jdbcType=VARCHAR}, #{weiHuLeiXing,jdbcType=VARCHAR}, #{riQiShuZi,jdbcType=VARCHAR}, #{kaiShiShiJian,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="MaintenanceItemPo">
@@ -89,7 +90,8 @@
 		WEI_HU_XIANG_MU_C=#{weiHuXiangMuC,jdbcType=VARCHAR},
 		WEI_HU_RI_QI_=#{weiHuRiQi,jdbcType=VARCHAR},
 		WEI_HU_LEI_XING_=#{weiHuLeiXing,jdbcType=VARCHAR},
-		RI_QI_SHU_ZI_=#{riQiShuZi,jdbcType=VARCHAR}
+		RI_QI_SHU_ZI_=#{riQiShuZi,jdbcType=VARCHAR},
+		KAI_SHI_SHI_JIAN_=#{kaiShiShiJian,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/EquipmentMaintenancePlanJob.java

@@ -79,6 +79,7 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
                 "    WHEN '季度保养' THEN QUARTER(#{p0})  " +
                 "    WHEN '半年保养' THEN IF(MONTH(#{p0})-6>0,2,1) " +
                 "    WHEN '年保养' THEN YEAR(#{p0})  " +
+                "    WHEN '间隔保养' THEN DATEDIFF(#{p0},startDate)/(ri_qi_shu_zi_+1)" +
                 "    ELSE CONCAT (DATE_FORMAT(#{p0}, '%u'),'.',WEEKDAY(#{p0})+1) " +
                 "    END AS period_num,device.wei_hu_ri_qi_ AS zhu_zhou_qi_ ,device.id_ AS she_bei_bian_hao_,device.bian_zhi_bu_men_,  " +
                 "    device.she_bei_ming_cheng_ AS she_bei_ming_chen,device.she_bei_shi_bie_h AS ri_qi_,device.cun_fang_di_dian_ AS sheng_xiao_ri_qi_,  " +
@@ -95,7 +96,8 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
                 "   (wei_hu_lei_xing_ ='月保养' AND ri_qi_shu_zi_ - DAY(#{p0})  >0 ) OR" +
                 "   (wei_hu_lei_xing_ ='季度保养' AND ri_qi_shu_zi_ MOD 3 <> MONTH(#{p0}) MOD 3 ) OR" +
                 "   (wei_hu_lei_xing_ ='半年保养' AND ri_qi_shu_zi_ MOD 6 <> MONTH(#{p0}) MOD 6  ) OR" +
-                "   (wei_hu_lei_xing_ ='年保养' AND ri_qi_shu_zi_ - MONTH(#{p0})  >0 )" +
+                "   (wei_hu_lei_xing_ ='年保养' AND ri_qi_shu_zi_ - MONTH(#{p0})  >0 ) OR" +
+                "   (wei_hu_lei_xing_='间隔保养' AND (DATEDIFF(#{p0},startDate)<0 OR MOD(DATEDIFF(#{p0},startDate),ri_qi_shu_zi_+1)<>0))" +
                 "   )) plan  " +
                 "    WHERE NOT EXISTS (SELECT 1 FROM `t_mjsbwhbyjlby` jlb WHERE jlb.she_bei_bian_hao_ = plan.she_bei_bian_hao_ " +
                 "    AND jlb.period_num = plan.period_num AND jlb.ji_hua_nian_du_=plan.ji_hua_nian_du_)" +