Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java

@@ -0,0 +1,17 @@
+package com.ccsens.wisdomcar.api;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Api(tags = "统计api" , description = "大屏显示")
+@RestController
+@RequestMapping("/statistics")
+public class StatisticsController {
+
+}

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAid.java

@@ -8,9 +8,11 @@ public class FirstAid implements Serializable {
 
     private Long carId;
 
-    private Long begintime;
+    private Long hospitalId;
 
-    private Long endtime;
+    private Long beginTime;
+
+    private Long endTime;
 
     private Date createdAt;
 
@@ -36,20 +38,28 @@ public class FirstAid implements Serializable {
         this.carId = carId;
     }
 
-    public Long getBegintime() {
-        return begintime;
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Long getBeginTime() {
+        return beginTime;
     }
 
-    public void setBegintime(Long begintime) {
-        this.begintime = begintime;
+    public void setBeginTime(Long beginTime) {
+        this.beginTime = beginTime;
     }
 
-    public Long getEndtime() {
-        return endtime;
+    public Long getEndTime() {
+        return endTime;
     }
 
-    public void setEndtime(Long endtime) {
-        this.endtime = endtime;
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
     }
 
     public Date getCreatedAt() {
@@ -84,8 +94,9 @@ public class FirstAid implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", carId=").append(carId);
-        sb.append(", begintime=").append(begintime);
-        sb.append(", endtime=").append(endtime);
+        sb.append(", hospitalId=").append(hospitalId);
+        sb.append(", beginTime=").append(beginTime);
+        sb.append(", endTime=").append(endTime);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidExample.java

@@ -225,123 +225,183 @@ public class FirstAidExample {
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeIsNull() {
-            addCriterion("beginTime is null");
+        public Criteria andHospitalIdIsNull() {
+            addCriterion("hospital_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeIsNotNull() {
-            addCriterion("beginTime is not null");
+        public Criteria andHospitalIdIsNotNull() {
+            addCriterion("hospital_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeEqualTo(Long value) {
-            addCriterion("beginTime =", value, "begintime");
+        public Criteria andHospitalIdEqualTo(Long value) {
+            addCriterion("hospital_id =", value, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeNotEqualTo(Long value) {
-            addCriterion("beginTime <>", value, "begintime");
+        public Criteria andHospitalIdNotEqualTo(Long value) {
+            addCriterion("hospital_id <>", value, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeGreaterThan(Long value) {
-            addCriterion("beginTime >", value, "begintime");
+        public Criteria andHospitalIdGreaterThan(Long value) {
+            addCriterion("hospital_id >", value, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("beginTime >=", value, "begintime");
+        public Criteria andHospitalIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("hospital_id >=", value, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeLessThan(Long value) {
-            addCriterion("beginTime <", value, "begintime");
+        public Criteria andHospitalIdLessThan(Long value) {
+            addCriterion("hospital_id <", value, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeLessThanOrEqualTo(Long value) {
-            addCriterion("beginTime <=", value, "begintime");
+        public Criteria andHospitalIdLessThanOrEqualTo(Long value) {
+            addCriterion("hospital_id <=", value, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeIn(List<Long> values) {
-            addCriterion("beginTime in", values, "begintime");
+        public Criteria andHospitalIdIn(List<Long> values) {
+            addCriterion("hospital_id in", values, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeNotIn(List<Long> values) {
-            addCriterion("beginTime not in", values, "begintime");
+        public Criteria andHospitalIdNotIn(List<Long> values) {
+            addCriterion("hospital_id not in", values, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeBetween(Long value1, Long value2) {
-            addCriterion("beginTime between", value1, value2, "begintime");
+        public Criteria andHospitalIdBetween(Long value1, Long value2) {
+            addCriterion("hospital_id between", value1, value2, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeNotBetween(Long value1, Long value2) {
-            addCriterion("beginTime not between", value1, value2, "begintime");
+        public Criteria andHospitalIdNotBetween(Long value1, Long value2) {
+            addCriterion("hospital_id not between", value1, value2, "hospitalId");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeIsNull() {
-            addCriterion("endTime is null");
+        public Criteria andBeginTimeIsNull() {
+            addCriterion("begin_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeIsNotNull() {
-            addCriterion("endTime is not null");
+        public Criteria andBeginTimeIsNotNull() {
+            addCriterion("begin_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeEqualTo(Long value) {
-            addCriterion("endTime =", value, "endtime");
+        public Criteria andBeginTimeEqualTo(Long value) {
+            addCriterion("begin_time =", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeNotEqualTo(Long value) {
-            addCriterion("endTime <>", value, "endtime");
+        public Criteria andBeginTimeNotEqualTo(Long value) {
+            addCriterion("begin_time <>", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeGreaterThan(Long value) {
-            addCriterion("endTime >", value, "endtime");
+        public Criteria andBeginTimeGreaterThan(Long value) {
+            addCriterion("begin_time >", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("endTime >=", value, "endtime");
+        public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("begin_time >=", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeLessThan(Long value) {
-            addCriterion("endTime <", value, "endtime");
+        public Criteria andBeginTimeLessThan(Long value) {
+            addCriterion("begin_time <", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeLessThanOrEqualTo(Long value) {
-            addCriterion("endTime <=", value, "endtime");
+        public Criteria andBeginTimeLessThanOrEqualTo(Long value) {
+            addCriterion("begin_time <=", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeIn(List<Long> values) {
-            addCriterion("endTime in", values, "endtime");
+        public Criteria andBeginTimeIn(List<Long> values) {
+            addCriterion("begin_time in", values, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeNotIn(List<Long> values) {
-            addCriterion("endTime not in", values, "endtime");
+        public Criteria andBeginTimeNotIn(List<Long> values) {
+            addCriterion("begin_time not in", values, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeBetween(Long value1, Long value2) {
-            addCriterion("endTime between", value1, value2, "endtime");
+        public Criteria andBeginTimeBetween(Long value1, Long value2) {
+            addCriterion("begin_time between", value1, value2, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtimeNotBetween(Long value1, Long value2) {
-            addCriterion("endTime not between", value1, value2, "endtime");
+        public Criteria andBeginTimeNotBetween(Long value1, Long value2) {
+            addCriterion("begin_time not between", value1, value2, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNull() {
+            addCriterion("end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNotNull() {
+            addCriterion("end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeEqualTo(Long value) {
+            addCriterion("end_time =", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotEqualTo(Long value) {
+            addCriterion("end_time <>", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThan(Long value) {
+            addCriterion("end_time >", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("end_time >=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThan(Long value) {
+            addCriterion("end_time <", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThanOrEqualTo(Long value) {
+            addCriterion("end_time <=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIn(List<Long> values) {
+            addCriterion("end_time in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotIn(List<Long> values) {
+            addCriterion("end_time not in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeBetween(Long value1, Long value2) {
+            addCriterion("end_time between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotBetween(Long value1, Long value2) {
+            addCriterion("end_time not between", value1, value2, "endTime");
             return (Criteria) this;
         }
 

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecord.java

@@ -12,9 +12,7 @@ public class FirstAidRecord implements Serializable {
 
     private String value;
 
-    private Long begintime;
-
-    private Long endtime;
+    private Long beginTime;
 
     private Date createdAt;
 
@@ -56,20 +54,12 @@ public class FirstAidRecord implements Serializable {
         this.value = value == null ? null : value.trim();
     }
 
-    public Long getBegintime() {
-        return begintime;
-    }
-
-    public void setBegintime(Long begintime) {
-        this.begintime = begintime;
-    }
-
-    public Long getEndtime() {
-        return endtime;
+    public Long getBeginTime() {
+        return beginTime;
     }
 
-    public void setEndtime(Long endtime) {
-        this.endtime = endtime;
+    public void setBeginTime(Long beginTime) {
+        this.beginTime = beginTime;
     }
 
     public Date getCreatedAt() {
@@ -106,8 +96,7 @@ public class FirstAidRecord implements Serializable {
         sb.append(", firstAidId=").append(firstAidId);
         sb.append(", type=").append(type);
         sb.append(", value=").append(value);
-        sb.append(", begintime=").append(begintime);
-        sb.append(", endtime=").append(endtime);
+        sb.append(", beginTime=").append(beginTime);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/FirstAidRecordExample.java

@@ -355,123 +355,63 @@ public class FirstAidRecordExample {
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeIsNull() {
-            addCriterion("beginTime is null");
+        public Criteria andBeginTimeIsNull() {
+            addCriterion("begin_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeIsNotNull() {
-            addCriterion("beginTime is not null");
+        public Criteria andBeginTimeIsNotNull() {
+            addCriterion("begin_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeEqualTo(Long value) {
-            addCriterion("beginTime =", value, "begintime");
+        public Criteria andBeginTimeEqualTo(Long value) {
+            addCriterion("begin_time =", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeNotEqualTo(Long value) {
-            addCriterion("beginTime <>", value, "begintime");
+        public Criteria andBeginTimeNotEqualTo(Long value) {
+            addCriterion("begin_time <>", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeGreaterThan(Long value) {
-            addCriterion("beginTime >", value, "begintime");
+        public Criteria andBeginTimeGreaterThan(Long value) {
+            addCriterion("begin_time >", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("beginTime >=", value, "begintime");
+        public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("begin_time >=", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeLessThan(Long value) {
-            addCriterion("beginTime <", value, "begintime");
+        public Criteria andBeginTimeLessThan(Long value) {
+            addCriterion("begin_time <", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeLessThanOrEqualTo(Long value) {
-            addCriterion("beginTime <=", value, "begintime");
+        public Criteria andBeginTimeLessThanOrEqualTo(Long value) {
+            addCriterion("begin_time <=", value, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeIn(List<Long> values) {
-            addCriterion("beginTime in", values, "begintime");
+        public Criteria andBeginTimeIn(List<Long> values) {
+            addCriterion("begin_time in", values, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeNotIn(List<Long> values) {
-            addCriterion("beginTime not in", values, "begintime");
+        public Criteria andBeginTimeNotIn(List<Long> values) {
+            addCriterion("begin_time not in", values, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeBetween(Long value1, Long value2) {
-            addCriterion("beginTime between", value1, value2, "begintime");
+        public Criteria andBeginTimeBetween(Long value1, Long value2) {
+            addCriterion("begin_time between", value1, value2, "beginTime");
             return (Criteria) this;
         }
 
-        public Criteria andBegintimeNotBetween(Long value1, Long value2) {
-            addCriterion("beginTime not between", value1, value2, "begintime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeIsNull() {
-            addCriterion("endTime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeIsNotNull() {
-            addCriterion("endTime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeEqualTo(Long value) {
-            addCriterion("endTime =", value, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeNotEqualTo(Long value) {
-            addCriterion("endTime <>", value, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeGreaterThan(Long value) {
-            addCriterion("endTime >", value, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("endTime >=", value, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeLessThan(Long value) {
-            addCriterion("endTime <", value, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeLessThanOrEqualTo(Long value) {
-            addCriterion("endTime <=", value, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeIn(List<Long> values) {
-            addCriterion("endTime in", values, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeNotIn(List<Long> values) {
-            addCriterion("endTime not in", values, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeBetween(Long value1, Long value2) {
-            addCriterion("endTime between", value1, value2, "endtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andEndtimeNotBetween(Long value1, Long value2) {
-            addCriterion("endTime not between", value1, value2, "endtime");
+        public Criteria andBeginTimeNotBetween(Long value1, Long value2) {
+            addCriterion("begin_time not between", value1, value2, "beginTime");
             return (Criteria) this;
         }
 

wisdomcar/src/main/resources/mapper_raw/FirstAidMapper.xml

@@ -4,8 +4,9 @@
   <resultMap id="BaseResultMap" type="com.ccsens.wisdomcar.bean.po.FirstAid">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="car_id" jdbcType="BIGINT" property="carId" />
-    <result column="beginTime" jdbcType="BIGINT" property="begintime" />
-    <result column="endTime" jdbcType="BIGINT" property="endtime" />
+    <result column="hospital_id" jdbcType="BIGINT" property="hospitalId" />
+    <result column="begin_time" jdbcType="BIGINT" property="beginTime" />
+    <result column="end_time" jdbcType="BIGINT" property="endTime" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, car_id, beginTime, endTime, created_at, updated_at, rec_status
+    id, car_id, hospital_id, begin_time, end_time, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidExample" resultMap="BaseResultMap">
     select
@@ -102,12 +103,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.wisdomcar.bean.po.FirstAid">
-    insert into t_first_aid (id, car_id, beginTime, 
-      endTime, created_at, updated_at, 
-      rec_status)
-    values (#{id,jdbcType=BIGINT}, #{carId,jdbcType=BIGINT}, #{begintime,jdbcType=BIGINT}, 
-      #{endtime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT})
+    insert into t_first_aid (id, car_id, hospital_id, 
+      begin_time, end_time, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{carId,jdbcType=BIGINT}, #{hospitalId,jdbcType=BIGINT}, 
+      #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.wisdomcar.bean.po.FirstAid">
     insert into t_first_aid
@@ -118,11 +119,14 @@
       <if test="carId != null">
         car_id,
       </if>
-      <if test="begintime != null">
-        beginTime,
+      <if test="hospitalId != null">
+        hospital_id,
       </if>
-      <if test="endtime != null">
-        endTime,
+      <if test="beginTime != null">
+        begin_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
       </if>
       <if test="createdAt != null">
         created_at,
@@ -141,11 +145,14 @@
       <if test="carId != null">
         #{carId,jdbcType=BIGINT},
       </if>
-      <if test="begintime != null">
-        #{begintime,jdbcType=BIGINT},
+      <if test="hospitalId != null">
+        #{hospitalId,jdbcType=BIGINT},
+      </if>
+      <if test="beginTime != null">
+        #{beginTime,jdbcType=BIGINT},
       </if>
-      <if test="endtime != null">
-        #{endtime,jdbcType=BIGINT},
+      <if test="endTime != null">
+        #{endTime,jdbcType=BIGINT},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -173,11 +180,14 @@
       <if test="record.carId != null">
         car_id = #{record.carId,jdbcType=BIGINT},
       </if>
-      <if test="record.begintime != null">
-        beginTime = #{record.begintime,jdbcType=BIGINT},
+      <if test="record.hospitalId != null">
+        hospital_id = #{record.hospitalId,jdbcType=BIGINT},
       </if>
-      <if test="record.endtime != null">
-        endTime = #{record.endtime,jdbcType=BIGINT},
+      <if test="record.beginTime != null">
+        begin_time = #{record.beginTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=BIGINT},
       </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -197,8 +207,9 @@
     update t_first_aid
     set id = #{record.id,jdbcType=BIGINT},
       car_id = #{record.carId,jdbcType=BIGINT},
-      beginTime = #{record.begintime,jdbcType=BIGINT},
-      endTime = #{record.endtime,jdbcType=BIGINT},
+      hospital_id = #{record.hospitalId,jdbcType=BIGINT},
+      begin_time = #{record.beginTime,jdbcType=BIGINT},
+      end_time = #{record.endTime,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -212,11 +223,14 @@
       <if test="carId != null">
         car_id = #{carId,jdbcType=BIGINT},
       </if>
-      <if test="begintime != null">
-        beginTime = #{begintime,jdbcType=BIGINT},
+      <if test="hospitalId != null">
+        hospital_id = #{hospitalId,jdbcType=BIGINT},
+      </if>
+      <if test="beginTime != null">
+        begin_time = #{beginTime,jdbcType=BIGINT},
       </if>
-      <if test="endtime != null">
-        endTime = #{endtime,jdbcType=BIGINT},
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=BIGINT},
       </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -233,8 +247,9 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.wisdomcar.bean.po.FirstAid">
     update t_first_aid
     set car_id = #{carId,jdbcType=BIGINT},
-      beginTime = #{begintime,jdbcType=BIGINT},
-      endTime = #{endtime,jdbcType=BIGINT},
+      hospital_id = #{hospitalId,jdbcType=BIGINT},
+      begin_time = #{beginTime,jdbcType=BIGINT},
+      end_time = #{endTime,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

wisdomcar/src/main/resources/mapper_raw/FirstAidRecordMapper.xml

@@ -6,8 +6,7 @@
     <result column="first_aid_id" jdbcType="BIGINT" property="firstAidId" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="value" jdbcType="VARCHAR" property="value" />
-    <result column="beginTime" jdbcType="BIGINT" property="begintime" />
-    <result column="endTime" jdbcType="BIGINT" property="endtime" />
+    <result column="begin_time" jdbcType="BIGINT" property="beginTime" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -71,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, first_aid_id, type, value, beginTime, endTime, created_at, updated_at, rec_status
+    id, first_aid_id, type, value, begin_time, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidRecordExample" resultMap="BaseResultMap">
     select
@@ -105,13 +104,11 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidRecord">
     insert into t_first_aid_record (id, first_aid_id, type, 
-      value, beginTime, endTime, 
-      created_at, updated_at, rec_status
-      )
+      value, begin_time, created_at, 
+      updated_at, rec_status)
     values (#{id,jdbcType=BIGINT}, #{firstAidId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, 
-      #{value,jdbcType=VARCHAR}, #{begintime,jdbcType=BIGINT}, #{endtime,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
-      )
+      #{value,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidRecord">
     insert into t_first_aid_record
@@ -128,11 +125,8 @@
       <if test="value != null">
         value,
       </if>
-      <if test="begintime != null">
-        beginTime,
-      </if>
-      <if test="endtime != null">
-        endTime,
+      <if test="beginTime != null">
+        begin_time,
       </if>
       <if test="createdAt != null">
         created_at,
@@ -157,11 +151,8 @@
       <if test="value != null">
         #{value,jdbcType=VARCHAR},
       </if>
-      <if test="begintime != null">
-        #{begintime,jdbcType=BIGINT},
-      </if>
-      <if test="endtime != null">
-        #{endtime,jdbcType=BIGINT},
+      <if test="beginTime != null">
+        #{beginTime,jdbcType=BIGINT},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -195,11 +186,8 @@
       <if test="record.value != null">
         value = #{record.value,jdbcType=VARCHAR},
       </if>
-      <if test="record.begintime != null">
-        beginTime = #{record.begintime,jdbcType=BIGINT},
-      </if>
-      <if test="record.endtime != null">
-        endTime = #{record.endtime,jdbcType=BIGINT},
+      <if test="record.beginTime != null">
+        begin_time = #{record.beginTime,jdbcType=BIGINT},
       </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -221,8 +209,7 @@
       first_aid_id = #{record.firstAidId,jdbcType=BIGINT},
       type = #{record.type,jdbcType=TINYINT},
       value = #{record.value,jdbcType=VARCHAR},
-      beginTime = #{record.begintime,jdbcType=BIGINT},
-      endTime = #{record.endtime,jdbcType=BIGINT},
+      begin_time = #{record.beginTime,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -242,11 +229,8 @@
       <if test="value != null">
         value = #{value,jdbcType=VARCHAR},
       </if>
-      <if test="begintime != null">
-        beginTime = #{begintime,jdbcType=BIGINT},
-      </if>
-      <if test="endtime != null">
-        endTime = #{endtime,jdbcType=BIGINT},
+      <if test="beginTime != null">
+        begin_time = #{beginTime,jdbcType=BIGINT},
       </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -265,8 +249,7 @@
     set first_aid_id = #{firstAidId,jdbcType=BIGINT},
       type = #{type,jdbcType=TINYINT},
       value = #{value,jdbcType=VARCHAR},
-      beginTime = #{begintime,jdbcType=BIGINT},
-      endTime = #{endtime,jdbcType=BIGINT},
+      begin_time = #{beginTime,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}