diff --git a/pom.xml b/pom.xml
index 0e026f0..54a70dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,18 +21,19 @@
1.0.0
UTF-8
2.5.6
+ 8.0.33
3.0.0
3.0.2
1.5.21
1.5.21
- 1.2.79
- 1.2.8
- 2.2.0
- 1.4.0
- 1.4
+ 1.2.83
+ 1.2.22
+ 2.2.2
+ 1.4.7
+ 1.5
0.9.0
3.2.0
- 3.2.1
+ 3.3.3
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java
new file mode 100644
index 0000000..ff831d6
--- /dev/null
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java
@@ -0,0 +1,76 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.LeadPulls;
+import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals;
+import com.shxy.xymanager_common.page.TableDataInfo;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
+import com.shxy.xymanager_common.vo.TerminalSelectVo;
+import com.shxy.xymanager_service.service.LeadPullsService;
+import com.shxy.xymanager_service.service.TerminalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@Api(tags = {"拉力相关接口"})
+@RequestMapping("leadpulls")
+@Slf4j
+public class LeadPullsController extends BaseController {
+
+ @Resource
+ LeadPullsService service;
+ @Resource
+ TerminalService terminalService;
+
+ @GetMapping("list")
+ @ApiOperation("查询列表")
+ public ResponseReult> list(Integer lineId, Integer towerId, Integer termId,
+ Long start, Long end,
+ Integer pageNum, Integer pageSize) {
+ PageInfo result = service.list(lineId, towerId, termId,
+ start, end, pageNum, pageSize);
+ return ResponseReult.success(result);
+ }
+
+ @GetMapping("export")
+ @ApiOperation("导出")
+ public void export(Integer lineId, Integer towerId, Integer termId,
+ Long start, Long end,
+ Integer pageNum, Integer pageSize,
+ HttpServletResponse response) throws Exception {
+ PageInfo result = service.list(lineId, towerId, termId,
+ start, end, pageNum, pageSize);
+ EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), LeadPulls.class);
+ }
+
+ @GetMapping("latest")
+ @ApiOperation("查询最新的")
+ public ResponseReult> latest(Integer dyId, Integer lineId, Integer towerId,
+ int pageNum, int pageSize) {
+ TerminalSelectVo vo = new TerminalSelectVo();
+ vo.setDyId(dyId);
+ vo.setLineId(lineId);
+ vo.setTowerId(towerId);
+ vo.setPageindex(pageNum);
+ vo.setPagesize(pageSize);
+ TableDataInfo result = terminalService.getTerminalList(vo).getData();
+ if (!CollectionUtils.isEmpty(result.getList())) {
+ for (View_Dy_Line_Tower_Terminals terminals : result.getList()) {
+ LeadPulls last = service.getLast(terminals.getId());
+ terminals.setLastLeadPulls(last);
+ }
+ }
+ return ResponseReult.success(result);
+ }
+
+}
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java
new file mode 100644
index 0000000..4bfae28
--- /dev/null
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java
@@ -0,0 +1,61 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals;
+import com.shxy.xymanager_common.entity.Weathers;
+import com.shxy.xymanager_common.page.TableDataInfo;
+import com.shxy.xymanager_common.vo.TerminalSelectVo;
+import com.shxy.xymanager_service.service.TerminalService;
+import com.shxy.xymanager_service.service.WeatherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = {"气象相关接口"})
+@RequestMapping("weather")
+@Slf4j
+public class WeatherController extends BaseController {
+
+ @Resource
+ WeatherService service;
+ @Resource
+ TerminalService terminalService;
+
+ @GetMapping("list")
+ @ApiOperation("查询列表")
+ public ResponseReult> list(Integer lineId, Integer towerId, Integer termId,
+ Long start, Long end,
+ Integer pageNum, Integer pageSize) {
+ PageInfo result = service.list(lineId, towerId, termId,
+ start, end, pageNum, pageSize);
+ return ResponseReult.success(result);
+ }
+
+ @GetMapping("latest")
+ @ApiOperation("查询最新的")
+ public ResponseReult> latest(Integer dyId, Integer lineId, Integer towerId,
+ int pageNum, int pageSize) {
+ TerminalSelectVo vo = new TerminalSelectVo();
+ vo.setDyId(dyId);
+ vo.setLineId(lineId);
+ vo.setTowerId(towerId);
+ vo.setPageindex(pageNum);
+ vo.setPagesize(pageSize);
+ TableDataInfo result = terminalService.getTerminalList(vo).getData();
+ if (!CollectionUtils.isEmpty(result.getList())) {
+ for (View_Dy_Line_Tower_Terminals terminals : result.getList()) {
+ Weathers last = service.getLast(terminals.getId());
+ terminals.setLastWeathers(last);
+ }
+ }
+ return ResponseReult.success(result);
+ }
+
+}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java
new file mode 100644
index 0000000..85be959
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java
@@ -0,0 +1,704 @@
+package com.shxy.xymanager_common.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import java.util.Date;
+
+public class LeadPulls {
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.id
+ *
+ * @mbg.generated
+ */
+ @ExcelIgnore
+ private Long id;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.term_id
+ *
+ * @mbg.generated
+ */
+ @ExcelIgnore
+ private Integer termId;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.update_time
+ *
+ * @mbg.generated
+ */
+ @ExcelIgnore
+ private Long updateTime;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "时间", order = 2)
+
+ private Date updateDate;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.func_code
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(16)
+ @ExcelProperty(value = "功能单元识别码", order = 3)
+ private Integer funcCode;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.maxpull_pull
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(14)
+ @ExcelProperty(value = "最大拉力(Kg)", order = 4)
+ private Integer maxpullPull;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.maxpull_wind
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(20)
+ @ExcelProperty(value = "最大拉力时风偏角(°)", order = 5)
+ private Float maxpullWind;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.maxpull_tilt
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(20)
+ @ExcelProperty(value = "最大拉力时倾斜角(°)", order = 6)
+ private Float maxpullTilt;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.minpull_pull
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(14)
+ @ExcelProperty(value = "最小拉力(Kg)", order = 7)
+ private Integer minpullPull;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.minpull_wind
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(20)
+ @ExcelProperty(value = "最小拉力时风偏角(°)", order = 8)
+ private Float minpullWind;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.minpull_tilt
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(20)
+ @ExcelProperty(value = "最小拉力时倾斜角(°)", order = 9)
+ private Float minpullTilt;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.maxwind_pull
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(21)
+ @ExcelProperty(value = "最大风偏角时拉力(Kg)", order = 10)
+ private Integer maxwindPull;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.maxwind_wind
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(14)
+ @ExcelProperty(value = "最大风偏角(°)", order = 11)
+ private Float maxwindWind;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.maxwind_tilt
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(22)
+ @ExcelProperty(value = "最大风偏角时倾斜角(°)", order = 12)
+ private Float maxwindTilt;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.minwind_pull
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(21)
+ @ExcelProperty(value = "最小风偏角时拉力(Kg)", order = 13)
+ private Integer minwindPull;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.minwind_wind
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(14)
+ @ExcelProperty(value = "最小风偏角(°)", order = 14)
+ private Float minwindWind;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.minwind_tilt
+ *
+ * @mbg.generated
+ */
+ @ColumnWidth(22)
+ @ExcelProperty(value = "最小风偏角时倾斜角(°)", order = 15)
+ private Float minwindTilt;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.wid
+ *
+ * @mbg.generated
+ */
+ @ExcelIgnore
+ private Long wid;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.wind_speed
+ *
+ * @mbg.generated
+ */
+ @ExcelIgnore
+ private Float windSpeed;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column lead_pulls.create_time
+ *
+ * @mbg.generated
+ */
+ @ExcelIgnore
+ private Date createTime;
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.id
+ *
+ * @return the value of lead_pulls.id
+ *
+ * @mbg.generated
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.id
+ *
+ * @param id the value for lead_pulls.id
+ *
+ * @mbg.generated
+ */
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.term_id
+ *
+ * @return the value of lead_pulls.term_id
+ *
+ * @mbg.generated
+ */
+ public Integer getTermId() {
+ return termId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.term_id
+ *
+ * @param termId the value for lead_pulls.term_id
+ *
+ * @mbg.generated
+ */
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.update_time
+ *
+ * @return the value of lead_pulls.update_time
+ *
+ * @mbg.generated
+ */
+ public Long getUpdateTime() {
+ return updateTime;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.update_time
+ *
+ * @param updateTime the value for lead_pulls.update_time
+ *
+ * @mbg.generated
+ */
+ public void setUpdateTime(Long updateTime) {
+ this.updateTime = updateTime;
+ this.updateDate = new Date(updateTime*1000);
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.func_code
+ *
+ * @return the value of lead_pulls.func_code
+ *
+ * @mbg.generated
+ */
+ public Integer getFuncCode() {
+ return funcCode;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.func_code
+ *
+ * @param funcCode the value for lead_pulls.func_code
+ *
+ * @mbg.generated
+ */
+ public void setFuncCode(Integer funcCode) {
+ this.funcCode = funcCode;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.maxpull_pull
+ *
+ * @return the value of lead_pulls.maxpull_pull
+ *
+ * @mbg.generated
+ */
+ public Integer getMaxpullPull() {
+ return maxpullPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.maxpull_pull
+ *
+ * @param maxpullPull the value for lead_pulls.maxpull_pull
+ *
+ * @mbg.generated
+ */
+ public void setMaxpullPull(Integer maxpullPull) {
+ this.maxpullPull = maxpullPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.maxpull_wind
+ *
+ * @return the value of lead_pulls.maxpull_wind
+ *
+ * @mbg.generated
+ */
+ public Float getMaxpullWind() {
+ return maxpullWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.maxpull_wind
+ *
+ * @param maxpullWind the value for lead_pulls.maxpull_wind
+ *
+ * @mbg.generated
+ */
+ public void setMaxpullWind(Float maxpullWind) {
+ this.maxpullWind = maxpullWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.maxpull_tilt
+ *
+ * @return the value of lead_pulls.maxpull_tilt
+ *
+ * @mbg.generated
+ */
+ public Float getMaxpullTilt() {
+ return maxpullTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.maxpull_tilt
+ *
+ * @param maxpullTilt the value for lead_pulls.maxpull_tilt
+ *
+ * @mbg.generated
+ */
+ public void setMaxpullTilt(Float maxpullTilt) {
+ this.maxpullTilt = maxpullTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.minpull_pull
+ *
+ * @return the value of lead_pulls.minpull_pull
+ *
+ * @mbg.generated
+ */
+ public Integer getMinpullPull() {
+ return minpullPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.minpull_pull
+ *
+ * @param minpullPull the value for lead_pulls.minpull_pull
+ *
+ * @mbg.generated
+ */
+ public void setMinpullPull(Integer minpullPull) {
+ this.minpullPull = minpullPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.minpull_wind
+ *
+ * @return the value of lead_pulls.minpull_wind
+ *
+ * @mbg.generated
+ */
+ public Float getMinpullWind() {
+ return minpullWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.minpull_wind
+ *
+ * @param minpullWind the value for lead_pulls.minpull_wind
+ *
+ * @mbg.generated
+ */
+ public void setMinpullWind(Float minpullWind) {
+ this.minpullWind = minpullWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.minpull_tilt
+ *
+ * @return the value of lead_pulls.minpull_tilt
+ *
+ * @mbg.generated
+ */
+ public Float getMinpullTilt() {
+ return minpullTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.minpull_tilt
+ *
+ * @param minpullTilt the value for lead_pulls.minpull_tilt
+ *
+ * @mbg.generated
+ */
+ public void setMinpullTilt(Float minpullTilt) {
+ this.minpullTilt = minpullTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.maxwind_pull
+ *
+ * @return the value of lead_pulls.maxwind_pull
+ *
+ * @mbg.generated
+ */
+ public Integer getMaxwindPull() {
+ return maxwindPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.maxwind_pull
+ *
+ * @param maxwindPull the value for lead_pulls.maxwind_pull
+ *
+ * @mbg.generated
+ */
+ public void setMaxwindPull(Integer maxwindPull) {
+ this.maxwindPull = maxwindPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.maxwind_wind
+ *
+ * @return the value of lead_pulls.maxwind_wind
+ *
+ * @mbg.generated
+ */
+ public Float getMaxwindWind() {
+ return maxwindWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.maxwind_wind
+ *
+ * @param maxwindWind the value for lead_pulls.maxwind_wind
+ *
+ * @mbg.generated
+ */
+ public void setMaxwindWind(Float maxwindWind) {
+ this.maxwindWind = maxwindWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.maxwind_tilt
+ *
+ * @return the value of lead_pulls.maxwind_tilt
+ *
+ * @mbg.generated
+ */
+ public Float getMaxwindTilt() {
+ return maxwindTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.maxwind_tilt
+ *
+ * @param maxwindTilt the value for lead_pulls.maxwind_tilt
+ *
+ * @mbg.generated
+ */
+ public void setMaxwindTilt(Float maxwindTilt) {
+ this.maxwindTilt = maxwindTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.minwind_pull
+ *
+ * @return the value of lead_pulls.minwind_pull
+ *
+ * @mbg.generated
+ */
+ public Integer getMinwindPull() {
+ return minwindPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.minwind_pull
+ *
+ * @param minwindPull the value for lead_pulls.minwind_pull
+ *
+ * @mbg.generated
+ */
+ public void setMinwindPull(Integer minwindPull) {
+ this.minwindPull = minwindPull;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.minwind_wind
+ *
+ * @return the value of lead_pulls.minwind_wind
+ *
+ * @mbg.generated
+ */
+ public Float getMinwindWind() {
+ return minwindWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.minwind_wind
+ *
+ * @param minwindWind the value for lead_pulls.minwind_wind
+ *
+ * @mbg.generated
+ */
+ public void setMinwindWind(Float minwindWind) {
+ this.minwindWind = minwindWind;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.minwind_tilt
+ *
+ * @return the value of lead_pulls.minwind_tilt
+ *
+ * @mbg.generated
+ */
+ public Float getMinwindTilt() {
+ return minwindTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.minwind_tilt
+ *
+ * @param minwindTilt the value for lead_pulls.minwind_tilt
+ *
+ * @mbg.generated
+ */
+ public void setMinwindTilt(Float minwindTilt) {
+ this.minwindTilt = minwindTilt;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.wid
+ *
+ * @return the value of lead_pulls.wid
+ *
+ * @mbg.generated
+ */
+ public Long getWid() {
+ return wid;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.wid
+ *
+ * @param wid the value for lead_pulls.wid
+ *
+ * @mbg.generated
+ */
+ public void setWid(Long wid) {
+ this.wid = wid;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.wind_speed
+ *
+ * @return the value of lead_pulls.wind_speed
+ *
+ * @mbg.generated
+ */
+ public Float getWindSpeed() {
+ return windSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.wind_speed
+ *
+ * @param windSpeed the value for lead_pulls.wind_speed
+ *
+ * @mbg.generated
+ */
+ public void setWindSpeed(Float windSpeed) {
+ this.windSpeed = windSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column lead_pulls.create_time
+ *
+ * @return the value of lead_pulls.create_time
+ *
+ * @mbg.generated
+ */
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column lead_pulls.create_time
+ *
+ * @param createTime the value for lead_pulls.create_time
+ *
+ * @mbg.generated
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ @ColumnWidth(15)
+ @ExcelProperty(value = "监测终端编号", order = 1)
+ private String cmdid;
+
+ @ExcelIgnore
+ private String phase;
+
+ public String getCmdid() {
+ return cmdid;
+ }
+
+ public void setCmdid(String cmdid) {
+ this.cmdid = cmdid;
+ }
+
+ public String getPhase() {
+ return phase;
+ }
+
+ public void setPhase(String phase) {
+ this.phase = phase;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPullsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPullsExample.java
new file mode 100644
index 0000000..521d591
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPullsExample.java
@@ -0,0 +1,1442 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class LeadPullsExample {
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ protected String orderByClause;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ protected boolean distinct;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ protected List oredCriteria;
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public LeadPullsExample() {
+ oredCriteria = new ArrayList<>();
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List 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 values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List 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 andTermIdIsNull() {
+ addCriterion("term_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdIsNotNull() {
+ addCriterion("term_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdEqualTo(Integer value) {
+ addCriterion("term_id =", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdNotEqualTo(Integer value) {
+ addCriterion("term_id <>", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdGreaterThan(Integer value) {
+ addCriterion("term_id >", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+ addCriterion("term_id >=", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdLessThan(Integer value) {
+ addCriterion("term_id <", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+ addCriterion("term_id <=", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdIn(List values) {
+ addCriterion("term_id in", values, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdNotIn(List values) {
+ addCriterion("term_id not in", values, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdBetween(Integer value1, Integer value2) {
+ addCriterion("term_id between", value1, value2, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+ addCriterion("term_id not between", value1, value2, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIsNull() {
+ addCriterion("update_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIsNotNull() {
+ addCriterion("update_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeEqualTo(Long value) {
+ addCriterion("update_time =", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotEqualTo(Long value) {
+ addCriterion("update_time <>", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeGreaterThan(Long value) {
+ addCriterion("update_time >", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+ addCriterion("update_time >=", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeLessThan(Long value) {
+ addCriterion("update_time <", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+ addCriterion("update_time <=", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIn(List values) {
+ addCriterion("update_time in", values, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotIn(List values) {
+ addCriterion("update_time not in", values, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+ addCriterion("update_time between", value1, value2, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotBetween(Long value1, Long value2) {
+ addCriterion("update_time not between", value1, value2, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeIsNull() {
+ addCriterion("func_code is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeIsNotNull() {
+ addCriterion("func_code is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeEqualTo(Integer value) {
+ addCriterion("func_code =", value, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeNotEqualTo(Integer value) {
+ addCriterion("func_code <>", value, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeGreaterThan(Integer value) {
+ addCriterion("func_code >", value, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeGreaterThanOrEqualTo(Integer value) {
+ addCriterion("func_code >=", value, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeLessThan(Integer value) {
+ addCriterion("func_code <", value, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeLessThanOrEqualTo(Integer value) {
+ addCriterion("func_code <=", value, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeIn(List values) {
+ addCriterion("func_code in", values, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeNotIn(List values) {
+ addCriterion("func_code not in", values, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeBetween(Integer value1, Integer value2) {
+ addCriterion("func_code between", value1, value2, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andFuncCodeNotBetween(Integer value1, Integer value2) {
+ addCriterion("func_code not between", value1, value2, "funcCode");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullIsNull() {
+ addCriterion("maxpull_pull is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullIsNotNull() {
+ addCriterion("maxpull_pull is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullEqualTo(Integer value) {
+ addCriterion("maxpull_pull =", value, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullNotEqualTo(Integer value) {
+ addCriterion("maxpull_pull <>", value, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullGreaterThan(Integer value) {
+ addCriterion("maxpull_pull >", value, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullGreaterThanOrEqualTo(Integer value) {
+ addCriterion("maxpull_pull >=", value, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullLessThan(Integer value) {
+ addCriterion("maxpull_pull <", value, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullLessThanOrEqualTo(Integer value) {
+ addCriterion("maxpull_pull <=", value, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullIn(List values) {
+ addCriterion("maxpull_pull in", values, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullNotIn(List values) {
+ addCriterion("maxpull_pull not in", values, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullBetween(Integer value1, Integer value2) {
+ addCriterion("maxpull_pull between", value1, value2, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullPullNotBetween(Integer value1, Integer value2) {
+ addCriterion("maxpull_pull not between", value1, value2, "maxpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindIsNull() {
+ addCriterion("maxpull_wind is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindIsNotNull() {
+ addCriterion("maxpull_wind is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindEqualTo(Float value) {
+ addCriterion("maxpull_wind =", value, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindNotEqualTo(Float value) {
+ addCriterion("maxpull_wind <>", value, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindGreaterThan(Float value) {
+ addCriterion("maxpull_wind >", value, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindGreaterThanOrEqualTo(Float value) {
+ addCriterion("maxpull_wind >=", value, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindLessThan(Float value) {
+ addCriterion("maxpull_wind <", value, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindLessThanOrEqualTo(Float value) {
+ addCriterion("maxpull_wind <=", value, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindIn(List values) {
+ addCriterion("maxpull_wind in", values, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindNotIn(List values) {
+ addCriterion("maxpull_wind not in", values, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindBetween(Float value1, Float value2) {
+ addCriterion("maxpull_wind between", value1, value2, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullWindNotBetween(Float value1, Float value2) {
+ addCriterion("maxpull_wind not between", value1, value2, "maxpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltIsNull() {
+ addCriterion("maxpull_tilt is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltIsNotNull() {
+ addCriterion("maxpull_tilt is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltEqualTo(Float value) {
+ addCriterion("maxpull_tilt =", value, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltNotEqualTo(Float value) {
+ addCriterion("maxpull_tilt <>", value, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltGreaterThan(Float value) {
+ addCriterion("maxpull_tilt >", value, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltGreaterThanOrEqualTo(Float value) {
+ addCriterion("maxpull_tilt >=", value, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltLessThan(Float value) {
+ addCriterion("maxpull_tilt <", value, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltLessThanOrEqualTo(Float value) {
+ addCriterion("maxpull_tilt <=", value, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltIn(List values) {
+ addCriterion("maxpull_tilt in", values, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltNotIn(List values) {
+ addCriterion("maxpull_tilt not in", values, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltBetween(Float value1, Float value2) {
+ addCriterion("maxpull_tilt between", value1, value2, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxpullTiltNotBetween(Float value1, Float value2) {
+ addCriterion("maxpull_tilt not between", value1, value2, "maxpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullIsNull() {
+ addCriterion("minpull_pull is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullIsNotNull() {
+ addCriterion("minpull_pull is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullEqualTo(Integer value) {
+ addCriterion("minpull_pull =", value, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullNotEqualTo(Integer value) {
+ addCriterion("minpull_pull <>", value, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullGreaterThan(Integer value) {
+ addCriterion("minpull_pull >", value, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullGreaterThanOrEqualTo(Integer value) {
+ addCriterion("minpull_pull >=", value, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullLessThan(Integer value) {
+ addCriterion("minpull_pull <", value, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullLessThanOrEqualTo(Integer value) {
+ addCriterion("minpull_pull <=", value, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullIn(List values) {
+ addCriterion("minpull_pull in", values, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullNotIn(List values) {
+ addCriterion("minpull_pull not in", values, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullBetween(Integer value1, Integer value2) {
+ addCriterion("minpull_pull between", value1, value2, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullPullNotBetween(Integer value1, Integer value2) {
+ addCriterion("minpull_pull not between", value1, value2, "minpullPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindIsNull() {
+ addCriterion("minpull_wind is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindIsNotNull() {
+ addCriterion("minpull_wind is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindEqualTo(Float value) {
+ addCriterion("minpull_wind =", value, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindNotEqualTo(Float value) {
+ addCriterion("minpull_wind <>", value, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindGreaterThan(Float value) {
+ addCriterion("minpull_wind >", value, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindGreaterThanOrEqualTo(Float value) {
+ addCriterion("minpull_wind >=", value, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindLessThan(Float value) {
+ addCriterion("minpull_wind <", value, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindLessThanOrEqualTo(Float value) {
+ addCriterion("minpull_wind <=", value, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindIn(List values) {
+ addCriterion("minpull_wind in", values, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindNotIn(List values) {
+ addCriterion("minpull_wind not in", values, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindBetween(Float value1, Float value2) {
+ addCriterion("minpull_wind between", value1, value2, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullWindNotBetween(Float value1, Float value2) {
+ addCriterion("minpull_wind not between", value1, value2, "minpullWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltIsNull() {
+ addCriterion("minpull_tilt is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltIsNotNull() {
+ addCriterion("minpull_tilt is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltEqualTo(Float value) {
+ addCriterion("minpull_tilt =", value, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltNotEqualTo(Float value) {
+ addCriterion("minpull_tilt <>", value, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltGreaterThan(Float value) {
+ addCriterion("minpull_tilt >", value, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltGreaterThanOrEqualTo(Float value) {
+ addCriterion("minpull_tilt >=", value, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltLessThan(Float value) {
+ addCriterion("minpull_tilt <", value, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltLessThanOrEqualTo(Float value) {
+ addCriterion("minpull_tilt <=", value, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltIn(List values) {
+ addCriterion("minpull_tilt in", values, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltNotIn(List values) {
+ addCriterion("minpull_tilt not in", values, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltBetween(Float value1, Float value2) {
+ addCriterion("minpull_tilt between", value1, value2, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinpullTiltNotBetween(Float value1, Float value2) {
+ addCriterion("minpull_tilt not between", value1, value2, "minpullTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullIsNull() {
+ addCriterion("maxwind_pull is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullIsNotNull() {
+ addCriterion("maxwind_pull is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullEqualTo(Integer value) {
+ addCriterion("maxwind_pull =", value, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullNotEqualTo(Integer value) {
+ addCriterion("maxwind_pull <>", value, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullGreaterThan(Integer value) {
+ addCriterion("maxwind_pull >", value, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullGreaterThanOrEqualTo(Integer value) {
+ addCriterion("maxwind_pull >=", value, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullLessThan(Integer value) {
+ addCriterion("maxwind_pull <", value, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullLessThanOrEqualTo(Integer value) {
+ addCriterion("maxwind_pull <=", value, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullIn(List values) {
+ addCriterion("maxwind_pull in", values, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullNotIn(List values) {
+ addCriterion("maxwind_pull not in", values, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullBetween(Integer value1, Integer value2) {
+ addCriterion("maxwind_pull between", value1, value2, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindPullNotBetween(Integer value1, Integer value2) {
+ addCriterion("maxwind_pull not between", value1, value2, "maxwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindIsNull() {
+ addCriterion("maxwind_wind is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindIsNotNull() {
+ addCriterion("maxwind_wind is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindEqualTo(Float value) {
+ addCriterion("maxwind_wind =", value, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindNotEqualTo(Float value) {
+ addCriterion("maxwind_wind <>", value, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindGreaterThan(Float value) {
+ addCriterion("maxwind_wind >", value, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindGreaterThanOrEqualTo(Float value) {
+ addCriterion("maxwind_wind >=", value, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindLessThan(Float value) {
+ addCriterion("maxwind_wind <", value, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindLessThanOrEqualTo(Float value) {
+ addCriterion("maxwind_wind <=", value, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindIn(List values) {
+ addCriterion("maxwind_wind in", values, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindNotIn(List values) {
+ addCriterion("maxwind_wind not in", values, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindBetween(Float value1, Float value2) {
+ addCriterion("maxwind_wind between", value1, value2, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindWindNotBetween(Float value1, Float value2) {
+ addCriterion("maxwind_wind not between", value1, value2, "maxwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltIsNull() {
+ addCriterion("maxwind_tilt is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltIsNotNull() {
+ addCriterion("maxwind_tilt is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltEqualTo(Float value) {
+ addCriterion("maxwind_tilt =", value, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltNotEqualTo(Float value) {
+ addCriterion("maxwind_tilt <>", value, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltGreaterThan(Float value) {
+ addCriterion("maxwind_tilt >", value, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltGreaterThanOrEqualTo(Float value) {
+ addCriterion("maxwind_tilt >=", value, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltLessThan(Float value) {
+ addCriterion("maxwind_tilt <", value, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltLessThanOrEqualTo(Float value) {
+ addCriterion("maxwind_tilt <=", value, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltIn(List values) {
+ addCriterion("maxwind_tilt in", values, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltNotIn(List values) {
+ addCriterion("maxwind_tilt not in", values, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltBetween(Float value1, Float value2) {
+ addCriterion("maxwind_tilt between", value1, value2, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxwindTiltNotBetween(Float value1, Float value2) {
+ addCriterion("maxwind_tilt not between", value1, value2, "maxwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullIsNull() {
+ addCriterion("minwind_pull is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullIsNotNull() {
+ addCriterion("minwind_pull is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullEqualTo(Integer value) {
+ addCriterion("minwind_pull =", value, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullNotEqualTo(Integer value) {
+ addCriterion("minwind_pull <>", value, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullGreaterThan(Integer value) {
+ addCriterion("minwind_pull >", value, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullGreaterThanOrEqualTo(Integer value) {
+ addCriterion("minwind_pull >=", value, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullLessThan(Integer value) {
+ addCriterion("minwind_pull <", value, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullLessThanOrEqualTo(Integer value) {
+ addCriterion("minwind_pull <=", value, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullIn(List values) {
+ addCriterion("minwind_pull in", values, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullNotIn(List values) {
+ addCriterion("minwind_pull not in", values, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullBetween(Integer value1, Integer value2) {
+ addCriterion("minwind_pull between", value1, value2, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindPullNotBetween(Integer value1, Integer value2) {
+ addCriterion("minwind_pull not between", value1, value2, "minwindPull");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindIsNull() {
+ addCriterion("minwind_wind is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindIsNotNull() {
+ addCriterion("minwind_wind is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindEqualTo(Float value) {
+ addCriterion("minwind_wind =", value, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindNotEqualTo(Float value) {
+ addCriterion("minwind_wind <>", value, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindGreaterThan(Float value) {
+ addCriterion("minwind_wind >", value, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindGreaterThanOrEqualTo(Float value) {
+ addCriterion("minwind_wind >=", value, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindLessThan(Float value) {
+ addCriterion("minwind_wind <", value, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindLessThanOrEqualTo(Float value) {
+ addCriterion("minwind_wind <=", value, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindIn(List values) {
+ addCriterion("minwind_wind in", values, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindNotIn(List values) {
+ addCriterion("minwind_wind not in", values, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindBetween(Float value1, Float value2) {
+ addCriterion("minwind_wind between", value1, value2, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindWindNotBetween(Float value1, Float value2) {
+ addCriterion("minwind_wind not between", value1, value2, "minwindWind");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltIsNull() {
+ addCriterion("minwind_tilt is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltIsNotNull() {
+ addCriterion("minwind_tilt is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltEqualTo(Float value) {
+ addCriterion("minwind_tilt =", value, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltNotEqualTo(Float value) {
+ addCriterion("minwind_tilt <>", value, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltGreaterThan(Float value) {
+ addCriterion("minwind_tilt >", value, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltGreaterThanOrEqualTo(Float value) {
+ addCriterion("minwind_tilt >=", value, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltLessThan(Float value) {
+ addCriterion("minwind_tilt <", value, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltLessThanOrEqualTo(Float value) {
+ addCriterion("minwind_tilt <=", value, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltIn(List values) {
+ addCriterion("minwind_tilt in", values, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltNotIn(List values) {
+ addCriterion("minwind_tilt not in", values, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltBetween(Float value1, Float value2) {
+ addCriterion("minwind_tilt between", value1, value2, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andMinwindTiltNotBetween(Float value1, Float value2) {
+ addCriterion("minwind_tilt not between", value1, value2, "minwindTilt");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidIsNull() {
+ addCriterion("wid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidIsNotNull() {
+ addCriterion("wid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidEqualTo(Long value) {
+ addCriterion("wid =", value, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidNotEqualTo(Long value) {
+ addCriterion("wid <>", value, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidGreaterThan(Long value) {
+ addCriterion("wid >", value, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidGreaterThanOrEqualTo(Long value) {
+ addCriterion("wid >=", value, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidLessThan(Long value) {
+ addCriterion("wid <", value, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidLessThanOrEqualTo(Long value) {
+ addCriterion("wid <=", value, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidIn(List values) {
+ addCriterion("wid in", values, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidNotIn(List values) {
+ addCriterion("wid not in", values, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidBetween(Long value1, Long value2) {
+ addCriterion("wid between", value1, value2, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWidNotBetween(Long value1, Long value2) {
+ addCriterion("wid not between", value1, value2, "wid");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedIsNull() {
+ addCriterion("wind_speed is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedIsNotNull() {
+ addCriterion("wind_speed is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedEqualTo(Float value) {
+ addCriterion("wind_speed =", value, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedNotEqualTo(Float value) {
+ addCriterion("wind_speed <>", value, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedGreaterThan(Float value) {
+ addCriterion("wind_speed >", value, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedGreaterThanOrEqualTo(Float value) {
+ addCriterion("wind_speed >=", value, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedLessThan(Float value) {
+ addCriterion("wind_speed <", value, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedLessThanOrEqualTo(Float value) {
+ addCriterion("wind_speed <=", value, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedIn(List values) {
+ addCriterion("wind_speed in", values, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedNotIn(List values) {
+ addCriterion("wind_speed not in", values, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedBetween(Float value1, Float value2) {
+ addCriterion("wind_speed between", value1, value2, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindSpeedNotBetween(Float value1, Float value2) {
+ addCriterion("wind_speed not between", value1, value2, "windSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIsNull() {
+ addCriterion("create_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIsNotNull() {
+ addCriterion("create_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeEqualTo(Date value) {
+ addCriterion("create_time =", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotEqualTo(Date value) {
+ addCriterion("create_time <>", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeGreaterThan(Date value) {
+ addCriterion("create_time >", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("create_time >=", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeLessThan(Date value) {
+ addCriterion("create_time <", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+ addCriterion("create_time <=", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIn(List values) {
+ addCriterion("create_time in", values, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotIn(List values) {
+ addCriterion("create_time not in", values, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeBetween(Date value1, Date value2) {
+ addCriterion("create_time between", value1, value2, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+ addCriterion("create_time not between", value1, value2, "createTime");
+ return (Criteria) this;
+ }
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table lead_pulls
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+ public static class Criteria extends GeneratedCriteria {
+ protected Criteria() {
+ super();
+ }
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ 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);
+ }
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRole.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRole.java
index cf64896..92ae016 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRole.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRole.java
@@ -21,6 +21,15 @@ public class TbRole {
*/
private String name;
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column tb_role.desc
+ *
+ * @mbg.generated
+ */
+ private String desc;
+
/**
*
* This field was generated by MyBatis Generator.
@@ -78,6 +87,30 @@ public class TbRole {
this.name = name;
}
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column tb_role.desc
+ *
+ * @return the value of tb_role.desc
+ *
+ * @mbg.generated
+ */
+ public String getDesc() {
+ return desc;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column tb_role.desc
+ *
+ * @param desc the value for tb_role.desc
+ *
+ * @mbg.generated
+ */
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column tb_role.create_time
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRoleExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRoleExample.java
index bed9b40..da5eb52 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRoleExample.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TbRoleExample.java
@@ -325,6 +325,76 @@ public class TbRoleExample {
return (Criteria) this;
}
+ public Criteria andDescIsNull() {
+ addCriterion("`desc` is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescIsNotNull() {
+ addCriterion("`desc` is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescEqualTo(String value) {
+ addCriterion("`desc` =", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescNotEqualTo(String value) {
+ addCriterion("`desc` <>", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescGreaterThan(String value) {
+ addCriterion("`desc` >", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescGreaterThanOrEqualTo(String value) {
+ addCriterion("`desc` >=", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescLessThan(String value) {
+ addCriterion("`desc` <", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescLessThanOrEqualTo(String value) {
+ addCriterion("`desc` <=", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescLike(String value) {
+ addCriterion("`desc` like", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescNotLike(String value) {
+ addCriterion("`desc` not like", value, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescIn(List values) {
+ addCriterion("`desc` in", values, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescNotIn(List values) {
+ addCriterion("`desc` not in", values, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescBetween(String value1, String value2) {
+ addCriterion("`desc` between", value1, value2, "desc");
+ return (Criteria) this;
+ }
+
+ public Criteria andDescNotBetween(String value1, String value2) {
+ addCriterion("`desc` not between", value1, value2, "desc");
+ return (Criteria) this;
+ }
+
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java
index 1370f32..f6b8ef5 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java
@@ -111,4 +111,7 @@ public class View_Dy_Line_Tower_Terminals implements Serializable {
@ApiModelProperty(value = "通道编号和名称", example = "213")
private List list;
private static final long serialVersionUID = 1L;
+
+ private Weathers lastWeathers;
+ private LeadPulls lastLeadPulls;
}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Weathers.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Weathers.java
new file mode 100644
index 0000000..edbf9a1
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Weathers.java
@@ -0,0 +1,616 @@
+package com.shxy.xymanager_common.entity;
+
+public class Weathers {
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.id
+ *
+ * @mbg.generated
+ */
+ private Long id;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.term_id
+ *
+ * @mbg.generated
+ */
+ private Integer termId;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.update_time
+ *
+ * @mbg.generated
+ */
+ private Long updateTime;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.comp_id
+ *
+ * @mbg.generated
+ */
+ private String compId;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.avg_wind_speed_10min
+ *
+ * @mbg.generated
+ */
+ private Float avgWindSpeed10min;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.avg_wind_dir_10min
+ *
+ * @mbg.generated
+ */
+ private Integer avgWindDir10min;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.avg_wind_speed_1min
+ *
+ * @mbg.generated
+ */
+ private Float avgWindSpeed1min;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.avg_wind_dir_1min
+ *
+ * @mbg.generated
+ */
+ private Float avgWindDir1min;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.max_wind_speed
+ *
+ * @mbg.generated
+ */
+ private Float maxWindSpeed;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.extreme_wind_speed
+ *
+ * @mbg.generated
+ */
+ private Float extremeWindSpeed;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.standard_wind_speed
+ *
+ * @mbg.generated
+ */
+ private Float standardWindSpeed;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.wind_direction
+ *
+ * @mbg.generated
+ */
+ private Float windDirection;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.air_temperature
+ *
+ * @mbg.generated
+ */
+ private Float airTemperature;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.humidity
+ *
+ * @mbg.generated
+ */
+ private Integer humidity;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.air_pressure
+ *
+ * @mbg.generated
+ */
+ private Float airPressure;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.precipitation
+ *
+ * @mbg.generated
+ */
+ private Float precipitation;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.precipitation_Intensity
+ *
+ * @mbg.generated
+ */
+ private Float precipitationIntensity;
+
+ /**
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column weathers.radiation_Intensity
+ *
+ * @mbg.generated
+ */
+ private Integer radiationIntensity;
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.id
+ *
+ * @return the value of weathers.id
+ *
+ * @mbg.generated
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.id
+ *
+ * @param id the value for weathers.id
+ *
+ * @mbg.generated
+ */
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.term_id
+ *
+ * @return the value of weathers.term_id
+ *
+ * @mbg.generated
+ */
+ public Integer getTermId() {
+ return termId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.term_id
+ *
+ * @param termId the value for weathers.term_id
+ *
+ * @mbg.generated
+ */
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.update_time
+ *
+ * @return the value of weathers.update_time
+ *
+ * @mbg.generated
+ */
+ public Long getUpdateTime() {
+ return updateTime;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.update_time
+ *
+ * @param updateTime the value for weathers.update_time
+ *
+ * @mbg.generated
+ */
+ public void setUpdateTime(Long updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.comp_id
+ *
+ * @return the value of weathers.comp_id
+ *
+ * @mbg.generated
+ */
+ public String getCompId() {
+ return compId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.comp_id
+ *
+ * @param compId the value for weathers.comp_id
+ *
+ * @mbg.generated
+ */
+ public void setCompId(String compId) {
+ this.compId = compId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.avg_wind_speed_10min
+ *
+ * @return the value of weathers.avg_wind_speed_10min
+ *
+ * @mbg.generated
+ */
+ public Float getAvgWindSpeed10min() {
+ return avgWindSpeed10min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.avg_wind_speed_10min
+ *
+ * @param avgWindSpeed10min the value for weathers.avg_wind_speed_10min
+ *
+ * @mbg.generated
+ */
+ public void setAvgWindSpeed10min(Float avgWindSpeed10min) {
+ this.avgWindSpeed10min = avgWindSpeed10min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.avg_wind_dir_10min
+ *
+ * @return the value of weathers.avg_wind_dir_10min
+ *
+ * @mbg.generated
+ */
+ public Integer getAvgWindDir10min() {
+ return avgWindDir10min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.avg_wind_dir_10min
+ *
+ * @param avgWindDir10min the value for weathers.avg_wind_dir_10min
+ *
+ * @mbg.generated
+ */
+ public void setAvgWindDir10min(Integer avgWindDir10min) {
+ this.avgWindDir10min = avgWindDir10min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.avg_wind_speed_1min
+ *
+ * @return the value of weathers.avg_wind_speed_1min
+ *
+ * @mbg.generated
+ */
+ public Float getAvgWindSpeed1min() {
+ return avgWindSpeed1min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.avg_wind_speed_1min
+ *
+ * @param avgWindSpeed1min the value for weathers.avg_wind_speed_1min
+ *
+ * @mbg.generated
+ */
+ public void setAvgWindSpeed1min(Float avgWindSpeed1min) {
+ this.avgWindSpeed1min = avgWindSpeed1min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.avg_wind_dir_1min
+ *
+ * @return the value of weathers.avg_wind_dir_1min
+ *
+ * @mbg.generated
+ */
+ public Float getAvgWindDir1min() {
+ return avgWindDir1min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.avg_wind_dir_1min
+ *
+ * @param avgWindDir1min the value for weathers.avg_wind_dir_1min
+ *
+ * @mbg.generated
+ */
+ public void setAvgWindDir1min(Float avgWindDir1min) {
+ this.avgWindDir1min = avgWindDir1min;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.max_wind_speed
+ *
+ * @return the value of weathers.max_wind_speed
+ *
+ * @mbg.generated
+ */
+ public Float getMaxWindSpeed() {
+ return maxWindSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.max_wind_speed
+ *
+ * @param maxWindSpeed the value for weathers.max_wind_speed
+ *
+ * @mbg.generated
+ */
+ public void setMaxWindSpeed(Float maxWindSpeed) {
+ this.maxWindSpeed = maxWindSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.extreme_wind_speed
+ *
+ * @return the value of weathers.extreme_wind_speed
+ *
+ * @mbg.generated
+ */
+ public Float getExtremeWindSpeed() {
+ return extremeWindSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.extreme_wind_speed
+ *
+ * @param extremeWindSpeed the value for weathers.extreme_wind_speed
+ *
+ * @mbg.generated
+ */
+ public void setExtremeWindSpeed(Float extremeWindSpeed) {
+ this.extremeWindSpeed = extremeWindSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.standard_wind_speed
+ *
+ * @return the value of weathers.standard_wind_speed
+ *
+ * @mbg.generated
+ */
+ public Float getStandardWindSpeed() {
+ return standardWindSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.standard_wind_speed
+ *
+ * @param standardWindSpeed the value for weathers.standard_wind_speed
+ *
+ * @mbg.generated
+ */
+ public void setStandardWindSpeed(Float standardWindSpeed) {
+ this.standardWindSpeed = standardWindSpeed;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.wind_direction
+ *
+ * @return the value of weathers.wind_direction
+ *
+ * @mbg.generated
+ */
+ public Float getWindDirection() {
+ return windDirection;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.wind_direction
+ *
+ * @param windDirection the value for weathers.wind_direction
+ *
+ * @mbg.generated
+ */
+ public void setWindDirection(Float windDirection) {
+ this.windDirection = windDirection;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.air_temperature
+ *
+ * @return the value of weathers.air_temperature
+ *
+ * @mbg.generated
+ */
+ public Float getAirTemperature() {
+ return airTemperature;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.air_temperature
+ *
+ * @param airTemperature the value for weathers.air_temperature
+ *
+ * @mbg.generated
+ */
+ public void setAirTemperature(Float airTemperature) {
+ this.airTemperature = airTemperature;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.humidity
+ *
+ * @return the value of weathers.humidity
+ *
+ * @mbg.generated
+ */
+ public Integer getHumidity() {
+ return humidity;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.humidity
+ *
+ * @param humidity the value for weathers.humidity
+ *
+ * @mbg.generated
+ */
+ public void setHumidity(Integer humidity) {
+ this.humidity = humidity;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.air_pressure
+ *
+ * @return the value of weathers.air_pressure
+ *
+ * @mbg.generated
+ */
+ public Float getAirPressure() {
+ return airPressure;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.air_pressure
+ *
+ * @param airPressure the value for weathers.air_pressure
+ *
+ * @mbg.generated
+ */
+ public void setAirPressure(Float airPressure) {
+ this.airPressure = airPressure;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.precipitation
+ *
+ * @return the value of weathers.precipitation
+ *
+ * @mbg.generated
+ */
+ public Float getPrecipitation() {
+ return precipitation;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.precipitation
+ *
+ * @param precipitation the value for weathers.precipitation
+ *
+ * @mbg.generated
+ */
+ public void setPrecipitation(Float precipitation) {
+ this.precipitation = precipitation;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.precipitation_Intensity
+ *
+ * @return the value of weathers.precipitation_Intensity
+ *
+ * @mbg.generated
+ */
+ public Float getPrecipitationIntensity() {
+ return precipitationIntensity;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.precipitation_Intensity
+ *
+ * @param precipitationIntensity the value for weathers.precipitation_Intensity
+ *
+ * @mbg.generated
+ */
+ public void setPrecipitationIntensity(Float precipitationIntensity) {
+ this.precipitationIntensity = precipitationIntensity;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column weathers.radiation_Intensity
+ *
+ * @return the value of weathers.radiation_Intensity
+ *
+ * @mbg.generated
+ */
+ public Integer getRadiationIntensity() {
+ return radiationIntensity;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column weathers.radiation_Intensity
+ *
+ * @param radiationIntensity the value for weathers.radiation_Intensity
+ *
+ * @mbg.generated
+ */
+ public void setRadiationIntensity(Integer radiationIntensity) {
+ this.radiationIntensity = radiationIntensity;
+ }
+
+ private String cmdid;
+ private String phase;
+
+ public String getCmdid() {
+ return cmdid;
+ }
+
+ public void setCmdid(String cmdid) {
+ this.cmdid = cmdid;
+ }
+
+ public String getPhase() {
+ return phase;
+ }
+
+ public void setPhase(String phase) {
+ this.phase = phase;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/WeathersExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/WeathersExample.java
new file mode 100644
index 0000000..79cce49
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/WeathersExample.java
@@ -0,0 +1,1391 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WeathersExample {
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ protected String orderByClause;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ protected boolean distinct;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ protected List oredCriteria;
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public WeathersExample() {
+ oredCriteria = new ArrayList<>();
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List 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 values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List 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 andTermIdIsNull() {
+ addCriterion("term_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdIsNotNull() {
+ addCriterion("term_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdEqualTo(Integer value) {
+ addCriterion("term_id =", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdNotEqualTo(Integer value) {
+ addCriterion("term_id <>", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdGreaterThan(Integer value) {
+ addCriterion("term_id >", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+ addCriterion("term_id >=", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdLessThan(Integer value) {
+ addCriterion("term_id <", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+ addCriterion("term_id <=", value, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdIn(List values) {
+ addCriterion("term_id in", values, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdNotIn(List values) {
+ addCriterion("term_id not in", values, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdBetween(Integer value1, Integer value2) {
+ addCriterion("term_id between", value1, value2, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+ addCriterion("term_id not between", value1, value2, "termId");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIsNull() {
+ addCriterion("update_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIsNotNull() {
+ addCriterion("update_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeEqualTo(Long value) {
+ addCriterion("update_time =", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotEqualTo(Long value) {
+ addCriterion("update_time <>", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeGreaterThan(Long value) {
+ addCriterion("update_time >", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+ addCriterion("update_time >=", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeLessThan(Long value) {
+ addCriterion("update_time <", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+ addCriterion("update_time <=", value, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeIn(List values) {
+ addCriterion("update_time in", values, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotIn(List values) {
+ addCriterion("update_time not in", values, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+ addCriterion("update_time between", value1, value2, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdateTimeNotBetween(Long value1, Long value2) {
+ addCriterion("update_time not between", value1, value2, "updateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdIsNull() {
+ addCriterion("comp_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdIsNotNull() {
+ addCriterion("comp_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdEqualTo(String value) {
+ addCriterion("comp_id =", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdNotEqualTo(String value) {
+ addCriterion("comp_id <>", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdGreaterThan(String value) {
+ addCriterion("comp_id >", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdGreaterThanOrEqualTo(String value) {
+ addCriterion("comp_id >=", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdLessThan(String value) {
+ addCriterion("comp_id <", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdLessThanOrEqualTo(String value) {
+ addCriterion("comp_id <=", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdLike(String value) {
+ addCriterion("comp_id like", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdNotLike(String value) {
+ addCriterion("comp_id not like", value, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdIn(List values) {
+ addCriterion("comp_id in", values, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdNotIn(List values) {
+ addCriterion("comp_id not in", values, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdBetween(String value1, String value2) {
+ addCriterion("comp_id between", value1, value2, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andCompIdNotBetween(String value1, String value2) {
+ addCriterion("comp_id not between", value1, value2, "compId");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minIsNull() {
+ addCriterion("avg_wind_speed_10min is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minIsNotNull() {
+ addCriterion("avg_wind_speed_10min is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minEqualTo(Float value) {
+ addCriterion("avg_wind_speed_10min =", value, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minNotEqualTo(Float value) {
+ addCriterion("avg_wind_speed_10min <>", value, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minGreaterThan(Float value) {
+ addCriterion("avg_wind_speed_10min >", value, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minGreaterThanOrEqualTo(Float value) {
+ addCriterion("avg_wind_speed_10min >=", value, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minLessThan(Float value) {
+ addCriterion("avg_wind_speed_10min <", value, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minLessThanOrEqualTo(Float value) {
+ addCriterion("avg_wind_speed_10min <=", value, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minIn(List values) {
+ addCriterion("avg_wind_speed_10min in", values, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minNotIn(List values) {
+ addCriterion("avg_wind_speed_10min not in", values, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minBetween(Float value1, Float value2) {
+ addCriterion("avg_wind_speed_10min between", value1, value2, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed10minNotBetween(Float value1, Float value2) {
+ addCriterion("avg_wind_speed_10min not between", value1, value2, "avgWindSpeed10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minIsNull() {
+ addCriterion("avg_wind_dir_10min is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minIsNotNull() {
+ addCriterion("avg_wind_dir_10min is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minEqualTo(Integer value) {
+ addCriterion("avg_wind_dir_10min =", value, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minNotEqualTo(Integer value) {
+ addCriterion("avg_wind_dir_10min <>", value, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minGreaterThan(Integer value) {
+ addCriterion("avg_wind_dir_10min >", value, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minGreaterThanOrEqualTo(Integer value) {
+ addCriterion("avg_wind_dir_10min >=", value, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minLessThan(Integer value) {
+ addCriterion("avg_wind_dir_10min <", value, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minLessThanOrEqualTo(Integer value) {
+ addCriterion("avg_wind_dir_10min <=", value, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minIn(List values) {
+ addCriterion("avg_wind_dir_10min in", values, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minNotIn(List values) {
+ addCriterion("avg_wind_dir_10min not in", values, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minBetween(Integer value1, Integer value2) {
+ addCriterion("avg_wind_dir_10min between", value1, value2, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir10minNotBetween(Integer value1, Integer value2) {
+ addCriterion("avg_wind_dir_10min not between", value1, value2, "avgWindDir10min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minIsNull() {
+ addCriterion("avg_wind_speed_1min is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minIsNotNull() {
+ addCriterion("avg_wind_speed_1min is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minEqualTo(Float value) {
+ addCriterion("avg_wind_speed_1min =", value, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minNotEqualTo(Float value) {
+ addCriterion("avg_wind_speed_1min <>", value, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minGreaterThan(Float value) {
+ addCriterion("avg_wind_speed_1min >", value, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minGreaterThanOrEqualTo(Float value) {
+ addCriterion("avg_wind_speed_1min >=", value, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minLessThan(Float value) {
+ addCriterion("avg_wind_speed_1min <", value, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minLessThanOrEqualTo(Float value) {
+ addCriterion("avg_wind_speed_1min <=", value, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minIn(List values) {
+ addCriterion("avg_wind_speed_1min in", values, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minNotIn(List values) {
+ addCriterion("avg_wind_speed_1min not in", values, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minBetween(Float value1, Float value2) {
+ addCriterion("avg_wind_speed_1min between", value1, value2, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindSpeed1minNotBetween(Float value1, Float value2) {
+ addCriterion("avg_wind_speed_1min not between", value1, value2, "avgWindSpeed1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minIsNull() {
+ addCriterion("avg_wind_dir_1min is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minIsNotNull() {
+ addCriterion("avg_wind_dir_1min is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minEqualTo(Float value) {
+ addCriterion("avg_wind_dir_1min =", value, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minNotEqualTo(Float value) {
+ addCriterion("avg_wind_dir_1min <>", value, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minGreaterThan(Float value) {
+ addCriterion("avg_wind_dir_1min >", value, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minGreaterThanOrEqualTo(Float value) {
+ addCriterion("avg_wind_dir_1min >=", value, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minLessThan(Float value) {
+ addCriterion("avg_wind_dir_1min <", value, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minLessThanOrEqualTo(Float value) {
+ addCriterion("avg_wind_dir_1min <=", value, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minIn(List values) {
+ addCriterion("avg_wind_dir_1min in", values, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minNotIn(List values) {
+ addCriterion("avg_wind_dir_1min not in", values, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minBetween(Float value1, Float value2) {
+ addCriterion("avg_wind_dir_1min between", value1, value2, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvgWindDir1minNotBetween(Float value1, Float value2) {
+ addCriterion("avg_wind_dir_1min not between", value1, value2, "avgWindDir1min");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedIsNull() {
+ addCriterion("max_wind_speed is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedIsNotNull() {
+ addCriterion("max_wind_speed is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedEqualTo(Float value) {
+ addCriterion("max_wind_speed =", value, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedNotEqualTo(Float value) {
+ addCriterion("max_wind_speed <>", value, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedGreaterThan(Float value) {
+ addCriterion("max_wind_speed >", value, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedGreaterThanOrEqualTo(Float value) {
+ addCriterion("max_wind_speed >=", value, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedLessThan(Float value) {
+ addCriterion("max_wind_speed <", value, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedLessThanOrEqualTo(Float value) {
+ addCriterion("max_wind_speed <=", value, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedIn(List values) {
+ addCriterion("max_wind_speed in", values, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedNotIn(List values) {
+ addCriterion("max_wind_speed not in", values, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedBetween(Float value1, Float value2) {
+ addCriterion("max_wind_speed between", value1, value2, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andMaxWindSpeedNotBetween(Float value1, Float value2) {
+ addCriterion("max_wind_speed not between", value1, value2, "maxWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedIsNull() {
+ addCriterion("extreme_wind_speed is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedIsNotNull() {
+ addCriterion("extreme_wind_speed is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedEqualTo(Float value) {
+ addCriterion("extreme_wind_speed =", value, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedNotEqualTo(Float value) {
+ addCriterion("extreme_wind_speed <>", value, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedGreaterThan(Float value) {
+ addCriterion("extreme_wind_speed >", value, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedGreaterThanOrEqualTo(Float value) {
+ addCriterion("extreme_wind_speed >=", value, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedLessThan(Float value) {
+ addCriterion("extreme_wind_speed <", value, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedLessThanOrEqualTo(Float value) {
+ addCriterion("extreme_wind_speed <=", value, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedIn(List values) {
+ addCriterion("extreme_wind_speed in", values, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedNotIn(List values) {
+ addCriterion("extreme_wind_speed not in", values, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedBetween(Float value1, Float value2) {
+ addCriterion("extreme_wind_speed between", value1, value2, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andExtremeWindSpeedNotBetween(Float value1, Float value2) {
+ addCriterion("extreme_wind_speed not between", value1, value2, "extremeWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedIsNull() {
+ addCriterion("standard_wind_speed is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedIsNotNull() {
+ addCriterion("standard_wind_speed is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedEqualTo(Float value) {
+ addCriterion("standard_wind_speed =", value, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedNotEqualTo(Float value) {
+ addCriterion("standard_wind_speed <>", value, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedGreaterThan(Float value) {
+ addCriterion("standard_wind_speed >", value, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedGreaterThanOrEqualTo(Float value) {
+ addCriterion("standard_wind_speed >=", value, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedLessThan(Float value) {
+ addCriterion("standard_wind_speed <", value, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedLessThanOrEqualTo(Float value) {
+ addCriterion("standard_wind_speed <=", value, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedIn(List values) {
+ addCriterion("standard_wind_speed in", values, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedNotIn(List values) {
+ addCriterion("standard_wind_speed not in", values, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedBetween(Float value1, Float value2) {
+ addCriterion("standard_wind_speed between", value1, value2, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andStandardWindSpeedNotBetween(Float value1, Float value2) {
+ addCriterion("standard_wind_speed not between", value1, value2, "standardWindSpeed");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionIsNull() {
+ addCriterion("wind_direction is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionIsNotNull() {
+ addCriterion("wind_direction is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionEqualTo(Float value) {
+ addCriterion("wind_direction =", value, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionNotEqualTo(Float value) {
+ addCriterion("wind_direction <>", value, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionGreaterThan(Float value) {
+ addCriterion("wind_direction >", value, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionGreaterThanOrEqualTo(Float value) {
+ addCriterion("wind_direction >=", value, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionLessThan(Float value) {
+ addCriterion("wind_direction <", value, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionLessThanOrEqualTo(Float value) {
+ addCriterion("wind_direction <=", value, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionIn(List values) {
+ addCriterion("wind_direction in", values, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionNotIn(List values) {
+ addCriterion("wind_direction not in", values, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionBetween(Float value1, Float value2) {
+ addCriterion("wind_direction between", value1, value2, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andWindDirectionNotBetween(Float value1, Float value2) {
+ addCriterion("wind_direction not between", value1, value2, "windDirection");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureIsNull() {
+ addCriterion("air_temperature is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureIsNotNull() {
+ addCriterion("air_temperature is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureEqualTo(Float value) {
+ addCriterion("air_temperature =", value, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureNotEqualTo(Float value) {
+ addCriterion("air_temperature <>", value, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureGreaterThan(Float value) {
+ addCriterion("air_temperature >", value, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureGreaterThanOrEqualTo(Float value) {
+ addCriterion("air_temperature >=", value, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureLessThan(Float value) {
+ addCriterion("air_temperature <", value, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureLessThanOrEqualTo(Float value) {
+ addCriterion("air_temperature <=", value, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureIn(List values) {
+ addCriterion("air_temperature in", values, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureNotIn(List values) {
+ addCriterion("air_temperature not in", values, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureBetween(Float value1, Float value2) {
+ addCriterion("air_temperature between", value1, value2, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirTemperatureNotBetween(Float value1, Float value2) {
+ addCriterion("air_temperature not between", value1, value2, "airTemperature");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityIsNull() {
+ addCriterion("humidity is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityIsNotNull() {
+ addCriterion("humidity is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityEqualTo(Integer value) {
+ addCriterion("humidity =", value, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityNotEqualTo(Integer value) {
+ addCriterion("humidity <>", value, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityGreaterThan(Integer value) {
+ addCriterion("humidity >", value, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityGreaterThanOrEqualTo(Integer value) {
+ addCriterion("humidity >=", value, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityLessThan(Integer value) {
+ addCriterion("humidity <", value, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityLessThanOrEqualTo(Integer value) {
+ addCriterion("humidity <=", value, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityIn(List values) {
+ addCriterion("humidity in", values, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityNotIn(List values) {
+ addCriterion("humidity not in", values, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityBetween(Integer value1, Integer value2) {
+ addCriterion("humidity between", value1, value2, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andHumidityNotBetween(Integer value1, Integer value2) {
+ addCriterion("humidity not between", value1, value2, "humidity");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureIsNull() {
+ addCriterion("air_pressure is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureIsNotNull() {
+ addCriterion("air_pressure is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureEqualTo(Float value) {
+ addCriterion("air_pressure =", value, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureNotEqualTo(Float value) {
+ addCriterion("air_pressure <>", value, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureGreaterThan(Float value) {
+ addCriterion("air_pressure >", value, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureGreaterThanOrEqualTo(Float value) {
+ addCriterion("air_pressure >=", value, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureLessThan(Float value) {
+ addCriterion("air_pressure <", value, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureLessThanOrEqualTo(Float value) {
+ addCriterion("air_pressure <=", value, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureIn(List values) {
+ addCriterion("air_pressure in", values, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureNotIn(List values) {
+ addCriterion("air_pressure not in", values, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureBetween(Float value1, Float value2) {
+ addCriterion("air_pressure between", value1, value2, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andAirPressureNotBetween(Float value1, Float value2) {
+ addCriterion("air_pressure not between", value1, value2, "airPressure");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIsNull() {
+ addCriterion("precipitation is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIsNotNull() {
+ addCriterion("precipitation is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationEqualTo(Float value) {
+ addCriterion("precipitation =", value, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationNotEqualTo(Float value) {
+ addCriterion("precipitation <>", value, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationGreaterThan(Float value) {
+ addCriterion("precipitation >", value, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationGreaterThanOrEqualTo(Float value) {
+ addCriterion("precipitation >=", value, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationLessThan(Float value) {
+ addCriterion("precipitation <", value, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationLessThanOrEqualTo(Float value) {
+ addCriterion("precipitation <=", value, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIn(List values) {
+ addCriterion("precipitation in", values, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationNotIn(List values) {
+ addCriterion("precipitation not in", values, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationBetween(Float value1, Float value2) {
+ addCriterion("precipitation between", value1, value2, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationNotBetween(Float value1, Float value2) {
+ addCriterion("precipitation not between", value1, value2, "precipitation");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityIsNull() {
+ addCriterion("precipitation_Intensity is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityIsNotNull() {
+ addCriterion("precipitation_Intensity is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityEqualTo(Float value) {
+ addCriterion("precipitation_Intensity =", value, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityNotEqualTo(Float value) {
+ addCriterion("precipitation_Intensity <>", value, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityGreaterThan(Float value) {
+ addCriterion("precipitation_Intensity >", value, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityGreaterThanOrEqualTo(Float value) {
+ addCriterion("precipitation_Intensity >=", value, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityLessThan(Float value) {
+ addCriterion("precipitation_Intensity <", value, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityLessThanOrEqualTo(Float value) {
+ addCriterion("precipitation_Intensity <=", value, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityIn(List values) {
+ addCriterion("precipitation_Intensity in", values, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityNotIn(List values) {
+ addCriterion("precipitation_Intensity not in", values, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityBetween(Float value1, Float value2) {
+ addCriterion("precipitation_Intensity between", value1, value2, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andPrecipitationIntensityNotBetween(Float value1, Float value2) {
+ addCriterion("precipitation_Intensity not between", value1, value2, "precipitationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityIsNull() {
+ addCriterion("radiation_Intensity is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityIsNotNull() {
+ addCriterion("radiation_Intensity is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityEqualTo(Integer value) {
+ addCriterion("radiation_Intensity =", value, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityNotEqualTo(Integer value) {
+ addCriterion("radiation_Intensity <>", value, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityGreaterThan(Integer value) {
+ addCriterion("radiation_Intensity >", value, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityGreaterThanOrEqualTo(Integer value) {
+ addCriterion("radiation_Intensity >=", value, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityLessThan(Integer value) {
+ addCriterion("radiation_Intensity <", value, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityLessThanOrEqualTo(Integer value) {
+ addCriterion("radiation_Intensity <=", value, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityIn(List values) {
+ addCriterion("radiation_Intensity in", values, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityNotIn(List values) {
+ addCriterion("radiation_Intensity not in", values, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityBetween(Integer value1, Integer value2) {
+ addCriterion("radiation_Intensity between", value1, value2, "radiationIntensity");
+ return (Criteria) this;
+ }
+
+ public Criteria andRadiationIntensityNotBetween(Integer value1, Integer value2) {
+ addCriterion("radiation_Intensity not between", value1, value2, "radiationIntensity");
+ return (Criteria) this;
+ }
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table weathers
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+ public static class Criteria extends GeneratedCriteria {
+ protected Criteria() {
+ super();
+ }
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ 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);
+ }
+ }
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LeadPullsMapper.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LeadPullsMapper.java
new file mode 100644
index 0000000..9903bba
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LeadPullsMapper.java
@@ -0,0 +1,97 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.LeadPulls;
+import com.shxy.xymanager_common.entity.LeadPullsExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface LeadPullsMapper {
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ long countByExample(LeadPullsExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int deleteByExample(LeadPullsExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int deleteByPrimaryKey(Long id);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int insert(LeadPulls row);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int insertSelective(LeadPulls row);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ List selectByExample(LeadPullsExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ LeadPulls selectByPrimaryKey(Long id);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int updateByExampleSelective(@Param("row") LeadPulls row, @Param("example") LeadPullsExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int updateByExample(@Param("row") LeadPulls row, @Param("example") LeadPullsExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int updateByPrimaryKeySelective(LeadPulls row);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table lead_pulls
+ *
+ * @mbg.generated
+ */
+ int updateByPrimaryKey(LeadPulls row);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/WeathersMapper.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/WeathersMapper.java
new file mode 100644
index 0000000..0d436e2
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/WeathersMapper.java
@@ -0,0 +1,97 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.Weathers;
+import com.shxy.xymanager_common.entity.WeathersExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface WeathersMapper {
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ long countByExample(WeathersExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int deleteByExample(WeathersExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int deleteByPrimaryKey(Long id);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int insert(Weathers row);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int insertSelective(Weathers row);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ List selectByExample(WeathersExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ Weathers selectByPrimaryKey(Long id);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int updateByExampleSelective(@Param("row") Weathers row, @Param("example") WeathersExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int updateByExample(@Param("row") Weathers row, @Param("example") WeathersExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int updateByPrimaryKeySelective(Weathers row);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table weathers
+ *
+ * @mbg.generated
+ */
+ int updateByPrimaryKey(Weathers row);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/LeadPullsMapper.xml b/xymanager_dao/src/main/resources/mappers/LeadPullsMapper.xml
new file mode 100644
index 0000000..4a7ef06
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/LeadPullsMapper.xml
@@ -0,0 +1,493 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and ${criterion.condition}
+
+
+ and ${criterion.condition} #{criterion.value}
+
+
+ and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+
+
+ and ${criterion.condition}
+
+ #{listItem}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and ${criterion.condition}
+
+
+ and ${criterion.condition} #{criterion.value}
+
+
+ and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+
+
+ and ${criterion.condition}
+
+ #{listItem}
+
+
+
+
+
+
+
+
+
+
+
+ id, term_id, update_time, func_code, maxpull_pull, maxpull_wind, maxpull_tilt, minpull_pull,
+ minpull_wind, minpull_tilt, maxwind_pull, maxwind_wind, maxwind_tilt, minwind_pull,
+ minwind_wind, minwind_tilt, wid, wind_speed, create_time
+
+
+
+
+
+ delete from lead_pulls
+ where id = #{id,jdbcType=BIGINT}
+
+
+
+ delete from lead_pulls
+
+
+
+
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into lead_pulls (term_id, update_time, func_code,
+ maxpull_pull, maxpull_wind, maxpull_tilt,
+ minpull_pull, minpull_wind, minpull_tilt,
+ maxwind_pull, maxwind_wind, maxwind_tilt,
+ minwind_pull, minwind_wind, minwind_tilt,
+ wid, wind_speed, create_time
+ )
+ 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}
+ )
+
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into lead_pulls
+
+
+ term_id,
+
+
+ update_time,
+
+
+ func_code,
+
+
+ maxpull_pull,
+
+
+ maxpull_wind,
+
+
+ maxpull_tilt,
+
+
+ minpull_pull,
+
+
+ minpull_wind,
+
+
+ minpull_tilt,
+
+
+ maxwind_pull,
+
+
+ maxwind_wind,
+
+
+ maxwind_tilt,
+
+
+ minwind_pull,
+
+
+ minwind_wind,
+
+
+ minwind_tilt,
+
+
+ wid,
+
+
+ wind_speed,
+
+
+ create_time,
+
+
+
+
+ #{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},
+
+
+
+
+
+
+ update lead_pulls
+
+
+ id = #{row.id,jdbcType=BIGINT},
+
+
+ term_id = #{row.termId,jdbcType=INTEGER},
+
+
+ update_time = #{row.updateTime,jdbcType=BIGINT},
+
+
+ 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=INTEGER},
+
+
+ minpull_wind = #{row.minpullWind,jdbcType=REAL},
+
+
+ minpull_tilt = #{row.minpullTilt,jdbcType=REAL},
+
+
+ maxwind_pull = #{row.maxwindPull,jdbcType=INTEGER},
+
+
+ maxwind_wind = #{row.maxwindWind,jdbcType=REAL},
+
+
+ maxwind_tilt = #{row.maxwindTilt,jdbcType=REAL},
+
+
+ minwind_pull = #{row.minwindPull,jdbcType=INTEGER},
+
+
+ minwind_wind = #{row.minwindWind,jdbcType=REAL},
+
+
+ minwind_tilt = #{row.minwindTilt,jdbcType=REAL},
+
+
+ wid = #{row.wid,jdbcType=BIGINT},
+
+
+ wind_speed = #{row.windSpeed,jdbcType=REAL},
+
+
+ create_time = #{row.createTime,jdbcType=TIMESTAMP},
+
+
+
+
+
+
+
+
+ update lead_pulls
+ set id = #{row.id,jdbcType=BIGINT},
+ term_id = #{row.termId,jdbcType=INTEGER},
+ update_time = #{row.updateTime,jdbcType=BIGINT},
+ 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=INTEGER},
+ minpull_wind = #{row.minpullWind,jdbcType=REAL},
+ minpull_tilt = #{row.minpullTilt,jdbcType=REAL},
+ maxwind_pull = #{row.maxwindPull,jdbcType=INTEGER},
+ maxwind_wind = #{row.maxwindWind,jdbcType=REAL},
+ maxwind_tilt = #{row.maxwindTilt,jdbcType=REAL},
+ minwind_pull = #{row.minwindPull,jdbcType=INTEGER},
+ minwind_wind = #{row.minwindWind,jdbcType=REAL},
+ minwind_tilt = #{row.minwindTilt,jdbcType=REAL},
+ wid = #{row.wid,jdbcType=BIGINT},
+ wind_speed = #{row.windSpeed,jdbcType=REAL},
+ create_time = #{row.createTime,jdbcType=TIMESTAMP}
+
+
+
+
+
+
+ update lead_pulls
+
+
+ term_id = #{termId,jdbcType=INTEGER},
+
+
+ update_time = #{updateTime,jdbcType=BIGINT},
+
+
+ func_code = #{funcCode,jdbcType=INTEGER},
+
+
+ maxpull_pull = #{maxpullPull,jdbcType=INTEGER},
+
+
+ maxpull_wind = #{maxpullWind,jdbcType=REAL},
+
+
+ maxpull_tilt = #{maxpullTilt,jdbcType=REAL},
+
+
+ minpull_pull = #{minpullPull,jdbcType=INTEGER},
+
+
+ minpull_wind = #{minpullWind,jdbcType=REAL},
+
+
+ minpull_tilt = #{minpullTilt,jdbcType=REAL},
+
+
+ maxwind_pull = #{maxwindPull,jdbcType=INTEGER},
+
+
+ maxwind_wind = #{maxwindWind,jdbcType=REAL},
+
+
+ maxwind_tilt = #{maxwindTilt,jdbcType=REAL},
+
+
+ minwind_pull = #{minwindPull,jdbcType=INTEGER},
+
+
+ minwind_wind = #{minwindWind,jdbcType=REAL},
+
+
+ minwind_tilt = #{minwindTilt,jdbcType=REAL},
+
+
+ wid = #{wid,jdbcType=BIGINT},
+
+
+ wind_speed = #{windSpeed,jdbcType=REAL},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ where id = #{id,jdbcType=BIGINT}
+
+
+
+ update lead_pulls
+ set term_id = #{termId,jdbcType=INTEGER},
+ update_time = #{updateTime,jdbcType=BIGINT},
+ func_code = #{funcCode,jdbcType=INTEGER},
+ maxpull_pull = #{maxpullPull,jdbcType=INTEGER},
+ maxpull_wind = #{maxpullWind,jdbcType=REAL},
+ maxpull_tilt = #{maxpullTilt,jdbcType=REAL},
+ minpull_pull = #{minpullPull,jdbcType=INTEGER},
+ minpull_wind = #{minpullWind,jdbcType=REAL},
+ minpull_tilt = #{minpullTilt,jdbcType=REAL},
+ maxwind_pull = #{maxwindPull,jdbcType=INTEGER},
+ maxwind_wind = #{maxwindWind,jdbcType=REAL},
+ maxwind_tilt = #{maxwindTilt,jdbcType=REAL},
+ minwind_pull = #{minwindPull,jdbcType=INTEGER},
+ minwind_wind = #{minwindWind,jdbcType=REAL},
+ minwind_tilt = #{minwindTilt,jdbcType=REAL},
+ wid = #{wid,jdbcType=BIGINT},
+ wind_speed = #{windSpeed,jdbcType=REAL},
+ create_time = #{createTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TbRoleMapper.xml b/xymanager_dao/src/main/resources/mappers/TbRoleMapper.xml
index 267682b..77670a5 100644
--- a/xymanager_dao/src/main/resources/mappers/TbRoleMapper.xml
+++ b/xymanager_dao/src/main/resources/mappers/TbRoleMapper.xml
@@ -8,6 +8,7 @@
-->
+
@@ -81,7 +82,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
- id, `name`, create_time
+ id, `name`, `desc`, create_time