修改宁夏项目实折线图推送数据,bug修改

src/main/java/com/gyee/frame/model/auto/Projectplan.java

@@ -64,7 +64,7 @@ public class Projectplan implements Serializable {
      *
      * @mbg.generated
      */
-    private String windpowerid;
+    private String windpower;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -226,19 +226,19 @@ public class Projectplan implements Serializable {
      *
      * @mbg.generated
      */
-    public String getWindpowerid() {
-        return windpowerid;
+    public String getWindpower() {
+        return windpower;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column projectplan.windpowerId
      *
-     * @param windpowerid the value for projectplan.windpowerId
+     * @param windpower the value for projectplan.windpowerId
      *
      * @mbg.generated
      */
-    public void setWindpowerid(String windpowerid) {
-        this.windpowerid = windpowerid == null ? null : windpowerid.trim();
+    public void setWindpowerid(String windpower) {
+        this.windpower = windpower == null ? null : windpower.trim();
     }
 }

src/main/java/com/gyee/frame/model/auto/ProjectplanExample.java

@@ -604,73 +604,74 @@ public class ProjectplanExample {
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridIsNull() {
-            addCriterion("windpowerId is null");
+        public Criteria andWindpowerIsNull() {
+            addCriterion("windpower is null");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridIsNotNull() {
-            addCriterion("windpowerId is not null");
+        public Criteria andWindpowerIsNotNull() {
+            addCriterion("windpower is not null");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridEqualTo(String value) {
-            addCriterion("windpowerId =", value, "windpowerid");
+        public Criteria 
+        andWindpowerEqualTo(String value) {
+            addCriterion("windpower =", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotEqualTo(String value) {
-            addCriterion("windpowerId <>", value, "windpowerid");
+        public Criteria andWindpowerNotEqualTo(String value) {
+            addCriterion("windpower <>", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridGreaterThan(String value) {
-            addCriterion("windpowerId >", value, "windpowerid");
+        public Criteria andWindpowerGreaterThan(String value) {
+            addCriterion("windpower >", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridGreaterThanOrEqualTo(String value) {
-            addCriterion("windpowerId >=", value, "windpowerid");
+        public Criteria andWindpowerGreaterThanOrEqualTo(String value) {
+            addCriterion("windpower >=", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridLessThan(String value) {
-            addCriterion("windpowerId <", value, "windpowerid");
+        public Criteria andWindpowerLessThan(String value) {
+            addCriterion("windpower <", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridLessThanOrEqualTo(String value) {
-            addCriterion("windpowerId <=", value, "windpowerid");
+        public Criteria andWindpowerLessThanOrEqualTo(String value) {
+            addCriterion("windpower <=", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridLike(String value) {
-            addCriterion("windpowerId like", value, "windpowerid");
+        public Criteria andWindpowerLike(String value) {
+            addCriterion("windpower like", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotLike(String value) {
-            addCriterion("windpowerId not like", value, "windpowerid");
+        public Criteria andWindpowerNotLike(String value) {
+            addCriterion("windpower not like", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridIn(List<String> values) {
-            addCriterion("windpowerId in", values, "windpowerid");
+        public Criteria andWindpowerIn(List<String> values) {
+            addCriterion("windpower in", values, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotIn(List<String> values) {
-            addCriterion("windpowerId not in", values, "windpowerid");
+        public Criteria andWindpowerNotIn(List<String> values) {
+            addCriterion("windpower not in", values, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridBetween(String value1, String value2) {
-            addCriterion("windpowerId between", value1, value2, "windpowerid");
+        public Criteria andWindpowerBetween(String value1, String value2) {
+            addCriterion("windpower between", value1, value2, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotBetween(String value1, String value2) {
-            addCriterion("windpowerId not between", value1, value2, "windpowerid");
+        public Criteria andWindpowerNotBetween(String value1, String value2) {
+            addCriterion("windpower not between", value1, value2, "windpower");
             return (Criteria) this;
         }
     }

src/main/java/com/gyee/frame/service/ProjectplanService.java

@@ -152,7 +152,7 @@ public class ProjectplanService implements BaseService<Projectplan, ProjectplanE
 
 		}else
 		{
-			example.createCriteria().andWindpoweridEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
+			example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
 
 
 		}
@@ -181,7 +181,7 @@ public class ProjectplanService implements BaseService<Projectplan, ProjectplanE
 
 		}else
 		{
-			example.createCriteria().andWindpoweridEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthIsNull();
+			example.createCriteria().andWindpowerEqualTo(name).andYearEqualTo(String.valueOf(year)).andMonthIsNull();
 
 
 		}

src/main/java/com/gyee/frame/service/app/index/IndexDetailService.java

@@ -90,7 +90,7 @@ public class IndexDetailService extends SocketToolService{
 
             Calendar cal = Calendar.getInstance();
             //理论功率
-            WindPowerStationTestingPoint2 ycgl1 = stationPointmap.get(map).get(ycPoints[0]);
+            WindPowerStationTestingPoint2 ycgl1 = map.get(ycPoints[0]);
             Date tempdate = null;
             if (num > 0) {
                 List<PointData> datas = mongodb.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);

src/main/resources/mybatis/auto/ProjectplanMapper.xml

@@ -12,7 +12,7 @@
     <result column="outageHours" jdbcType="DOUBLE" property="outagehours" />
     <result column="year" jdbcType="VARCHAR" property="year" />
     <result column="month" jdbcType="VARCHAR" property="month" />
-    <result column="windpowerId" jdbcType="VARCHAR" property="windpowerid" />
+    <result column="windpower" jdbcType="VARCHAR" property="windpower" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -85,7 +85,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, projectId, generatingCapacity, outageHours, year, month, windpowerId
+    id, projectId, generatingCapacity, outageHours, year, month, windpower
   </sql>
   <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ProjectplanExample" resultMap="BaseResultMap">
     <!--
@@ -140,10 +140,10 @@
     -->
     insert into projectplan (id, projectId, generatingCapacity, 
       outageHours, year, month, 
-      windpowerId)
+      windpower)
     values (#{id,jdbcType=VARCHAR}, #{projectid,jdbcType=VARCHAR}, #{generatingcapacity,jdbcType=VARCHAR}, 
       #{outagehours,jdbcType=DOUBLE}, #{year,jdbcType=VARCHAR}, #{month,jdbcType=VARCHAR}, 
-      #{windpowerid,jdbcType=VARCHAR})
+      #{windpower,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Projectplan">
     <!--
@@ -170,8 +170,8 @@
       <if test="month != null">
         month,
       </if>
-      <if test="windpowerid != null">
-        windpowerId,
+      <if test="windpower != null">
+        windpower,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -193,8 +193,8 @@
       <if test="month != null">
         #{month,jdbcType=VARCHAR},
       </if>
-      <if test="windpowerid != null">
-        #{windpowerid,jdbcType=VARCHAR},
+      <if test="windpower != null">
+        #{windpower,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -233,8 +233,8 @@
       <if test="record.month != null">
         month = #{record.month,jdbcType=VARCHAR},
       </if>
-      <if test="record.windpowerid != null">
-        windpowerId = #{record.windpowerid,jdbcType=VARCHAR},
+      <if test="record.windpower != null">
+        windpower = #{record.windpower,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -253,7 +253,7 @@
       outageHours = #{record.outagehours,jdbcType=DOUBLE},
       year = #{record.year,jdbcType=VARCHAR},
       month = #{record.month,jdbcType=VARCHAR},
-      windpowerId = #{record.windpowerid,jdbcType=VARCHAR}
+      windpower = #{record.windpower,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -280,8 +280,8 @@
       <if test="month != null">
         month = #{month,jdbcType=VARCHAR},
       </if>
-      <if test="windpowerid != null">
-        windpowerId = #{windpowerid,jdbcType=VARCHAR},
+      <if test="windpower != null">
+        windpower = #{windpower,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -297,7 +297,7 @@
       outageHours = #{outagehours,jdbcType=DOUBLE},
       year = #{year,jdbcType=VARCHAR},
       month = #{month,jdbcType=VARCHAR},
-      windpowerId = #{windpowerid,jdbcType=VARCHAR}
+      windpower = #{windpower,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>