Merge remote-tracking branch 'origin/master'

src/main/java/com/jpsoft/smart/modules/base/entity/ElectricClientInfo.java

@@ -32,6 +32,7 @@ public class ElectricClientInfo {
 	private Boolean delFlag;
 	private Integer rechargeTimes;
 	private Boolean active;
+	private Integer warningValue;
 	
 		/**
 	 *获取
@@ -319,4 +320,17 @@ public class ElectricClientInfo {
 	public void setActive(Boolean active) {
 		this.active = active;
 	}
+
+	/**
+	 * 报警数值
+	 * @return
+	 */
+	public Integer getWarningValue() {
+		return warningValue;
+	}
+
+	public void setWarningValue(Integer active) {
+		this.warningValue = warningValue;
+	}
+
 }

src/main/java/com/jpsoft/smart/modules/common/utils/WechatMessageUtil.java

@@ -283,7 +283,7 @@ public class WechatMessageUtil {
 
 
 		JSONObject sendData = new JSONObject();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String finallyContent = getContent(content);
 		JSONObject first = new JSONObject();
 		first.put("value", "您好，入侵警告通知如下：");

src/main/resources/mapper/base/ElectricClientInfo.xml

@@ -22,6 +22,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="rechargeTimes" column="recharge_times"/>
         <result property="active" column="active_"/>
+        <result property="warningValue" column="warning_value"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.ElectricClientInfo">
         <!--
@@ -33,7 +34,7 @@
 		insert into base_electric_client_info
 	    (id_,customer_no,room_id,meter_id,electricity_total,amount_total,buy_num,
 	    electricity_remaining,amount_remaining,create_by,create_time,update_by,
-	    update_time,del_flag,recharge_times,active_)
+	    update_time,del_flag,recharge_times,active_,warning_value)
 		values
 		(
 			#{id,jdbcType=VARCHAR}
@@ -52,6 +53,7 @@
 			,#{delFlag,jdbcType= NUMERIC }
 			,#{rechargeTimes,jdbcType= NUMERIC }
 			,#{active,jdbcType= NUMERIC }
+			,#{warningValue,jdbcType= NUMERIC }
 		)
 	]]>
     </insert>
@@ -106,6 +108,9 @@
             <if test="active!=null">
                 active_=#{active,jdbcType= NUMERIC },
             </if>
+            <if test="warningValue!=null">
+                warning_value=#{warningValue,jdbcType= NUMERIC },
+            </if>
         </set>
         where id_=#{id}
     </update>