fix: 修改short成int类型

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java

@@ -37,7 +37,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    private Short funcCode;
+    private Integer funcCode;
 
     /**
      *
@@ -46,7 +46,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    private Short maxpullPull;
+    private Integer maxpullPull;
 
     /**
      *
@@ -73,7 +73,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    private Short minpullPull;
+    private Integer minpullPull;
 
     /**
      *
@@ -100,7 +100,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    private Short maxwindPull;
+    private Integer maxwindPull;
 
     /**
      *
@@ -127,7 +127,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    private Short minwindPull;
+    private Integer minwindPull;
 
     /**
      *
@@ -254,7 +254,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public Short getFuncCode() {
+    public Integer getFuncCode() {
         return funcCode;
     }
 
@@ -266,7 +266,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public void setFuncCode(Short funcCode) {
+    public void setFuncCode(Integer funcCode) {
         this.funcCode = funcCode;
     }
 
@@ -278,7 +278,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public Short getMaxpullPull() {
+    public Integer getMaxpullPull() {
         return maxpullPull;
     }
 
@@ -290,7 +290,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public void setMaxpullPull(Short maxpullPull) {
+    public void setMaxpullPull(Integer maxpullPull) {
         this.maxpullPull = maxpullPull;
     }
 
@@ -350,7 +350,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public Short getMinpullPull() {
+    public Integer getMinpullPull() {
         return minpullPull;
     }
 
@@ -362,7 +362,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public void setMinpullPull(Short minpullPull) {
+    public void setMinpullPull(Integer minpullPull) {
         this.minpullPull = minpullPull;
     }
 
@@ -422,7 +422,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public Short getMaxwindPull() {
+    public Integer getMaxwindPull() {
         return maxwindPull;
     }
 
@@ -434,7 +434,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public void setMaxwindPull(Short maxwindPull) {
+    public void setMaxwindPull(Integer maxwindPull) {
         this.maxwindPull = maxwindPull;
     }
 
@@ -494,7 +494,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public Short getMinwindPull() {
+    public Integer getMinwindPull() {
         return minwindPull;
     }
 
@@ -506,7 +506,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
-    public void setMinwindPull(Short minwindPull) {
+    public void setMinwindPull(Integer minwindPull) {
         this.minwindPull = minwindPull;
     }
 

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPullsExample.java

@@ -385,52 +385,52 @@ public class LeadPullsExample {
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeEqualTo(Short value) {
+        public Criteria andFuncCodeEqualTo(Integer value) {
             addCriterion("func_code =", value, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeNotEqualTo(Short value) {
+        public Criteria andFuncCodeNotEqualTo(Integer value) {
             addCriterion("func_code <>", value, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeGreaterThan(Short value) {
+        public Criteria andFuncCodeGreaterThan(Integer value) {
             addCriterion("func_code >", value, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeGreaterThanOrEqualTo(Short value) {
+        public Criteria andFuncCodeGreaterThanOrEqualTo(Integer value) {
             addCriterion("func_code >=", value, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeLessThan(Short value) {
+        public Criteria andFuncCodeLessThan(Integer value) {
             addCriterion("func_code <", value, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeLessThanOrEqualTo(Short value) {
+        public Criteria andFuncCodeLessThanOrEqualTo(Integer value) {
             addCriterion("func_code <=", value, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeIn(List<Short> values) {
+        public Criteria andFuncCodeIn(List<Integer> values) {
             addCriterion("func_code in", values, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeNotIn(List<Short> values) {
+        public Criteria andFuncCodeNotIn(List<Integer> values) {
             addCriterion("func_code not in", values, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeBetween(Short value1, Short value2) {
+        public Criteria andFuncCodeBetween(Integer value1, Integer value2) {
             addCriterion("func_code between", value1, value2, "funcCode");
             return (Criteria) this;
         }
 
-        public Criteria andFuncCodeNotBetween(Short value1, Short value2) {
+        public Criteria andFuncCodeNotBetween(Integer value1, Integer value2) {
             addCriterion("func_code not between", value1, value2, "funcCode");
             return (Criteria) this;
         }
@@ -445,52 +445,52 @@ public class LeadPullsExample {
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullEqualTo(Short value) {
+        public Criteria andMaxpullPullEqualTo(Integer value) {
             addCriterion("maxpull_pull =", value, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullNotEqualTo(Short value) {
+        public Criteria andMaxpullPullNotEqualTo(Integer value) {
             addCriterion("maxpull_pull <>", value, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullGreaterThan(Short value) {
+        public Criteria andMaxpullPullGreaterThan(Integer value) {
             addCriterion("maxpull_pull >", value, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullGreaterThanOrEqualTo(Short value) {
+        public Criteria andMaxpullPullGreaterThanOrEqualTo(Integer value) {
             addCriterion("maxpull_pull >=", value, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullLessThan(Short value) {
+        public Criteria andMaxpullPullLessThan(Integer value) {
             addCriterion("maxpull_pull <", value, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullLessThanOrEqualTo(Short value) {
+        public Criteria andMaxpullPullLessThanOrEqualTo(Integer value) {
             addCriterion("maxpull_pull <=", value, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullIn(List<Short> values) {
+        public Criteria andMaxpullPullIn(List<Integer> values) {
             addCriterion("maxpull_pull in", values, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullNotIn(List<Short> values) {
+        public Criteria andMaxpullPullNotIn(List<Integer> values) {
             addCriterion("maxpull_pull not in", values, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullBetween(Short value1, Short value2) {
+        public Criteria andMaxpullPullBetween(Integer value1, Integer value2) {
             addCriterion("maxpull_pull between", value1, value2, "maxpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxpullPullNotBetween(Short value1, Short value2) {
+        public Criteria andMaxpullPullNotBetween(Integer value1, Integer value2) {
             addCriterion("maxpull_pull not between", value1, value2, "maxpullPull");
             return (Criteria) this;
         }
@@ -625,52 +625,52 @@ public class LeadPullsExample {
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullEqualTo(Short value) {
+        public Criteria andMinpullPullEqualTo(Integer value) {
             addCriterion("minpull_pull =", value, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullNotEqualTo(Short value) {
+        public Criteria andMinpullPullNotEqualTo(Integer value) {
             addCriterion("minpull_pull <>", value, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullGreaterThan(Short value) {
+        public Criteria andMinpullPullGreaterThan(Integer value) {
             addCriterion("minpull_pull >", value, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullGreaterThanOrEqualTo(Short value) {
+        public Criteria andMinpullPullGreaterThanOrEqualTo(Integer value) {
             addCriterion("minpull_pull >=", value, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullLessThan(Short value) {
+        public Criteria andMinpullPullLessThan(Integer value) {
             addCriterion("minpull_pull <", value, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullLessThanOrEqualTo(Short value) {
+        public Criteria andMinpullPullLessThanOrEqualTo(Integer value) {
             addCriterion("minpull_pull <=", value, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullIn(List<Short> values) {
+        public Criteria andMinpullPullIn(List<Integer> values) {
             addCriterion("minpull_pull in", values, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullNotIn(List<Short> values) {
+        public Criteria andMinpullPullNotIn(List<Integer> values) {
             addCriterion("minpull_pull not in", values, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullBetween(Short value1, Short value2) {
+        public Criteria andMinpullPullBetween(Integer value1, Integer value2) {
             addCriterion("minpull_pull between", value1, value2, "minpullPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinpullPullNotBetween(Short value1, Short value2) {
+        public Criteria andMinpullPullNotBetween(Integer value1, Integer value2) {
             addCriterion("minpull_pull not between", value1, value2, "minpullPull");
             return (Criteria) this;
         }
@@ -805,52 +805,52 @@ public class LeadPullsExample {
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullEqualTo(Short value) {
+        public Criteria andMaxwindPullEqualTo(Integer value) {
             addCriterion("maxwind_pull =", value, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullNotEqualTo(Short value) {
+        public Criteria andMaxwindPullNotEqualTo(Integer value) {
             addCriterion("maxwind_pull <>", value, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullGreaterThan(Short value) {
+        public Criteria andMaxwindPullGreaterThan(Integer value) {
             addCriterion("maxwind_pull >", value, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullGreaterThanOrEqualTo(Short value) {
+        public Criteria andMaxwindPullGreaterThanOrEqualTo(Integer value) {
             addCriterion("maxwind_pull >=", value, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullLessThan(Short value) {
+        public Criteria andMaxwindPullLessThan(Integer value) {
             addCriterion("maxwind_pull <", value, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullLessThanOrEqualTo(Short value) {
+        public Criteria andMaxwindPullLessThanOrEqualTo(Integer value) {
             addCriterion("maxwind_pull <=", value, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullIn(List<Short> values) {
+        public Criteria andMaxwindPullIn(List<Integer> values) {
             addCriterion("maxwind_pull in", values, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullNotIn(List<Short> values) {
+        public Criteria andMaxwindPullNotIn(List<Integer> values) {
             addCriterion("maxwind_pull not in", values, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullBetween(Short value1, Short value2) {
+        public Criteria andMaxwindPullBetween(Integer value1, Integer value2) {
             addCriterion("maxwind_pull between", value1, value2, "maxwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMaxwindPullNotBetween(Short value1, Short value2) {
+        public Criteria andMaxwindPullNotBetween(Integer value1, Integer value2) {
             addCriterion("maxwind_pull not between", value1, value2, "maxwindPull");
             return (Criteria) this;
         }
@@ -985,52 +985,52 @@ public class LeadPullsExample {
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullEqualTo(Short value) {
+        public Criteria andMinwindPullEqualTo(Integer value) {
             addCriterion("minwind_pull =", value, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullNotEqualTo(Short value) {
+        public Criteria andMinwindPullNotEqualTo(Integer value) {
             addCriterion("minwind_pull <>", value, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullGreaterThan(Short value) {
+        public Criteria andMinwindPullGreaterThan(Integer value) {
             addCriterion("minwind_pull >", value, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullGreaterThanOrEqualTo(Short value) {
+        public Criteria andMinwindPullGreaterThanOrEqualTo(Integer value) {
             addCriterion("minwind_pull >=", value, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullLessThan(Short value) {
+        public Criteria andMinwindPullLessThan(Integer value) {
             addCriterion("minwind_pull <", value, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullLessThanOrEqualTo(Short value) {
+        public Criteria andMinwindPullLessThanOrEqualTo(Integer value) {
             addCriterion("minwind_pull <=", value, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullIn(List<Short> values) {
+        public Criteria andMinwindPullIn(List<Integer> values) {
             addCriterion("minwind_pull in", values, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullNotIn(List<Short> values) {
+        public Criteria andMinwindPullNotIn(List<Integer> values) {
             addCriterion("minwind_pull not in", values, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullBetween(Short value1, Short value2) {
+        public Criteria andMinwindPullBetween(Integer value1, Integer value2) {
             addCriterion("minwind_pull between", value1, value2, "minwindPull");
             return (Criteria) this;
         }
 
-        public Criteria andMinwindPullNotBetween(Short value1, Short value2) {
+        public Criteria andMinwindPullNotBetween(Integer value1, Integer value2) {
             addCriterion("minwind_pull not between", value1, value2, "minwindPull");
             return (Criteria) this;
         }

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Weathers.java

@@ -53,7 +53,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    private Short avgWindDir10min;
+    private Integer avgWindDir10min;
 
     /**
      *
@@ -125,7 +125,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    private Short humidity;
+    private Integer humidity;
 
     /**
      *
@@ -161,7 +161,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    private Short radiationIntensity;
+    private Integer radiationIntensity;
 
     /**
      * This method was generated by MyBatis Generator.
@@ -291,7 +291,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    public Short getAvgWindDir10min() {
+    public Integer getAvgWindDir10min() {
         return avgWindDir10min;
     }
 
@@ -303,7 +303,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    public void setAvgWindDir10min(Short avgWindDir10min) {
+    public void setAvgWindDir10min(Integer avgWindDir10min) {
         this.avgWindDir10min = avgWindDir10min;
     }
 
@@ -483,7 +483,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    public Short getHumidity() {
+    public Integer getHumidity() {
         return humidity;
     }
 
@@ -495,7 +495,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    public void setHumidity(Short humidity) {
+    public void setHumidity(Integer humidity) {
         this.humidity = humidity;
     }
 
@@ -579,7 +579,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    public Short getRadiationIntensity() {
+    public Integer getRadiationIntensity() {
         return radiationIntensity;
     }
 
@@ -591,7 +591,7 @@ public class Weathers {
      *
      * @mbg.generated
      */
