20201214急救记录

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

@@ -10,9 +10,9 @@ public class FirstAidStandard implements Serializable {
 
     private Long hospitalId;
 
-    private Byte step;
+    private Long stepId;
 
-    private String duration;
+    private Long duration;
 
     private Date createdAt;
 
@@ -46,20 +46,20 @@ public class FirstAidStandard implements Serializable {
         this.hospitalId = hospitalId;
     }
 
-    public Byte getStep() {
+    public Long getStepId() {
-        return step;
+        return stepId;
     }
 
-    public void setStep(Byte step) {
+    public void setStepId(Long stepId) {
-        this.step = step;
+        this.stepId = stepId;
     }
 
-    public String getDuration() {
+    public Long getDuration() {
         return duration;
     }
 
-    public void setDuration(String duration) {
+    public void setDuration(Long duration) {
-        this.duration = duration == null ? null : duration.trim();
+        this.duration = duration;
     }
 
     public Date getCreatedAt() {
@@ -95,7 +95,7 @@ public class FirstAidStandard implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", type=").append(type);
         sb.append(", hospitalId=").append(hospitalId);
-        sb.append(", step=").append(step);
+        sb.append(", stepId=").append(stepId);
         sb.append(", duration=").append(duration);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);

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

@@ -285,63 +285,63 @@ public class FirstAidStandardExample {
             return (Criteria) this;
         }
 
-        public Criteria andStepIsNull() {
+        public Criteria andStepIdIsNull() {
-            addCriterion("step is null");
+            addCriterion("step_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andStepIsNotNull() {
+        public Criteria andStepIdIsNotNull() {
-            addCriterion("step is not null");
+            addCriterion("step_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStepEqualTo(Byte value) {
+        public Criteria andStepIdEqualTo(Long value) {
-            addCriterion("step =", value, "step");
+            addCriterion("step_id =", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotEqualTo(Byte value) {
+        public Criteria andStepIdNotEqualTo(Long value) {
-            addCriterion("step <>", value, "step");
+            addCriterion("step_id <>", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepGreaterThan(Byte value) {
+        public Criteria andStepIdGreaterThan(Long value) {
-            addCriterion("step >", value, "step");
+            addCriterion("step_id >", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepGreaterThanOrEqualTo(Byte value) {
+        public Criteria andStepIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("step >=", value, "step");
+            addCriterion("step_id >=", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepLessThan(Byte value) {
+        public Criteria andStepIdLessThan(Long value) {
-            addCriterion("step <", value, "step");
+            addCriterion("step_id <", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepLessThanOrEqualTo(Byte value) {
+        public Criteria andStepIdLessThanOrEqualTo(Long value) {
-            addCriterion("step <=", value, "step");
+            addCriterion("step_id <=", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepIn(List<Byte> values) {
+        public Criteria andStepIdIn(List<Long> values) {
-            addCriterion("step in", values, "step");
+            addCriterion("step_id in", values, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotIn(List<Byte> values) {
+        public Criteria andStepIdNotIn(List<Long> values) {
-            addCriterion("step not in", values, "step");
+            addCriterion("step_id not in", values, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepBetween(Byte value1, Byte value2) {
+        public Criteria andStepIdBetween(Long value1, Long value2) {
-            addCriterion("step between", value1, value2, "step");
+            addCriterion("step_id between", value1, value2, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotBetween(Byte value1, Byte value2) {
+        public Criteria andStepIdNotBetween(Long value1, Long value2) {
-            addCriterion("step not between", value1, value2, "step");
+            addCriterion("step_id not between", value1, value2, "stepId");
             return (Criteria) this;
         }
 
@@ -355,62 +355,52 @@ public class FirstAidStandardExample {
             return (Criteria) this;
         }
 
-        public Criteria andDurationEqualTo(String value) {
+        public Criteria andDurationEqualTo(Long value) {
             addCriterion("duration =", value, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationNotEqualTo(String value) {
+        public Criteria andDurationNotEqualTo(Long value) {
             addCriterion("duration <>", value, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationGreaterThan(String value) {
+        public Criteria andDurationGreaterThan(Long value) {
             addCriterion("duration >", value, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationGreaterThanOrEqualTo(String value) {
+        public Criteria andDurationGreaterThanOrEqualTo(Long value) {
             addCriterion("duration >=", value, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationLessThan(String value) {
+        public Criteria andDurationLessThan(Long value) {
             addCriterion("duration <", value, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationLessThanOrEqualTo(String value) {
+        public Criteria andDurationLessThanOrEqualTo(Long value) {
             addCriterion("duration <=", value, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationLike(String value) {
+        public Criteria andDurationIn(List<Long> values) {
-            addCriterion("duration like", value, "duration");
-            return (Criteria) this;
-        }
-
-        public Criteria andDurationNotLike(String value) {
-            addCriterion("duration not like", value, "duration");
-            return (Criteria) this;
-        }
-
-        public Criteria andDurationIn(List<String> values) {
             addCriterion("duration in", values, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationNotIn(List<String> values) {
+        public Criteria andDurationNotIn(List<Long> values) {
             addCriterion("duration not in", values, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationBetween(String value1, String value2) {
+        public Criteria andDurationBetween(Long value1, Long value2) {
             addCriterion("duration between", value1, value2, "duration");
             return (Criteria) this;
         }
 
-        public Criteria andDurationNotBetween(String value1, String value2) {
+        public Criteria andDurationNotBetween(Long value1, Long value2) {
             addCriterion("duration not between", value1, value2, "duration");
             return (Criteria) this;
         }

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

@@ -12,7 +12,7 @@ public class Rfid implements Serializable {
 
     private String name;
 
-    private Byte step;
+    private Long stepId;
 
     private Long hospitalId;
 
@@ -56,12 +56,12 @@ public class Rfid implements Serializable {
         this.name = name == null ? null : name.trim();
     }
 
-    public Byte getStep() {
+    public Long getStepId() {
-        return step;
+        return stepId;
     }
 
-    public void setStep(Byte step) {
+    public void setStepId(Long stepId) {
-        this.step = step;
+        this.stepId = stepId;
     }
 
     public Long getHospitalId() {
@@ -106,7 +106,7 @@ public class Rfid implements Serializable {
         sb.append(", rfid=").append(rfid);
         sb.append(", type=").append(type);
         sb.append(", name=").append(name);
-        sb.append(", step=").append(step);
+        sb.append(", stepId=").append(stepId);
         sb.append(", hospitalId=").append(hospitalId);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);

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

@@ -365,63 +365,63 @@ public class RfidExample {
             return (Criteria) this;
         }
 
-        public Criteria andStepIsNull() {
+        public Criteria andStepIdIsNull() {
-            addCriterion("step is null");
+            addCriterion("step_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andStepIsNotNull() {
+        public Criteria andStepIdIsNotNull() {
-            addCriterion("step is not null");
+            addCriterion("step_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStepEqualTo(Byte value) {
+        public Criteria andStepIdEqualTo(Long value) {
-            addCriterion("step =", value, "step");
+            addCriterion("step_id =", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotEqualTo(Byte value) {
+        public Criteria andStepIdNotEqualTo(Long value) {
-            addCriterion("step <>", value, "step");
+            addCriterion("step_id <>", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepGreaterThan(Byte value) {
+        public Criteria andStepIdGreaterThan(Long value) {
-            addCriterion("step >", value, "step");
+            addCriterion("step_id >", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepGreaterThanOrEqualTo(Byte value) {
+        public Criteria andStepIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("step >=", value, "step");
+            addCriterion("step_id >=", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepLessThan(Byte value) {
+        public Criteria andStepIdLessThan(Long value) {
-            addCriterion("step <", value, "step");
+            addCriterion("step_id <", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepLessThanOrEqualTo(Byte value) {
+        public Criteria andStepIdLessThanOrEqualTo(Long value) {
-            addCriterion("step <=", value, "step");
+            addCriterion("step_id <=", value, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepIn(List<Byte> values) {
+        public Criteria andStepIdIn(List<Long> values) {
-            addCriterion("step in", values, "step");
+            addCriterion("step_id in", values, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotIn(List<Byte> values) {
+        public Criteria andStepIdNotIn(List<Long> values) {
-            addCriterion("step not in", values, "step");
+            addCriterion("step_id not in", values, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepBetween(Byte value1, Byte value2) {
+        public Criteria andStepIdBetween(Long value1, Long value2) {
-            addCriterion("step between", value1, value2, "step");
+            addCriterion("step_id between", value1, value2, "stepId");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotBetween(Byte value1, Byte value2) {
+        public Criteria andStepIdNotBetween(Long value1, Long value2) {
-            addCriterion("step not between", value1, value2, "step");
+            addCriterion("step_id not between", value1, value2, "stepId");
             return (Criteria) this;
         }
 

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

@@ -10,6 +10,10 @@ public class Screen implements Serializable {
 
     private Long hospitalId;
 
+    private Byte showType;
+
+    private Long userId;
+
     private Date createdAt;
 
     private Date updatedAt;
@@ -42,6 +46,22 @@ public class Screen implements Serializable {
         this.hospitalId = hospitalId;
     }
 
+    public Byte getShowType() {
+        return showType;
+    }
+
+    public void setShowType(Byte showType) {
+        this.showType = showType;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -75,6 +95,8 @@ public class Screen implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", name=").append(name);
         sb.append(", hospitalId=").append(hospitalId);
+        sb.append(", showType=").append(showType);
+        sb.append(", userId=").append(userId);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

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

@@ -295,6 +295,126 @@ public class ScreenExample {
             return (Criteria) this;
         }
 
+        public Criteria andShowTypeIsNull() {
+            addCriterion("show_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeIsNotNull() {
+            addCriterion("show_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeEqualTo(Byte value) {
+            addCriterion("show_type =", value, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeNotEqualTo(Byte value) {
+            addCriterion("show_type <>", value, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeGreaterThan(Byte value) {
+            addCriterion("show_type >", value, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("show_type >=", value, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeLessThan(Byte value) {
+            addCriterion("show_type <", value, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("show_type <=", value, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeIn(List<Byte> values) {
+            addCriterion("show_type in", values, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeNotIn(List<Byte> values) {
+            addCriterion("show_type not in", values, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeBetween(Byte value1, Byte value2) {
+            addCriterion("show_type between", value1, value2, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("show_type not between", value1, value2, "showType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedAtIsNull() {
             addCriterion("created_at is null");
             return (Criteria) this;

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

@@ -0,0 +1,95 @@
+package com.ccsens.wisdomcar.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Step implements Serializable {
+    private Long id;
+
+    private String name;
+
+    private String code;
+
+    private Integer sequence;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public Integer getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", code=").append(code);
+        sb.append(", sequence=").append(sequence);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,641 @@
+package com.ccsens.wisdomcar.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StepExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public StepExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceIsNull() {
+            addCriterion("sequence is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceIsNotNull() {
+            addCriterion("sequence is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceEqualTo(Integer value) {
+            addCriterion("sequence =", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotEqualTo(Integer value) {
+            addCriterion("sequence <>", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceGreaterThan(Integer value) {
+            addCriterion("sequence >", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sequence >=", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceLessThan(Integer value) {
+            addCriterion("sequence <", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceLessThanOrEqualTo(Integer value) {
+            addCriterion("sequence <=", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceIn(List<Integer> values) {
+            addCriterion("sequence in", values, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotIn(List<Integer> values) {
+            addCriterion("sequence not in", values, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceBetween(Integer value1, Integer value2) {
+            addCriterion("sequence between", value1, value2, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotBetween(Integer value1, Integer value2) {
+            addCriterion("sequence not between", value1, value2, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/Message/CarRecordMessageVo.java

@@ -17,7 +17,7 @@ public class CarRecordMessageVo  extends BaseMessageDto {
          */
         private String carNumber;
         /**
-         * 类型 0：开始 1：体重 2：剂量 3：rfid
+         * 类型 0开始 1体重 2rfid, 3称重一 4称重二 5称重三 6称重四 7震动 8剂量,
          */
         private int type;
         /**

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/mapper/StepMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.wisdomcar.persist.mapper;
+
+import com.ccsens.wisdomcar.bean.po.Step;
+import com.ccsens.wisdomcar.bean.po.StepExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StepMapper {
+    long countByExample(StepExample example);
+
+    int deleteByExample(StepExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Step record);
+
+    int insertSelective(Step record);
+
+    List<Step> selectByExample(StepExample example);
+
+    Step selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Step record, @Param("example") StepExample example);
+
+    int updateByExample(@Param("record") Step record, @Param("example") StepExample example);
+
+    int updateByPrimaryKeySelective(Step record);
+
+    int updateByPrimaryKey(Step record);
+}

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java

@@ -78,20 +78,34 @@ public class RecordService implements IRecordService{
         InMessage inMessage = InMessage.newToUserMessage(null,userIdSet,null,messageRule,s);
         //发送消息
         messageService.sendToCarRecord(inMessage);
+        //TODO 如果是称重信息，制造测试数据发送大屏
 
+        //新建急救表存储信息
+        saveAidRecord(carRecordMessageDto, wisdomCar.getId());
+    }
 
+    private void saveAidRecord(CarRecordMessageDto carRecordMessageDto, Long wisdomCarId) {
         // 如果是开始信息，新建一条急救表数据( TODO redis)
         if(carRecordMessageDto.getType() == 0){
+            //TODO 结束该平车的上一个急救信息
+            FirstAidExample firstAidExample = new FirstAidExample();
+            firstAidExample.createCriteria().andCarIdEqualTo(wisdomCarId).andBegintimeNotEqualTo(0L).andEndtimeEqualTo(0L);
+            List<FirstAid> firstAidList = firstAidMapper.selectByExample(firstAidExample);
+//            if(CollectionUtil.isNotEmpty())
+            //新建急救信息
             FirstAid firstAid = new FirstAid();
             firstAid.setId(snowflake.nextId());
-            firstAid.setCarId(wisdomCar.getId());
+            firstAid.setCarId(wisdomCarId);
             firstAid.setBegintime(carRecordMessageDto.getTime());
+            //存入数据库
             firstAidMapper.insertSelective(firstAid);
+            //存入redis
+            String key = "";
         }else {
             // 否则去添加急救流程信息(TODO redis)
             //急救表id 通过平车id查找
             FirstAidExample firstAidExample = new FirstAidExample();
-            firstAidExample.createCriteria().andCarIdEqualTo(wisdomCar.getId());
+            firstAidExample.createCriteria().andCarIdEqualTo(wisdomCarId);
             List<FirstAid> firstAids = firstAidMapper.selectByExample(firstAidExample);
             if(CollectionUtil.isNotEmpty(firstAids)){
                 FirstAid firstAid = firstAids.get(0);

wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java

@@ -0,0 +1,14 @@
+package com.ccsens.wisdomcar.util;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2020/8/13 17:14
+ */
+public class Constant {
+    /**
+     * 急救信息
+     */
+    public static final long SINGLE_ROLL_30_S = 2011;
+
+}

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

@@ -5,8 +5,8 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="hospital_id" jdbcType="BIGINT" property="hospitalId" />
-    <result column="step" jdbcType="TINYINT" property="step" />
+    <result column="step_id" jdbcType="BIGINT" property="stepId" />
-    <result column="duration" jdbcType="VARCHAR" property="duration" />
+    <result column="duration" jdbcType="BIGINT" property="duration" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -70,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, type, hospital_id, step, duration, created_at, updated_at, rec_status
+    id, type, hospital_id, step_id, duration, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidStandardExample" resultMap="BaseResultMap">
     select
@@ -104,10 +104,10 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidStandard">
     insert into t_first_aid_standard (id, type, hospital_id, 
-      step, duration, created_at, 
+      step_id, duration, created_at, 
       updated_at, rec_status)
     values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{hospitalId,jdbcType=BIGINT}, 
-      #{step,jdbcType=TINYINT}, #{duration,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{stepId,jdbcType=BIGINT}, #{duration,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
       #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.wisdomcar.bean.po.FirstAidStandard">
@@ -122,8 +122,8 @@
       <if test="hospitalId != null">
         hospital_id,
       </if>
-      <if test="step != null">
+      <if test="stepId != null">
-        step,
+        step_id,
       </if>
       <if test="duration != null">
         duration,
@@ -148,11 +148,11 @@
       <if test="hospitalId != null">
         #{hospitalId,jdbcType=BIGINT},
       </if>
-      <if test="step != null">
+      <if test="stepId != null">
-        #{step,jdbcType=TINYINT},
+        #{stepId,jdbcType=BIGINT},
       </if>
       <if test="duration != null">
-        #{duration,jdbcType=VARCHAR},
+        #{duration,jdbcType=BIGINT},
       </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
@@ -183,11 +183,11 @@
       <if test="record.hospitalId != null">
         hospital_id = #{record.hospitalId,jdbcType=BIGINT},
       </if>
-      <if test="record.step != null">
+      <if test="record.stepId != null">
-        step = #{record.step,jdbcType=TINYINT},
+        step_id = #{record.stepId,jdbcType=BIGINT},
       </if>
       <if test="record.duration != null">
-        duration = #{record.duration,jdbcType=VARCHAR},
+        duration = #{record.duration,jdbcType=BIGINT},
       </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -208,8 +208,8 @@
     set id = #{record.id,jdbcType=BIGINT},
       type = #{record.type,jdbcType=TINYINT},
       hospital_id = #{record.hospitalId,jdbcType=BIGINT},
-      step = #{record.step,jdbcType=TINYINT},
+      step_id = #{record.stepId,jdbcType=BIGINT},
-      duration = #{record.duration,jdbcType=VARCHAR},
+      duration = #{record.duration,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -226,11 +226,11 @@
       <if test="hospitalId != null">
         hospital_id = #{hospitalId,jdbcType=BIGINT},
       </if>
-      <if test="step != null">
+      <if test="stepId != null">
-        step = #{step,jdbcType=TINYINT},
+        step_id = #{stepId,jdbcType=BIGINT},
       </if>
       <if test="duration != null">
-        duration = #{duration,jdbcType=VARCHAR},
+        duration = #{duration,jdbcType=BIGINT},
       </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -248,8 +248,8 @@
     update t_first_aid_standard
     set type = #{type,jdbcType=TINYINT},
       hospital_id = #{hospitalId,jdbcType=BIGINT},
-      step = #{step,jdbcType=TINYINT},
+      step_id = #{stepId,jdbcType=BIGINT},
-      duration = #{duration,jdbcType=VARCHAR},
+      duration = #{duration,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

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

@@ -6,7 +6,7 @@
     <result column="rfid" jdbcType="VARCHAR" property="rfid" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="step" jdbcType="TINYINT" property="step" />
+    <result column="step_id" jdbcType="BIGINT" property="stepId" />
     <result column="hospital_id" jdbcType="BIGINT" property="hospitalId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -71,7 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, rfid, type, name, step, hospital_id, created_at, updated_at, rec_status
+    id, rfid, type, name, step_id, hospital_id, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.wisdomcar.bean.po.RfidExample" resultMap="BaseResultMap">
     select
@@ -105,11 +105,11 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.wisdomcar.bean.po.Rfid">
     insert into t_rfid (id, rfid, type, 
-      name, step, hospital_id, 
+      name, step_id, hospital_id, 
       created_at, updated_at, rec_status
       )
     values (#{id,jdbcType=BIGINT}, #{rfid,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, 
-      #{name,jdbcType=VARCHAR}, #{step,jdbcType=TINYINT}, #{hospitalId,jdbcType=BIGINT}, 
+      #{name,jdbcType=VARCHAR}, #{stepId,jdbcType=BIGINT}, #{hospitalId,jdbcType=BIGINT}, 
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
       )
   </insert>
@@ -128,8 +128,8 @@
       <if test="name != null">
         name,
       </if>
-      <if test="step != null">
+      <if test="stepId != null">
-        step,
+        step_id,
       </if>
       <if test="hospitalId != null">
         hospital_id,
@@ -157,8 +157,8 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="step != null">
+      <if test="stepId != null">
-        #{step,jdbcType=TINYINT},
+        #{stepId,jdbcType=BIGINT},
       </if>
       <if test="hospitalId != null">
         #{hospitalId,jdbcType=BIGINT},
@@ -195,8 +195,8 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.step != null">
+      <if test="record.stepId != null">
-        step = #{record.step,jdbcType=TINYINT},
+        step_id = #{record.stepId,jdbcType=BIGINT},
       </if>
       <if test="record.hospitalId != null">
         hospital_id = #{record.hospitalId,jdbcType=BIGINT},
@@ -221,7 +221,7 @@
       rfid = #{record.rfid,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=TINYINT},
       name = #{record.name,jdbcType=VARCHAR},
-      step = #{record.step,jdbcType=TINYINT},
+      step_id = #{record.stepId,jdbcType=BIGINT},
       hospital_id = #{record.hospitalId,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -242,8 +242,8 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="step != null">
+      <if test="stepId != null">
-        step = #{step,jdbcType=TINYINT},
+        step_id = #{stepId,jdbcType=BIGINT},
       </if>
       <if test="hospitalId != null">
         hospital_id = #{hospitalId,jdbcType=BIGINT},
@@ -265,7 +265,7 @@
     set rfid = #{rfid,jdbcType=VARCHAR},
       type = #{type,jdbcType=TINYINT},
       name = #{name,jdbcType=VARCHAR},
-      step = #{step,jdbcType=TINYINT},
+      step_id = #{stepId,jdbcType=BIGINT},
       hospital_id = #{hospitalId,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},

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

@@ -5,6 +5,8 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="hospital_id" jdbcType="BIGINT" property="hospitalId" />
+    <result column="show_type" jdbcType="TINYINT" property="showType" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -68,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, hospital_id, created_at, updated_at, rec_status
+    id, name, hospital_id, show_type, user_id, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.wisdomcar.bean.po.ScreenExample" resultMap="BaseResultMap">
     select
@@ -102,11 +104,11 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.wisdomcar.bean.po.Screen">
     insert into t_screen (id, name, hospital_id, 
-      created_at, updated_at, rec_status
+      show_type, user_id, created_at, 
-      )
+      updated_at, rec_status)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{hospitalId,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      #{showType,jdbcType=TINYINT}, #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
-      )
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.wisdomcar.bean.po.Screen">
     insert into t_screen
@@ -120,6 +122,12 @@
       <if test="hospitalId != null">
         hospital_id,
       </if>
+      <if test="showType != null">
+        show_type,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="createdAt != null">
         created_at,
       </if>
@@ -140,6 +148,12 @@
       <if test="hospitalId != null">
         #{hospitalId,jdbcType=BIGINT},
       </if>
+      <if test="showType != null">
+        #{showType,jdbcType=TINYINT},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -169,6 +183,12 @@
       <if test="record.hospitalId != null">
         hospital_id = #{record.hospitalId,jdbcType=BIGINT},
       </if>
+      <if test="record.showType != null">
+        show_type = #{record.showType,jdbcType=TINYINT},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -188,6 +208,8 @@
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
       hospital_id = #{record.hospitalId,jdbcType=BIGINT},
+      show_type = #{record.showType,jdbcType=TINYINT},
+      user_id = #{record.userId,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -204,6 +226,12 @@
       <if test="hospitalId != null">
         hospital_id = #{hospitalId,jdbcType=BIGINT},
       </if>
+      <if test="showType != null">
+        show_type = #{showType,jdbcType=TINYINT},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -220,6 +248,8 @@
     update t_screen
     set name = #{name,jdbcType=VARCHAR},
       hospital_id = #{hospitalId,jdbcType=BIGINT},
+      show_type = #{showType,jdbcType=TINYINT},
+      user_id = #{userId,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

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

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.wisdomcar.persist.mapper.StepMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.wisdomcar.bean.po.Step">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="sequence" jdbcType="INTEGER" property="sequence" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, name, code, sequence, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.wisdomcar.bean.po.StepExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_step
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_step
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_step
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.wisdomcar.bean.po.StepExample">
+    delete from t_step
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.wisdomcar.bean.po.Step">
+    insert into t_step (id, name, code, 
+      sequence, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
+      #{sequence,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.wisdomcar.bean.po.Step">
+    insert into t_step
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="sequence != null">
+        sequence,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="sequence != null">
+        #{sequence,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.wisdomcar.bean.po.StepExample" resultType="java.lang.Long">
+    select count(*) from t_step
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_step
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sequence != null">
+        sequence = #{record.sequence,jdbcType=INTEGER},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_step
+    set id = #{record.id,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      sequence = #{record.sequence,jdbcType=INTEGER},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.wisdomcar.bean.po.Step">
+    update t_step
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="sequence != null">
+        sequence = #{sequence,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.wisdomcar.bean.po.Step">
+    update t_step
+    set name = #{name,jdbcType=VARCHAR},
+      code = #{code,jdbcType=VARCHAR},
+      sequence = #{sequence,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>