油枪信息增加油品价格

YijiaRestful/src/main/java/com/platform/yijia/dao/StationOilGunMapper.java

@@ -8,10 +8,6 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 public interface StationOilGunMapper {
-
-    //根据油站Id油枪号获取打印机编号
-    Map<String, Object> getPrinterSnByStationIdAndOilGunNo(Map<String, Object> params);
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table station_oil_gun
@@ -99,4 +95,9 @@ public interface StationOilGunMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(StationOilGun record);
-}
+
+
+    //根据油站Id油枪号获取打印机编号
+    Map<String, Object> getPrinterSnByStationIdAndOilGunNo(Map<String, Object> params);
+
+}

YijiaRestful/src/main/java/com/platform/yijia/pojo/StationOilGun.java

@@ -1,5 +1,6 @@
 package com.platform.yijia.pojo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class StationOilGun {
@@ -33,6 +34,15 @@ public class StationOilGun {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column station_oil_gun.oil_price
+     *
+     * @mbg.generated
+     */
+    private BigDecimal oilPrice;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column station_oil_gun.station_id
      *
      * @mbg.generated
@@ -58,6 +68,15 @@ public class StationOilGun {
     private Date date;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column station_oil_gun.status
+     *
+     * @mbg.generated
+     */
+    private String status;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column station_oil_gun.oil_gun_id
      *
@@ -131,6 +150,30 @@ public class StationOilGun {
 
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column station_oil_gun.oil_price
+     *
+     * @return the value of station_oil_gun.oil_price
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getOilPrice() {
+        return oilPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column station_oil_gun.oil_price
+     *
+     * @param oilPrice the value for station_oil_gun.oil_price
+     *
+     * @mbg.generated
+     */
+    public void setOilPrice(BigDecimal oilPrice) {
+        this.oilPrice = oilPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column station_oil_gun.station_id
      *
      * @return the value of station_oil_gun.station_id
@@ -200,4 +243,28 @@ public class StationOilGun {
     public void setDate(Date date) {
         this.date = date;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column station_oil_gun.status
+     *
+     * @return the value of station_oil_gun.status
+     *
+     * @mbg.generated
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column station_oil_gun.status
+     *
+     * @param status the value for station_oil_gun.status
+     *
+     * @mbg.generated
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
 }

YijiaRestful/src/main/java/com/platform/yijia/pojo/StationOilGunExample.java

@@ -1,5 +1,6 @@
 package com.platform.yijia.pojo;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -395,6 +396,66 @@ public class StationOilGunExample {
             return (Criteria) this;
         }
 
+        public Criteria andOilPriceIsNull() {
+            addCriterion("oil_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceIsNotNull() {
+            addCriterion("oil_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceEqualTo(BigDecimal value) {
+            addCriterion("oil_price =", value, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceNotEqualTo(BigDecimal value) {
+            addCriterion("oil_price <>", value, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceGreaterThan(BigDecimal value) {
+            addCriterion("oil_price >", value, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("oil_price >=", value, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceLessThan(BigDecimal value) {
+            addCriterion("oil_price <", value, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("oil_price <=", value, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceIn(List<BigDecimal> values) {
+            addCriterion("oil_price in", values, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceNotIn(List<BigDecimal> values) {
+            addCriterion("oil_price not in", values, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("oil_price between", value1, value2, "oilPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOilPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("oil_price not between", value1, value2, "oilPrice");
+            return (Criteria) this;
+        }
+
         public Criteria andStationIdIsNull() {
             addCriterion("station_id is null");
             return (Criteria) this;
@@ -584,6 +645,76 @@ public class StationOilGunExample {
             addCriterion("date not between", value1, value2, "date");
             return (Criteria) this;
         }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
     }
 
     /**

YijiaRestful/src/main/resources/generator/generatorConfig.xml

@@ -45,7 +45,7 @@
             <property name="enableSubPackages" value="false" />
         </javaClientGenerator>
 
-        <table tableName="station_info" domainObjectName="StationInfo" >
+        <table tableName="station_oil_gun" domainObjectName="StationOilGun" >
         </table>
 
     </context>

YijiaRestful/src/main/resources/mapper/StationOilGunMapper.xml

@@ -9,9 +9,11 @@
     <id column="oil_gun_id" jdbcType="INTEGER" property="oilGunId" />
     <result column="oil_gun_no" jdbcType="VARCHAR" property="oilGunNo" />
     <result column="oil_name" jdbcType="VARCHAR" property="oilName" />
+    <result column="oil_price" jdbcType="DECIMAL" property="oilPrice" />
     <result column="station_id" jdbcType="INTEGER" property="stationId" />
     <result column="station_name" jdbcType="VARCHAR" property="stationName" />
     <result column="date" jdbcType="TIMESTAMP" property="date" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -84,7 +86,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    oil_gun_id, oil_gun_no, oil_name, station_id, station_name, date
+    oil_gun_id, oil_gun_no, oil_name, oil_price, station_id, station_name, date, status
   </sql>
   <select id="selectByExample" parameterType="com.platform.yijia.pojo.StationOilGunExample" resultMap="BaseResultMap">
     <!--
@@ -109,7 +111,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select
+    select 
     <include refid="Base_Column_List" />
     from station_oil_gun
     where oil_gun_id = #{oilGunId,jdbcType=INTEGER}
@@ -137,12 +139,12 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into station_oil_gun (oil_gun_id, oil_gun_no, oil_name,
-      station_id, station_name, date
-      )
-    values (#{oilGunId,jdbcType=INTEGER}, #{oilGunNo,jdbcType=VARCHAR}, #{oilName,jdbcType=VARCHAR},
-      #{stationId,jdbcType=INTEGER}, #{stationName,jdbcType=VARCHAR}, #{date,jdbcType=TIMESTAMP}
-      )
+    insert into station_oil_gun (oil_gun_id, oil_gun_no, oil_name, 
+      oil_price, station_id, station_name, 
+      date, status)
+    values (#{oilGunId,jdbcType=INTEGER}, #{oilGunNo,jdbcType=VARCHAR}, #{oilName,jdbcType=VARCHAR}, 
+      #{oilPrice,jdbcType=DECIMAL}, #{stationId,jdbcType=INTEGER}, #{stationName,jdbcType=VARCHAR}, 
+      #{date,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.platform.yijia.pojo.StationOilGun">
     <!--
@@ -160,6 +162,9 @@
       <if test="oilName != null">
         oil_name,
       </if>
+      <if test="oilPrice != null">
+        oil_price,
+      </if>
       <if test="stationId != null">
         station_id,
       </if>
@@ -169,6 +174,9 @@
       <if test="date != null">
         date,
       </if>
+      <if test="status != null">
+        status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="oilGunId != null">
@@ -180,6 +188,9 @@
       <if test="oilName != null">
         #{oilName,jdbcType=VARCHAR},
       </if>
+      <if test="oilPrice != null">
+        #{oilPrice,jdbcType=DECIMAL},
+      </if>
       <if test="stationId != null">
         #{stationId,jdbcType=INTEGER},
       </if>
@@ -189,6 +200,9 @@
       <if test="date != null">
         #{date,jdbcType=TIMESTAMP},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.platform.yijia.pojo.StationOilGunExample" resultType="java.lang.Long">
@@ -217,6 +231,9 @@
       <if test="record.oilName != null">
         oil_name = #{record.oilName,jdbcType=VARCHAR},
       </if>
+      <if test="record.oilPrice != null">
+        oil_price = #{record.oilPrice,jdbcType=DECIMAL},
+      </if>
       <if test="record.stationId != null">
         station_id = #{record.stationId,jdbcType=INTEGER},
       </if>
@@ -226,6 +243,9 @@
       <if test="record.date != null">
         date = #{record.date,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -240,9 +260,11 @@
     set oil_gun_id = #{record.oilGunId,jdbcType=INTEGER},
       oil_gun_no = #{record.oilGunNo,jdbcType=VARCHAR},
       oil_name = #{record.oilName,jdbcType=VARCHAR},
+      oil_price = #{record.oilPrice,jdbcType=DECIMAL},
       station_id = #{record.stationId,jdbcType=INTEGER},
       station_name = #{record.stationName,jdbcType=VARCHAR},
-      date = #{record.date,jdbcType=TIMESTAMP}
+      date = #{record.date,jdbcType=TIMESTAMP},
+      status = #{record.status,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -260,6 +282,9 @@
       <if test="oilName != null">
         oil_name = #{oilName,jdbcType=VARCHAR},
       </if>
+      <if test="oilPrice != null">
+        oil_price = #{oilPrice,jdbcType=DECIMAL},
+      </if>
       <if test="stationId != null">
         station_id = #{stationId,jdbcType=INTEGER},
       </if>
@@ -269,6 +294,9 @@
       <if test="date != null">
         date = #{date,jdbcType=TIMESTAMP},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
     </set>
     where oil_gun_id = #{oilGunId,jdbcType=INTEGER}
   </update>
@@ -280,9 +308,11 @@
     update station_oil_gun
     set oil_gun_no = #{oilGunNo,jdbcType=VARCHAR},
       oil_name = #{oilName,jdbcType=VARCHAR},
+      oil_price = #{oilPrice,jdbcType=DECIMAL},
       station_id = #{stationId,jdbcType=INTEGER},
       station_name = #{stationName,jdbcType=VARCHAR},
-      date = #{date,jdbcType=TIMESTAMP}
+      date = #{date,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=VARCHAR}
     where oil_gun_id = #{oilGunId,jdbcType=INTEGER}
   </update>
 
@@ -304,4 +334,4 @@
 
   </select>
 
-</mapper>
+</mapper>