-    public void setRadiationIntensity(Short radiationIntensity) {
+    public void setRadiationIntensity(Integer radiationIntensity) {
         this.radiationIntensity = radiationIntensity;
     }
 

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/WeathersExample.java

@@ -514,52 +514,52 @@ public class WeathersExample {
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minEqualTo(Short value) {
+        public Criteria andAvgWindDir10minEqualTo(Integer value) {
             addCriterion("avg_wind_dir_10min =", value, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minNotEqualTo(Short value) {
+        public Criteria andAvgWindDir10minNotEqualTo(Integer value) {
             addCriterion("avg_wind_dir_10min <>", value, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minGreaterThan(Short value) {
+        public Criteria andAvgWindDir10minGreaterThan(Integer value) {
             addCriterion("avg_wind_dir_10min >", value, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minGreaterThanOrEqualTo(Short value) {
+        public Criteria andAvgWindDir10minGreaterThanOrEqualTo(Integer value) {
             addCriterion("avg_wind_dir_10min >=", value, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minLessThan(Short value) {
+        public Criteria andAvgWindDir10minLessThan(Integer value) {
             addCriterion("avg_wind_dir_10min <", value, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minLessThanOrEqualTo(Short value) {
+        public Criteria andAvgWindDir10minLessThanOrEqualTo(Integer value) {
             addCriterion("avg_wind_dir_10min <=", value, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minIn(List<Short> values) {
+        public Criteria andAvgWindDir10minIn(List<Integer> values) {
             addCriterion("avg_wind_dir_10min in", values, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minNotIn(List<Short> values) {
+        public Criteria andAvgWindDir10minNotIn(List<Integer> values) {
             addCriterion("avg_wind_dir_10min not in", values, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minBetween(Short value1, Short value2) {
+        public Criteria andAvgWindDir10minBetween(Integer value1, Integer value2) {
             addCriterion("avg_wind_dir_10min between", value1, value2, "avgWindDir10min");
             return (Criteria) this;
         }
 
-        public Criteria andAvgWindDir10minNotBetween(Short value1, Short value2) {
+        public Criteria andAvgWindDir10minNotBetween(Integer value1, Integer value2) {
             addCriterion("avg_wind_dir_10min not between", value1, value2, "avgWindDir10min");
             return (Criteria) this;
         }
@@ -994,52 +994,52 @@ public class WeathersExample {
             return (Criteria) this;
         }
 
-        public Criteria andHumidityEqualTo(Short value) {
+        public Criteria andHumidityEqualTo(Integer value) {
             addCriterion("humidity =", value, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityNotEqualTo(Short value) {
+        public Criteria andHumidityNotEqualTo(Integer value) {
             addCriterion("humidity <>", value, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityGreaterThan(Short value) {
+        public Criteria andHumidityGreaterThan(Integer value) {
             addCriterion("humidity >", value, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityGreaterThanOrEqualTo(Short value) {
+        public Criteria andHumidityGreaterThanOrEqualTo(Integer value) {
             addCriterion("humidity >=", value, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityLessThan(Short value) {
+        public Criteria andHumidityLessThan(Integer value) {
             addCriterion("humidity <", value, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityLessThanOrEqualTo(Short value) {
+        public Criteria andHumidityLessThanOrEqualTo(Integer value) {
             addCriterion("humidity <=", value, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityIn(List<Short> values) {
+        public Criteria andHumidityIn(List<Integer> values) {
             addCriterion("humidity in", values, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityNotIn(List<Short> values) {
+        public Criteria andHumidityNotIn(List<Integer> values) {
             addCriterion("humidity not in", values, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityBetween(Short value1, Short value2) {
+        public Criteria andHumidityBetween(Integer value1, Integer value2) {
             addCriterion("humidity between", value1, value2, "humidity");
             return (Criteria) this;
         }
 
-        public Criteria andHumidityNotBetween(Short value1, Short value2) {
+        public Criteria andHumidityNotBetween(Integer value1, Integer value2) {
             addCriterion("humidity not between", value1, value2, "humidity");
             return (Criteria) this;
         }
@@ -1234,52 +1234,52 @@ public class WeathersExample {
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityEqualTo(Short value) {
+        public Criteria andRadiationIntensityEqualTo(Integer value) {
             addCriterion("radiation_Intensity =", value, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityNotEqualTo(Short value) {
+        public Criteria andRadiationIntensityNotEqualTo(Integer value) {
             addCriterion("radiation_Intensity <>", value, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityGreaterThan(Short value) {
+        public Criteria andRadiationIntensityGreaterThan(Integer value) {
             addCriterion("radiation_Intensity >", value, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityGreaterThanOrEqualTo(Short value) {
+        public Criteria andRadiationIntensityGreaterThanOrEqualTo(Integer value) {
             addCriterion("radiation_Intensity >=", value, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityLessThan(Short value) {
+        public Criteria andRadiationIntensityLessThan(Integer value) {
             addCriterion("radiation_Intensity <", value, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityLessThanOrEqualTo(Short value) {
+        public Criteria andRadiationIntensityLessThanOrEqualTo(Integer value) {
             addCriterion("radiation_Intensity <=", value, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityIn(List<Short> values) {
+        public Criteria andRadiationIntensityIn(List<Integer> values) {
             addCriterion("radiation_Intensity in", values, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityNotIn(List<Short> values) {
+        public Criteria andRadiationIntensityNotIn(List<Integer> values) {
             addCriterion("radiation_Intensity not in", values, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityBetween(Short value1, Short value2) {
+        public Criteria andRadiationIntensityBetween(Integer value1, Integer value2) {
             addCriterion("radiation_Intensity between", value1, value2, "radiationIntensity");
             return (Criteria) this;
         }
 
-        public Criteria andRadiationIntensityNotBetween(Short value1, Short value2) {
+        public Criteria andRadiationIntensityNotBetween(Integer value1, Integer value2) {
             addCriterion("radiation_Intensity not between", value1, value2, "radiationIntensity");
             return (Criteria) this;
         }

xymanager_dao/src/main/resources/mappers/LeadPullsMapper.xml

@@ -9,17 +9,17 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="term_id" jdbcType="INTEGER" property="termId" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-    <result column="func_code" jdbcType="SMALLINT" property="funcCode" />
-    <result column="maxpull_pull" jdbcType="SMALLINT" property="maxpullPull" />
+    <result column="func_code" jdbcType="INTEGER" property="funcCode" />
+    <result column="maxpull_pull" jdbcType="INTEGER" property="maxpullPull" />
     <result column="maxpull_wind" jdbcType="REAL" property="maxpullWind" />
     <result column="maxpull_tilt" jdbcType="REAL" property="maxpullTilt" />
-    <result column="minpull_pull" jdbcType="SMALLINT" property="minpullPull" />
+    <result column="minpull_pull" jdbcType="INTEGER" property="minpullPull" />
     <result column="minpull_wind" jdbcType="REAL" property="minpullWind" />
     <result column="minpull_tilt" jdbcType="REAL" property="minpullTilt" />
-    <result column="maxwind_pull" jdbcType="SMALLINT" property="maxwindPull" />
+    <result column="maxwind_pull" jdbcType="INTEGER" property="maxwindPull" />
     <result column="maxwind_wind" jdbcType="REAL" property="maxwindWind" />
     <result column="maxwind_tilt" jdbcType="REAL" property="maxwindTilt" />
-    <result column="minwind_pull" jdbcType="SMALLINT" property="minwindPull" />
+    <result column="minwind_pull" jdbcType="INTEGER" property="minwindPull" />
     <result column="minwind_wind" jdbcType="REAL" property="minwindWind" />
     <result column="minwind_tilt" jdbcType="REAL" property="minwindTilt" />
     <result column="wid" jdbcType="BIGINT" property="wid" />
@@ -162,11 +162,11 @@
       minwind_pull, minwind_wind, minwind_tilt, 
       wid, wind_speed, create_time
       )
-    values (#{termId,jdbcType=INTEGER}, #{updateTime,jdbcType=BIGINT}, #{funcCode,jdbcType=SMALLINT}, 
-      #{maxpullPull,jdbcType=SMALLINT}, #{maxpullWind,jdbcType=REAL}, #{maxpullTilt,jdbcType=REAL}, 
-      #{minpullPull,jdbcType=SMALLINT}, #{minpullWind,jdbcType=REAL}, #{minpullTilt,jdbcType=REAL}, 
-      #{maxwindPull,jdbcType=SMALLINT}, #{maxwindWind,jdbcType=REAL}, #{maxwindTilt,jdbcType=REAL}, 
-      #{minwindPull,jdbcType=SMALLINT}, #{minwindWind,jdbcType=REAL}, #{minwindTilt,jdbcType=REAL}, 
+    values (#{termId,jdbcType=INTEGER}, #{updateTime,jdbcType=BIGINT}, #{funcCode,jdbcType=INTEGER}, 
+      #{maxpullPull,jdbcType=INTEGER}, #{maxpullWind,jdbcType=REAL}, #{maxpullTilt,jdbcType=REAL}, 
+      #{minpullPull,jdbcType=INTEGER}, #{minpullWind,jdbcType=REAL}, #{minpullTilt,jdbcType=REAL}, 
+      #{maxwindPull,jdbcType=INTEGER}, #{maxwindWind,jdbcType=REAL}, #{maxwindTilt,jdbcType=REAL}, 
+      #{minwindPull,jdbcType=INTEGER}, #{minwindWind,jdbcType=REAL}, #{minwindTilt,jdbcType=REAL}, 
       #{wid,jdbcType=BIGINT}, #{windSpeed,jdbcType=REAL}, #{createTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -243,10 +243,10 @@
         #{updateTime,jdbcType=BIGINT},
       </if>
       <if test="funcCode != null">
-        #{funcCode,jdbcType=SMALLINT},
+        #{funcCode,jdbcType=INTEGER},
       </if>
       <if test="maxpullPull != null">
-        #{maxpullPull,jdbcType=SMALLINT},
+        #{maxpullPull,jdbcType=INTEGER},
       </if>
       <if test="maxpullWind != null">
         #{maxpullWind,jdbcType=REAL},
@@ -255,7 +255,7 @@
         #{maxpullTilt,jdbcType=REAL},
       </if>
       <if test="minpullPull != null">
-        #{minpullPull,jdbcType=SMALLINT},
+        #{minpullPull,jdbcType=INTEGER},
       </if>
       <if test="minpullWind != null">
         #{minpullWind,jdbcType=REAL},
@@ -264,7 +264,7 @@
         #{minpullTilt,jdbcType=REAL},
       </if>
       <if test="maxwindPull != null">
-        #{maxwindPull,jdbcType=SMALLINT},
+        #{maxwindPull,jdbcType=INTEGER},
       </if>
       <if test="maxwindWind != null">
         #{maxwindWind,jdbcType=REAL},
@@ -273,7 +273,7 @@
         #{maxwindTilt,jdbcType=REAL},
       </if>
       <if test="minwindPull != null">
-        #{minwindPull,jdbcType=SMALLINT},
+        #{minwindPull,jdbcType=INTEGER},
       </if>
       <if test="minwindWind != null">
         #{minwindWind,jdbcType=REAL},
@@ -319,10 +319,10 @@
         update_time = #{row.updateTime,jdbcType=BIGINT},
       </if>
       <if test="row.funcCode != null">
-        func_code = #{row.funcCode,jdbcType=SMALLINT},
+        func_code = #{row.funcCode,jdbcType=INTEGER},
       </if>
       <if test="row.maxpullPull != null">
-        maxpull_pull = #{row.maxpullPull,jdbcType=SMALLINT},
+        maxpull_pull = #{row.maxpullPull,jdbcType=INTEGER},
       </if>
       <if test="row.maxpullWind != null">
         maxpull_wind = #{row.maxpullWind,jdbcType=REAL},
@@ -331,7 +331,7 @@
         maxpull_tilt = #{row.maxpullTilt,jdbcType=REAL},
       </if>
       <if test="row.minpullPull != null">
-        minpull_pull = #{row.minpullPull,jdbcType=SMALLINT},
+        minpull_pull = #{row.minpullPull,jdbcType=INTEGER},
       </if>
       <if test="row.minpullWind != null">
         minpull_wind = #{row.minpullWind,jdbcType=REAL},
@@ -340,7 +340,7 @@
         minpull_tilt = #{row.minpullTilt,jdbcType=REAL},
       </if>
       <if test="row.maxwindPull != null">
-        maxwind_pull = #{row.maxwindPull,jdbcType=SMALLINT},
+        maxwind_pull = #{row.maxwindPull,jdbcType=INTEGER},
       </if>
       <if test="row.maxwindWind != null">
         maxwind_wind = #{row.maxwindWind,jdbcType=REAL},
@@ -349,7 +349,7 @@
         maxwind_tilt = #{row.maxwindTilt,jdbcType=REAL},
       </if>
       <if test="row.minwindPull != null">
-        minwind_pull = #{row.minwindPull,jdbcType=SMALLINT},
+        minwind_pull = #{row.minwindPull,jdbcType=INTEGER},
       </if>
       <if test="row.minwindWind != null">
         minwind_wind = #{row.minwindWind,jdbcType=REAL},
@@ -380,17 +380,17 @@
     set id = #{row.id,jdbcType=BIGINT},
       term_id = #{row.termId,jdbcType=INTEGER},
       update_time = #{row.updateTime,jdbcType=BIGINT},
-      func_code = #{row.funcCode,jdbcType=SMALLINT},
-      maxpull_pull = #{row.maxpullPull,jdbcType=SMALLINT},
+      func_code = #{row.funcCode,jdbcType=INTEGER},
+      maxpull_pull = #{row.maxpullPull,jdbcType=INTEGER},
       maxpull_wind = #{row.maxpullWind,jdbcType=REAL},
       maxpull_tilt = #{row.maxpullTilt,jdbcType=REAL},
-      minpull_pull = #{row.minpullPull,jdbcType=SMALLINT},
+      minpull_pull = #{row.minpullPull,jdbcType=INTEGER},
       minpull_wind = #{row.minpullWind,jdbcType=REAL},
       minpull_tilt = #{row.minpullTilt,jdbcType=REAL},
-      maxwind_pull = #{row.maxwindPull,jdbcType=SMALLINT},
+      maxwind_pull = #{row.maxwindPull,jdbcType=INTEGER},
       maxwind_wind = #{row.maxwindWind,jdbcType=REAL},
       maxwind_tilt = #{row.maxwindTilt,jdbcType=REAL},
-      minwind_pull = #{row.minwindPull,jdbcType=SMALLINT},
+      minwind_pull = #{row.minwindPull,jdbcType=INTEGER},
       minwind_wind = #{row.minwindWind,jdbcType=REAL},
       minwind_tilt = #{row.minwindTilt,jdbcType=REAL},
       wid = #{row.wid,jdbcType=BIGINT},
@@ -414,10 +414,10 @@
         update_time = #{updateTime,jdbcType=BIGINT},
       </if>
       <if test="funcCode != null">
-        func_code = #{funcCode,jdbcType=SMALLINT},
+        func_code = #{funcCode,jdbcType=INTEGER},
       </if>
       <if test="maxpullPull != null">
-        maxpull_pull = #{maxpullPull,jdbcType=SMALLINT},
+        maxpull_pull = #{maxpullPull,jdbcType=INTEGER},
       </if>
       <if test="maxpullWind != null">
         maxpull_wind = #{maxpullWind,jdbcType=REAL},
@@ -426,7 +426,7 @@
         maxpull_tilt = #{maxpullTilt,jdbcType=REAL},
       </if>
       <if test="minpullPull != null">
-        minpull_pull = #{minpullPull,jdbcType=SMALLINT},
+        minpull_pull = #{minpullPull,jdbcType=INTEGER},
       </if>
       <if test="minpullWind != null">
         minpull_wind = #{minpullWind,jdbcType=REAL},
@@ -435,7 +435,7 @@
         minpull_tilt = #{minpullTilt,jdbcType=REAL},
       </if>
       <if test="maxwindPull != null">
-        maxwind_pull = #{maxwindPull,jdbcType=SMALLINT},
+        maxwind_pull = #{maxwindPull,jdbcType=INTEGER},
       </if>
       <if test="maxwindWind != null">
         maxwind_wind = #{maxwindWind,jdbcType=REAL},
@@ -444,7 +444,7 @@
         maxwind_tilt = #{maxwindTilt,jdbcType=REAL},
       </if>
       <if test="minwindPull != null">
-        minwind_pull = #{minwindPull,jdbcType=SMALLINT},
+        minwind_pull = #{minwindPull,jdbcType=INTEGER},
       </if>
       <if test="minwindWind != null">
         minwind_wind = #{minwindWind,jdbcType=REAL},
@@ -472,17 +472,17 @@
     update lead_pulls
     set term_id = #{termId,jdbcType=INTEGER},
       update_time = #{updateTime,jdbcType=BIGINT},
-      func_code = #{funcCode,jdbcType=SMALLINT},
-      maxpull_pull = #{maxpullPull,jdbcType=SMALLINT},
+      func_code = #{funcCode,jdbcType=INTEGER},
+      maxpull_pull = #{maxpullPull,jdbcType=INTEGER},
       maxpull_wind = #{maxpullWind,jdbcType=REAL},
       maxpull_tilt = #{maxpullTilt,jdbcType=REAL},
-      minpull_pull = #{minpullPull,jdbcType=SMALLINT},
+      minpull_pull = #{minpullPull,jdbcType=INTEGER},
       minpull_wind = #{minpullWind,jdbcType=REAL},
       minpull_tilt = #{minpullTilt,jdbcType=REAL},
-      maxwind_pull = #{maxwindPull,jdbcType=SMALLINT},
+      maxwind_pull = #{maxwindPull,jdbcType=INTEGER},
       maxwind_wind = #{maxwindWind,jdbcType=REAL},
       maxwind_tilt = #{maxwindTilt,jdbcType=REAL},
-      minwind_pull = #{minwindPull,jdbcType=SMALLINT},
+      minwind_pull = #{minwindPull,jdbcType=INTEGER},
       minwind_wind = #{minwindWind,jdbcType=REAL},
       minwind_tilt = #{minwindTilt,jdbcType=REAL},
       wid = #{wid,jdbcType=BIGINT},

xymanager_dao/src/main/resources/mappers/WeathersMapper.xml

@@ -11,7 +11,7 @@
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="comp_id" jdbcType="VARCHAR" property="compId" />
     <result column="avg_wind_speed_10min" jdbcType="REAL" property="avgWindSpeed10min" />
-    <result column="avg_wind_dir_10min" jdbcType="SMALLINT" property="avgWindDir10min" />
+    <result column="avg_wind_dir_10min" jdbcType="INTEGER" property="avgWindDir10min" />
     <result column="avg_wind_speed_1min" jdbcType="REAL" property="avgWindSpeed1min" />
     <result column="avg_wind_dir_1min" jdbcType="REAL" property="avgWindDir1min" />
     <result column="max_wind_speed" jdbcType="REAL" property="maxWindSpeed" />
@@ -19,11 +19,11 @@
     <result column="standard_wind_speed" jdbcType="REAL" property="standardWindSpeed" />
     <result column="wind_direction" jdbcType="REAL" property="windDirection" />
     <result column="air_temperature" jdbcType="REAL" property="airTemperature" />
-    <result column="humidity" jdbcType="SMALLINT" property="humidity" />
+    <result column="humidity" jdbcType="INTEGER" property="humidity" />
     <result column="air_pressure" jdbcType="REAL" property="airPressure" />
     <result column="precipitation" jdbcType="REAL" property="precipitation" />
     <result column="precipitation_Intensity" jdbcType="REAL" property="precipitationIntensity" />
-    <result column="radiation_Intensity" jdbcType="SMALLINT" property="radiationIntensity" />
+    <result column="radiation_Intensity" jdbcType="INTEGER" property="radiationIntensity" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -163,11 +163,11 @@
       precipitation_Intensity, radiation_Intensity
       )
     values (#{termId,jdbcType=INTEGER}, #{updateTime,jdbcType=BIGINT}, #{compId,jdbcType=VARCHAR}, 
-      #{avgWindSpeed10min,jdbcType=REAL}, #{avgWindDir10min,jdbcType=SMALLINT}, #{avgWindSpeed1min,jdbcType=REAL}, 
+      #{avgWindSpeed10min,jdbcType=REAL}, #{avgWindDir10min,jdbcType=INTEGER}, #{avgWindSpeed1min,jdbcType=REAL}, 
       #{avgWindDir1min,jdbcType=REAL}, #{maxWindSpeed,jdbcType=REAL}, #{extremeWindSpeed,jdbcType=REAL}, 
       #{standardWindSpeed,jdbcType=REAL}, #{windDirection,jdbcType=REAL}, #{airTemperature,jdbcType=REAL}, 
-      #{humidity,jdbcType=SMALLINT}, #{airPressure,jdbcType=REAL}, #{precipitation,jdbcType=REAL}, 
-      #{precipitationIntensity,jdbcType=REAL}, #{radiationIntensity,jdbcType=SMALLINT}
+      #{humidity,jdbcType=INTEGER}, #{airPressure,jdbcType=REAL}, #{precipitation,jdbcType=REAL}, 
+      #{precipitationIntensity,jdbcType=REAL}, #{radiationIntensity,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.Weathers">
@@ -246,7 +246,7 @@
         #{avgWindSpeed10min,jdbcType=REAL},
       </if>
       <if test="avgWindDir10min != null">
-        #{avgWindDir10min,jdbcType=SMALLINT},
+        #{avgWindDir10min,jdbcType=INTEGER},
       </if>
       <if test="avgWindSpeed1min != null">
         #{avgWindSpeed1min,jdbcType=REAL},
@@ -270,7 +270,7 @@
         #{airTemperature,jdbcType=REAL},
       </if>
       <if test="humidity != null">
-        #{humidity,jdbcType=SMALLINT},
+        #{humidity,jdbcType=INTEGER},
       </if>
       <if test="airPressure != null">
         #{airPressure,jdbcType=REAL},
@@ -282,7 +282,7 @@
         #{precipitationIntensity,jdbcType=REAL},
       </if>
       <if test="radiationIntensity != null">
-        #{radiationIntensity,jdbcType=SMALLINT},
+        #{radiationIntensity,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -319,7 +319,7 @@
         avg_wind_speed_10min = #{row.avgWindSpeed10min,jdbcType=REAL},
       </if>
       <if test="row.avgWindDir10min != null">
-        avg_wind_dir_10min = #{row.avgWindDir10min,jdbcType=SMALLINT},
+        avg_wind_dir_10min = #{row.avgWindDir10min,jdbcType=INTEGER},
       </if>
       <if test="row.avgWindSpeed1min != null">
         avg_wind_speed_1min = #{row.avgWindSpeed1min,jdbcType=REAL},
@@ -343,7 +343,7 @@
         air_temperature = #{row.airTemperature,jdbcType=REAL},
       </if>
       <if test="row.humidity != null">
-        humidity = #{row.humidity,jdbcType=SMALLINT},
+        humidity = #{row.humidity,jdbcType=INTEGER},
       </if>
       <if test="row.airPressure != null">
         air_pressure = #{row.airPressure,jdbcType=REAL},
@@ -355,7 +355,7 @@
         precipitation_Intensity = #{row.precipitationIntensity,jdbcType=REAL},
       </if>
       <if test="row.radiationIntensity != null">
-        radiation_Intensity = #{row.radiationIntensity,jdbcType=SMALLINT},
+        radiation_Intensity = #{row.radiationIntensity,jdbcType=INTEGER},
       </if>
     </set>
     <if test="example != null">
@@ -373,7 +373,7 @@
       update_time = #{row.updateTime,jdbcType=BIGINT},
       comp_id = #{row.compId,jdbcType=VARCHAR},
       avg_wind_speed_10min = #{row.avgWindSpeed10min,jdbcType=REAL},
-      avg_wind_dir_10min = #{row.avgWindDir10min,jdbcType=SMALLINT},
+      avg_wind_dir_10min = #{row.avgWindDir10min,jdbcType=INTEGER},
       avg_wind_speed_1min = #{row.avgWindSpeed1min,jdbcType=REAL},
       avg_wind_dir_1min = #{row.avgWindDir1min,jdbcType=REAL},
       max_wind_speed = #{row.maxWindSpeed,jdbcType=REAL},
@@ -381,11 +381,11 @@
       standard_wind_speed = #{row.standardWindSpeed,jdbcType=REAL},
       wind_direction = #{row.windDirection,jdbcType=REAL},
       air_temperature = #{row.airTemperature,jdbcType=REAL},
-      humidity = #{row.humidity,jdbcType=SMALLINT},
+      humidity = #{row.humidity,jdbcType=INTEGER},
       air_pressure = #{row.airPressure,jdbcType=REAL},
       precipitation = #{row.precipitation,jdbcType=REAL},
       precipitation_Intensity = #{row.precipitationIntensity,jdbcType=REAL},
-      radiation_Intensity = #{row.radiationIntensity,jdbcType=SMALLINT}
+      radiation_Intensity = #{row.radiationIntensity,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -410,7 +410,7 @@
         avg_wind_speed_10min = #{avgWindSpeed10min,jdbcType=REAL},
       </if>
       <if test="avgWindDir10min != null">
-        avg_wind_dir_10min = #{avgWindDir10min,jdbcType=SMALLINT},
+        avg_wind_dir_10min = #{avgWindDir10min,jdbcType=INTEGER},
       </if>
       <if test="avgWindSpeed1min != null">
         avg_wind_speed_1min = #{avgWindSpeed1min,jdbcType=REAL},
@@ -434,7 +434,7 @@
         air_temperature = #{airTemperature,jdbcType=REAL},
       </if>
       <if test="humidity != null">
-        humidity = #{humidity,jdbcType=SMALLINT},
+        humidity = #{humidity,jdbcType=INTEGER},
       </if>
       <if test="airPressure != null">
         air_pressure = #{airPressure,jdbcType=REAL},
@@ -446,7 +446,7 @@
         precipitation_Intensity = #{precipitationIntensity,jdbcType=REAL},
       </if>
       <if test="radiationIntensity != null">
-        radiation_Intensity = #{radiationIntensity,jdbcType=SMALLINT},
+        radiation_Intensity = #{radiationIntensity,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -461,7 +461,7 @@
       update_time = #{updateTime,jdbcType=BIGINT},
       comp_id = #{compId,jdbcType=VARCHAR},
       avg_wind_speed_10min = #{avgWindSpeed10min,jdbcType=REAL},
-      avg_wind_dir_10min = #{avgWindDir10min,jdbcType=SMALLINT},
+      avg_wind_dir_10min = #{avgWindDir10min,jdbcType=INTEGER},
       avg_wind_speed_1min = #{avgWindSpeed1min,jdbcType=REAL},
       avg_wind_dir_1min = #{avgWindDir1min,jdbcType=REAL},
       max_wind_speed = #{maxWindSpeed,jdbcType=REAL},
@@ -469,11 +469,11 @@
       standard_wind_speed = #{standardWindSpeed,jdbcType=REAL},
       wind_direction = #{windDirection,jdbcType=REAL},
       air_temperature = #{airTemperature,jdbcType=REAL},
-      humidity = #{humidity,jdbcType=SMALLINT},
+      humidity = #{humidity,jdbcType=INTEGER},
       air_pressure = #{airPressure,jdbcType=REAL},
       precipitation = #{precipitation,jdbcType=REAL},
       precipitation_Intensity = #{precipitationIntensity,jdbcType=REAL},
-      radiation_Intensity = #{radiationIntensity,jdbcType=SMALLINT}
+      radiation_Intensity = #{radiationIntensity,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java

@@ -29,16 +29,6 @@ public class LeadPullsServiceImpl implements LeadPullsService {
     @Override
     public PageInfo<LeadPulls> list(Integer lineId, Integer towerId, Integer termId,
                                     Long start, Long end, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        LeadPullsExample example = new LeadPullsExample();
-        LeadPullsExample.Criteria criteria = example.createCriteria();
-        if (start != null) {
-            criteria.andUpdateTimeGreaterThanOrEqualTo(start);
-        }
-        if (end != null) {
-            criteria.andUpdateTimeLessThanOrEqualTo(end);
-        }
-
         List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
         List<Integer> idList = new ArrayList<>();
         for (Terminals terminals : terminalsList) {
@@ -47,9 +37,19 @@ public class LeadPullsServiceImpl implements LeadPullsService {
         if (termId != null) {
             idList.add(termId);
         }
+
+        LeadPullsExample example = new LeadPullsExample();
+        LeadPullsExample.Criteria criteria = example.createCriteria();
+        if (start != null) {
+            criteria.andUpdateTimeGreaterThanOrEqualTo(start);
+        }
+        if (end != null) {
+            criteria.andUpdateTimeLessThanOrEqualTo(end);
+        }
         criteria.andTermIdIn(idList);
-        example.setOrderByClause("updateTime desc");
+        example.setOrderByClause("update_time desc");
 
+        PageHelper.startPage(pageNum, pageSize);
         List<LeadPulls> list = mapper.selectByExample(example);
         for (LeadPulls leadPull : list) {
             for (Terminals terminals : terminalsList) {

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java

@@ -27,16 +27,6 @@ public class WeatherServiceImpl implements WeatherService {
     @Override
     public PageInfo<Weathers> list(Integer lineId, Integer towerId, Integer termId,
                                    Long start, Long end, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        WeathersExample example = new WeathersExample();
-        WeathersExample.Criteria criteria = example.createCriteria();
-        if (start != null) {
-            criteria.andUpdateTimeGreaterThanOrEqualTo(start);
-        }
-        if (end != null) {
-            criteria.andUpdateTimeLessThanOrEqualTo(end);
-        }
-
         List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
         List<Integer> idList = new ArrayList<>();
         for (Terminals terminals : terminalsList) {
@@ -45,9 +35,19 @@ public class WeatherServiceImpl implements WeatherService {
         if (termId != null) {
             idList.add(termId);
         }
+
+        WeathersExample example = new WeathersExample();
+        WeathersExample.Criteria criteria = example.createCriteria();
+        if (start != null) {
+            criteria.andUpdateTimeGreaterThanOrEqualTo(start);
+        }
+        if (end != null) {
+            criteria.andUpdateTimeLessThanOrEqualTo(end);
+        }
         criteria.andTermIdIn(idList);
-        example.setOrderByClause("updateTime desc");
+        example.setOrderByClause("update_time desc");
 
+        PageHelper.startPage(pageNum, pageSize);
         List<Weathers> list = mapper.selectByExample(example);
         for (Weathers weather : list) {
             for (Terminals terminals : terminalsList) {