修改配置信息和多适配器切换

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/file/ExcelExport.java

@@ -238,8 +238,8 @@ public final class ExcelExport {
 
         if(StringUtils.notEmp(filename))
         {
-            StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
-//            StringBuilder sb=new StringBuilder("d:\\");
+ //           StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
+            StringBuilder sb=new StringBuilder("d:\\");
             sb.append(filename);
             sb.append(".xls");
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/goodness/WindturbineGoodnessDetailController.java

@@ -33,11 +33,10 @@ public class WindturbineGoodnessDetailController {
     private WindturbinegoodnessService windturbinegoodnessService;
     @Resource
     private InputoroutputspeedtotalService inputoroutputspeedtotalServicenegoodnessService;
-//    @Resource
-//    private WarningRecordsService warningRecordsService;
     @Resource
     private AlarmsnapService alarmsnapService;
-
+    @Resource
+    private WarningRecordsService warningRecordsService;
     @Resource
     private Brownoutsevent2Service brownoutsevent2Service;
     @Resource
@@ -173,7 +172,10 @@ public class WindturbineGoodnessDetailController {
             Date beginDate = cal.getTime();
             cal.add(Calendar.DAY_OF_MONTH, 1);
             Date endDate = cal.getTime();
-           resultList = alarmsnapService.getWarningRecordsTop(tablepar, wtId, beginDate, endDate);
+//           resultList = alarmsnapService.getWarningRecordsTop(tablepar, wtId, beginDate, endDate);
+
+            resultList = warningRecordsService.getWarningRecordsTop5(tablepar, wtId, beginDate, endDate);
+
 
         }
         if (resultList != null) {

web/monitor-web-sxjn/src/main/java/com/gyee/frame/mapper/auto/CombinerBoxMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.CombinerBox;
+import com.gyee.frame.model.auto.CombinerBoxExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CombinerBoxMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    long countByExample(CombinerBoxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CombinerBoxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int insert(CombinerBox record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CombinerBox record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    List<CombinerBox> selectByExample(CombinerBoxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    CombinerBox selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CombinerBox record, @Param("example") CombinerBoxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CombinerBox record, @Param("example") CombinerBoxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CombinerBox record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CombinerBox record);
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/mapper/auto/CombinerBoxStandardpointMapper.java

@@ -0,0 +1,64 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.CombinerBoxStandardpoint;
+import com.gyee.frame.model.auto.CombinerBoxStandardpointExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CombinerBoxStandardpointMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    long countByExample(CombinerBoxStandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CombinerBoxStandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int insert(CombinerBoxStandardpoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CombinerBoxStandardpoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    List<CombinerBoxStandardpoint> selectByExample(CombinerBoxStandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CombinerBoxStandardpoint record, @Param("example") CombinerBoxStandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CombinerBoxStandardpoint record, @Param("example") CombinerBoxStandardpointExample example);
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/mapper/auto/CombinerBoxTestingPointNEWMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.CombinerBoxTestingPointNEW;
+import com.gyee.frame.model.auto.CombinerBoxTestingPointNEWExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CombinerBoxTestingPointNEWMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    long countByExample(CombinerBoxTestingPointNEWExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CombinerBoxTestingPointNEWExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int insert(CombinerBoxTestingPointNEW record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CombinerBoxTestingPointNEW record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    List<CombinerBoxTestingPointNEW> selectByExample(CombinerBoxTestingPointNEWExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    CombinerBoxTestingPointNEW selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CombinerBoxTestingPointNEW record, @Param("example") CombinerBoxTestingPointNEWExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CombinerBoxTestingPointNEW record, @Param("example") CombinerBoxTestingPointNEWExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CombinerBoxTestingPointNEW record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CombinerBoxTestingPointNEW record);
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CombinerBox.java

@@ -0,0 +1,477 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CombinerBox implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.CODE
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.LONGITUDE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal longitude;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.LATITUDE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal latitude;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.MODELID
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.STATUS
+     *
+     * @mbg.generated
+     */
+    private String status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.PROJECTID
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.LINEID
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.FIRSTINTEGRATEDTIME
+     *
+     * @mbg.generated
+     */
+    private Date firstintegratedtime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.PHOTO
+     *
+     * @mbg.generated
+     */
+    private String photo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOX.STANDARDID
+     *
+     * @mbg.generated
+     */
+    private String standardid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table COMBINERBOX
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.ID
+     *
+     * @return the value of COMBINERBOX.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.ID
+     *
+     * @param id the value for COMBINERBOX.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.CODE
+     *
+     * @return the value of COMBINERBOX.CODE
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.CODE
+     *
+     * @param code the value for COMBINERBOX.CODE
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.WINDPOWERSTATIONID
+     *
+     * @return the value of COMBINERBOX.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.WINDPOWERSTATIONID
+     *
+     * @param windpowerstationid the value for COMBINERBOX.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.LONGITUDE
+     *
+     * @return the value of COMBINERBOX.LONGITUDE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.LONGITUDE
+     *
+     * @param longitude the value for COMBINERBOX.LONGITUDE
+     *
+     * @mbg.generated
+     */
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.LATITUDE
+     *
+     * @return the value of COMBINERBOX.LATITUDE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.LATITUDE
+     *
+     * @param latitude the value for COMBINERBOX.LATITUDE
+     *
+     * @mbg.generated
+     */
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.MODELID
+     *
+     * @return the value of COMBINERBOX.MODELID
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.MODELID
+     *
+     * @param modelid the value for COMBINERBOX.MODELID
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.STATUS
+     *
+     * @return the value of COMBINERBOX.STATUS
+     *
+     * @mbg.generated
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.STATUS
+     *
+     * @param status the value for COMBINERBOX.STATUS
+     *
+     * @mbg.generated
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.WINDTURBINEID
+     *
+     * @return the value of COMBINERBOX.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.WINDTURBINEID
+     *
+     * @param windturbineid the value for COMBINERBOX.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    public void setWindturbineid(String windturbineid) {
+        this.windturbineid = windturbineid == null ? null : windturbineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.PROJECTID
+     *
+     * @return the value of COMBINERBOX.PROJECTID
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.PROJECTID
+     *
+     * @param projectid the value for COMBINERBOX.PROJECTID
+     *
+     * @mbg.generated
+     */
+    public void setProjectid(String projectid) {
+        this.projectid = projectid == null ? null : projectid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.LINEID
+     *
+     * @return the value of COMBINERBOX.LINEID
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.LINEID
+     *
+     * @param lineid the value for COMBINERBOX.LINEID
+     *
+     * @mbg.generated
+     */
+    public void setLineid(String lineid) {
+        this.lineid = lineid == null ? null : lineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.FIRSTINTEGRATEDTIME
+     *
+     * @return the value of COMBINERBOX.FIRSTINTEGRATEDTIME
+     *
+     * @mbg.generated
+     */
+    public Date getFirstintegratedtime() {
+        return firstintegratedtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.FIRSTINTEGRATEDTIME
+     *
+     * @param firstintegratedtime the value for COMBINERBOX.FIRSTINTEGRATEDTIME
+     *
+     * @mbg.generated
+     */
+    public void setFirstintegratedtime(Date firstintegratedtime) {
+        this.firstintegratedtime = firstintegratedtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.PHOTO
+     *
+     * @return the value of COMBINERBOX.PHOTO
+     *
+     * @mbg.generated
+     */
+    public String getPhoto() {
+        return photo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.PHOTO
+     *
+     * @param photo the value for COMBINERBOX.PHOTO
+     *
+     * @mbg.generated
+     */
+    public void setPhoto(String photo) {
+        this.photo = photo == null ? null : photo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.NAME
+     *
+     * @return the value of COMBINERBOX.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.NAME
+     *
+     * @param name the value for COMBINERBOX.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOX.STANDARDID
+     *
+     * @return the value of COMBINERBOX.STANDARDID
+     *
+     * @mbg.generated
+     */
+    public String getStandardid() {
+        return standardid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOX.STANDARDID
+     *
+     * @param standardid the value for COMBINERBOX.STANDARDID
+     *
+     * @mbg.generated
+     */
+    public void setStandardid(String standardid) {
+        this.standardid = standardid == null ? null : standardid.trim();
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CombinerBoxStandardpoint.java

@@ -0,0 +1,178 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class CombinerBoxStandardpoint implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXSTANDARDPOINT.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXSTANDARDPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXSTANDARDPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXSTANDARDPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXSTANDARDPOINT.ORDERNUM
+     *
+     * @mbg.generated
+     */
+    private String ordernum;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXSTANDARDPOINT.ID
+     *
+     * @return the value of COMBINERBOXSTANDARDPOINT.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXSTANDARDPOINT.ID
+     *
+     * @param id the value for COMBINERBOXSTANDARDPOINT.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXSTANDARDPOINT.CODE
+     *
+     * @return the value of COMBINERBOXSTANDARDPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXSTANDARDPOINT.CODE
+     *
+     * @param code the value for COMBINERBOXSTANDARDPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXSTANDARDPOINT.NAME
+     *
+     * @return the value of COMBINERBOXSTANDARDPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXSTANDARDPOINT.NAME
+     *
+     * @param name the value for COMBINERBOXSTANDARDPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXSTANDARDPOINT.UNIFORMCODE
+     *
+     * @return the value of COMBINERBOXSTANDARDPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXSTANDARDPOINT.UNIFORMCODE
+     *
+     * @param uniformcode the value for COMBINERBOXSTANDARDPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXSTANDARDPOINT.ORDERNUM
+     *
+     * @return the value of COMBINERBOXSTANDARDPOINT.ORDERNUM
+     *
+     * @mbg.generated
+     */
+    public String getOrdernum() {
+        return ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXSTANDARDPOINT.ORDERNUM
+     *
+     * @param ordernum the value for COMBINERBOXSTANDARDPOINT.ORDERNUM
+     *
+     * @mbg.generated
+     */
+    public void setOrdernum(String ordernum) {
+        this.ordernum = ordernum == null ? null : ordernum.trim();
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CombinerBoxStandardpointExample.java

@@ -0,0 +1,652 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CombinerBoxStandardpointExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public CombinerBoxStandardpointExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @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 COMBINERBOXSTANDARDPOINT
+     *
+     * @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 COMBINERBOXSTANDARDPOINT
+     *
+     * @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 COMBINERBOXSTANDARDPOINT
+     *
+     * @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 COMBINERBOXSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("CODE =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("CODE <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("CODE >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("CODE <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("CODE <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("CODE like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("CODE not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("CODE in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("CODE not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("CODE between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("CODE not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNull() {
+            addCriterion("UNIFORMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNotNull() {
+            addCriterion("UNIFORMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeEqualTo(String value) {
+            addCriterion("UNIFORMCODE =", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotEqualTo(String value) {
+            addCriterion("UNIFORMCODE <>", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThan(String value) {
+            addCriterion("UNIFORMCODE >", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("UNIFORMCODE >=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThan(String value) {
+            addCriterion("UNIFORMCODE <", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThanOrEqualTo(String value) {
+            addCriterion("UNIFORMCODE <=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLike(String value) {
+            addCriterion("UNIFORMCODE like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotLike(String value) {
+            addCriterion("UNIFORMCODE not like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIn(List<String> values) {
+            addCriterion("UNIFORMCODE in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotIn(List<String> values) {
+            addCriterion("UNIFORMCODE not in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeBetween(String value1, String value2) {
+            addCriterion("UNIFORMCODE between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotBetween(String value1, String value2) {
+            addCriterion("UNIFORMCODE not between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumIsNull() {
+            addCriterion("ORDERNUM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumIsNotNull() {
+            addCriterion("ORDERNUM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumEqualTo(String value) {
+            addCriterion("ORDERNUM =", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotEqualTo(String value) {
+            addCriterion("ORDERNUM <>", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumGreaterThan(String value) {
+            addCriterion("ORDERNUM >", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumGreaterThanOrEqualTo(String value) {
+            addCriterion("ORDERNUM >=", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumLessThan(String value) {
+            addCriterion("ORDERNUM <", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumLessThanOrEqualTo(String value) {
+            addCriterion("ORDERNUM <=", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumLike(String value) {
+            addCriterion("ORDERNUM like", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotLike(String value) {
+            addCriterion("ORDERNUM not like", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumIn(List<String> values) {
+            addCriterion("ORDERNUM in", values, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotIn(List<String> values) {
+            addCriterion("ORDERNUM not in", values, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumBetween(String value1, String value2) {
+            addCriterion("ORDERNUM between", value1, value2, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotBetween(String value1, String value2) {
+            addCriterion("ORDERNUM not between", value1, value2, "ordernum");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table COMBINERBOXSTANDARDPOINT
+     *
+     * @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 COMBINERBOXSTANDARDPOINT
+     *
+     * @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);
+        }
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CombinerBoxTestingPointNEW.java

@@ -0,0 +1,641 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class CombinerBoxTestingPointNEW implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.CODE
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.MODEL
+     *
+     * @mbg.generated
+     */
+    private String model;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.VALUEUNIT
+     *
+     * @mbg.generated
+     */
+    private String valueunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.ENGLISHNAME
+     *
+     * @mbg.generated
+     */
+    private String englishname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.TYPEID
+     *
+     * @mbg.generated
+     */
+    private String typeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.MODELID
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.MAXVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal maxval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.MINVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal minval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.REASONABLEMAXVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal reasonablemaxval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.REASONABLEMINVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal reasonableminval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.COMBINERBOXID
+     *
+     * @mbg.generated
+     */
+    private String combinerboxid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.SHORTID
+     *
+     * @mbg.generated
+     */
+    private String shortid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.LONGID
+     *
+     * @mbg.generated
+     */
+    private String longid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column COMBINERBOXTESTINGPOINTNEW.REALTIMEID
+     *
+     * @mbg.generated
+     */
+    private String realtimeid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table COMBINERBOXTESTINGPOINTNEW
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.ID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.ID
+     *
+     * @param id the value for COMBINERBOXTESTINGPOINTNEW.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.CODE
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.CODE
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.CODE
+     *
+     * @param code the value for COMBINERBOXTESTINGPOINTNEW.CODE
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.NAME
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.NAME
+     *
+     * @param name the value for COMBINERBOXTESTINGPOINTNEW.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.MODEL
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.MODEL
+     *
+     * @mbg.generated
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.MODEL
+     *
+     * @param model the value for COMBINERBOXTESTINGPOINTNEW.MODEL
+     *
+     * @mbg.generated
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.VALUEUNIT
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.VALUEUNIT
+     *
+     * @mbg.generated
+     */
+    public String getValueunit() {
+        return valueunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.VALUEUNIT
+     *
+     * @param valueunit the value for COMBINERBOXTESTINGPOINTNEW.VALUEUNIT
+     *
+     * @mbg.generated
+     */
+    public void setValueunit(String valueunit) {
+        this.valueunit = valueunit == null ? null : valueunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.ENGLISHNAME
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.ENGLISHNAME
+     *
+     * @mbg.generated
+     */
+    public String getEnglishname() {
+        return englishname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.ENGLISHNAME
+     *
+     * @param englishname the value for COMBINERBOXTESTINGPOINTNEW.ENGLISHNAME
+     *
+     * @mbg.generated
+     */
+    public void setEnglishname(String englishname) {
+        this.englishname = englishname == null ? null : englishname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.TYPEID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.TYPEID
+     *
+     * @mbg.generated
+     */
+    public String getTypeid() {
+        return typeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.TYPEID
+     *
+     * @param typeid the value for COMBINERBOXTESTINGPOINTNEW.TYPEID
+     *
+     * @mbg.generated
+     */
+    public void setTypeid(String typeid) {
+        this.typeid = typeid == null ? null : typeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.MODELID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.MODELID
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.MODELID
+     *
+     * @param modelid the value for COMBINERBOXTESTINGPOINTNEW.MODELID
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.MAXVAL
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.MAXVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMaxval() {
+        return maxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.MAXVAL
+     *
+     * @param maxval the value for COMBINERBOXTESTINGPOINTNEW.MAXVAL
+     *
+     * @mbg.generated
+     */
+    public void setMaxval(BigDecimal maxval) {
+        this.maxval = maxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.MINVAL
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.MINVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMinval() {
+        return minval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.MINVAL
+     *
+     * @param minval the value for COMBINERBOXTESTINGPOINTNEW.MINVAL
+     *
+     * @mbg.generated
+     */
+    public void setMinval(BigDecimal minval) {
+        this.minval = minval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.REASONABLEMAXVAL
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.REASONABLEMAXVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getReasonablemaxval() {
+        return reasonablemaxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.REASONABLEMAXVAL
+     *
+     * @param reasonablemaxval the value for COMBINERBOXTESTINGPOINTNEW.REASONABLEMAXVAL
+     *
+     * @mbg.generated
+     */
+    public void setReasonablemaxval(BigDecimal reasonablemaxval) {
+        this.reasonablemaxval = reasonablemaxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.REASONABLEMINVAL
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.REASONABLEMINVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getReasonableminval() {
+        return reasonableminval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.REASONABLEMINVAL
+     *
+     * @param reasonableminval the value for COMBINERBOXTESTINGPOINTNEW.REASONABLEMINVAL
+     *
+     * @mbg.generated
+     */
+    public void setReasonableminval(BigDecimal reasonableminval) {
+        this.reasonableminval = reasonableminval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.COMBINERBOXID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.COMBINERBOXID
+     *
+     * @mbg.generated
+     */
+    public String getCombinerboxid() {
+        return combinerboxid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.COMBINERBOXID
+     *
+     * @param combinerboxid the value for COMBINERBOXTESTINGPOINTNEW.COMBINERBOXID
+     *
+     * @mbg.generated
+     */
+    public void setCombinerboxid(String combinerboxid) {
+        this.combinerboxid = combinerboxid == null ? null : combinerboxid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.WINDTURBINEID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.WINDTURBINEID
+     *
+     * @param windturbineid the value for COMBINERBOXTESTINGPOINTNEW.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    public void setWindturbineid(String windturbineid) {
+        this.windturbineid = windturbineid == null ? null : windturbineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.UNIFORMCODE
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.UNIFORMCODE
+     *
+     * @param uniformcode the value for COMBINERBOXTESTINGPOINTNEW.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.SHORTID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.SHORTID
+     *
+     * @mbg.generated
+     */
+    public String getShortid() {
+        return shortid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.SHORTID
+     *
+     * @param shortid the value for COMBINERBOXTESTINGPOINTNEW.SHORTID
+     *
+     * @mbg.generated
+     */
+    public void setShortid(String shortid) {
+        this.shortid = shortid == null ? null : shortid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.LONGID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.LONGID
+     *
+     * @mbg.generated
+     */
+    public String getLongid() {
+        return longid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.LONGID
+     *
+     * @param longid the value for COMBINERBOXTESTINGPOINTNEW.LONGID
+     *
+     * @mbg.generated
+     */
+    public void setLongid(String longid) {
+        this.longid = longid == null ? null : longid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.WINDPOWERSTATIONID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.WINDPOWERSTATIONID
+     *
+     * @param windpowerstationid the value for COMBINERBOXTESTINGPOINTNEW.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column COMBINERBOXTESTINGPOINTNEW.REALTIMEID
+     *
+     * @return the value of COMBINERBOXTESTINGPOINTNEW.REALTIMEID
+     *
+     * @mbg.generated
+     */
+    public String getRealtimeid() {
+        return realtimeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column COMBINERBOXTESTINGPOINTNEW.REALTIMEID
+     *
+     * @param realtimeid the value for COMBINERBOXTESTINGPOINTNEW.REALTIMEID
+     *
+     * @mbg.generated
+     */
+    public void setRealtimeid(String realtimeid) {
+        this.realtimeid = realtimeid == null ? null : realtimeid.trim();
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/initialpoint/InitialPointGoldenService.java

@@ -532,7 +532,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             temp=ln.getId().substring(0,ln.getId().lastIndexOf("_"));
                             sb.append("L").append(Integer.valueOf(temp.substring(temp.length()-2))).append("_");
                             sb.append("XXX_");
-                            sb.append(CI);
+//                            sb.append(CI);
                         }else   if(wp.getId().endsWith("GDC"))
                         {
                             sba.append(temp).append("GF");
@@ -542,7 +542,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             temp=ln.getId().substring(0,ln.getId().lastIndexOf("_"));
                             sb.append("L").append(Integer.valueOf(temp.substring(temp.length()-2))).append("_");
                             sb.append("XXX_");
-                            sb.append(CI);
+//                            sb.append(CI);
                         }
 
                         sb.append(CI);

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/MatrixDetialPushService.java

@@ -317,12 +317,7 @@ public class MatrixDetialPushService {
                 //功率
                 fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
 
-                //风机转数
-                if (wt.getWindpowerstationid().equals("QS_FDC")) {
-                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.QSTPOINT_WT_FDJZS).getCode());
-                } else {
-                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getCode());
-                }
+                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.QSTPOINT_WT_FDJZS).getCode());
 
 
             }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/MatrixPushService.java

@@ -243,9 +243,9 @@ public class MatrixPushService {
 
 
                     double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
-//                    if (fjzt == 6) {
-//                        slts++;
-//                    }
+                    if (fjzt == 6) {
+                        slts++;
+                    }
                     vo.setFjzt(fjzt);
                     vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
                     vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java

@@ -7,7 +7,6 @@ import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.PointData;
-import com.gyee.frame.model.custom.SawVo;
 import com.gyee.frame.service.*;
 import com.gyee.frame.util.*;
 import org.apache.commons.compress.utils.Lists;
@@ -930,21 +929,21 @@ public class WtInfoPushService {
                 gxkmap.put("ytjxs", 0.0);
             }
 
-//            WarningRecords warningRecords= warningRecordsService.getWarningRecords(id);
-//
-//            if(null !=warningRecords && null !=warningRecords.getWarningid() && InitialRunner.warningmap.containsKey(warningRecords.getWarningid()))
-//            {
-//                Warning2 warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
-//                gxkmap.put("bjmc", warning2.getChinesetext());
-//                gxkmap.put("bjsj", DateUtils.formatDateTime(warningRecords.getWarningtime()));
-//            }
+            WarningRecords warningRecords= warningRecordsService.getWarningRecords(id);
 
-            List<SawVo> ls=alarmsnapService.getWarningRecordsList(id);
-            if(!ls.isEmpty())
+            if(null !=warningRecords && null !=warningRecords.getWarningid() && InitialRunner.warningmap.containsKey(warningRecords.getWarningid()))
             {
-                gxkmap.put("bjmc", ls.get(0).getName());
-                gxkmap.put("bjsj", DateUtils.formatDateTime(ls.get(0).getTime()));
+                Warning2 warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
+                gxkmap.put("bjmc", warning2.getChinesetext());
+                gxkmap.put("bjsj", DateUtils.formatDateTime(warningRecords.getWarningtime()));
             }
+
+//            List<SawVo> ls=alarmsnapService.getWarningRecordsList(id);
+//            if(!ls.isEmpty())
+//            {
+//                gxkmap.put("bjmc", ls.get(0).getName());
+//                gxkmap.put("bjsj", DateUtils.formatDateTime(ls.get(0).getTime()));
+//            }
             map.put("gxkmap", gxkmap);
 
 /*************************************************关系库指标**************************************************************/
@@ -1171,11 +1170,11 @@ public class WtInfoPushService {
 				String[] codeName[] = { 
 						{ "JSSSFS", "光照强度"}, 
 						{ "AI130", "有功功率"}, 
-						{ "AI067", "功率因数"}, 
+						{ "AI067", "功率因数"},
 						{ "AIG071", "机内温度"}, 
 						{ "AIG072", "逆变效率" }, 
 						{ "AI130", "功率"},
-						{ "AIG104", "功率因数" }, 
+						{ "AI067", "功率因数" },
 						{ "RFDL", "日发电量" }, 
 						{ "YFDL", "月发电量" }, 
 						{ "NFDL", "年发电量" }, 
@@ -1268,16 +1267,16 @@ public class WtInfoPushService {
 						{"AIG081", "直流电压","V"},
 						{"AIG060", "交流电流","A"},
 						{"AIG078", "直流电流","A"},
-						{"AIG073", "电网频率","Hz"},
+						{"AI068", "电网频率","Hz"},
 						{"AI130", "功率","W"},
-						{"AIG104", "功率因数",""},
+						{"AI067", "功率因数",""},
 						{"RFDL", "日发电量","kwh"},//TODO 疑似 各厂发电量单位不統一
 						{"YFDL", "月发电量","kwh"},
 						{"NFDL", "年发电量","kwh"},
 						{"AIG064", "累计发电量","kwh"},
 						{"AIG071", "逆变器温度","℃"},
 						{"AIG072", "效率",""},
-						{"eyht", "累计二氧化碳减排量","kg"}
+						{"AI962", "累计二氧化碳减排量","kg"}
 				};
 				// 遍历定义码，获取测点Id集合
 				Map<String, String> pointUniformMap = Maps.newHashMap();

web/monitor-web-sxjn/src/main/resources/application-hf.yml

@@ -26,7 +26,7 @@ gyee:
   #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
   rollVerification: true
   #实时数据库Url
-  baseurl: http://192.168.56.1:8011/ts
+  baseurl: http://10.0.118.73:8011/ts
 
   #API访问ip
   #swaggerip: 49.4.50.80:8082
@@ -35,7 +35,7 @@ gyee:
   digit: 2
   realtimedataBase: golden #数据查询模式 golden、hwy
   #weatherurl: http://123.60.213.70:7011
-  weatherurl: http://192.168.56.1:7011
+  weatherurl: http://10.0.118.73:7011
   #weatherurl: http://10.83.68.97:7011
   weatherqygs: hb_qygs
   hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}

web/monitor-web-sxjn/src/main/resources/application-jn.yml

@@ -113,10 +113,10 @@ spring :
         driver-class-name: org.postgresql.Driver
       #备数据源 #关闭
       slave:
-#        enabled: false
-#        url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
-#        username: root
-#        password: root
+        enabled: false
+        url: jdbc:mysql://localhost:3306/nacos_config?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+        username: root
+        password: Gyee123
         #两票数据源
       ticket:
 #        url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew

web/monitor-web-sxjn/src/main/resources/application.yml

@@ -1,7 +1,6 @@
-spring :
-  # 环境 dev|test|prod
-  profiles :
-    active : jn
+spring:
+  profiles:
+    active: jn
 
 
 asyncThreadPool:

web/monitor-web-sxjn/src/main/resources/mybatis-generator.xml

@@ -117,7 +117,10 @@
 <!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
-        <table tableName='t_sys_user' domainObjectName='TsysUser'/>
+        <table tableName='CombinerBox' domainObjectName='CombinerBox'/>
+        <table tableName='CombinerBoxSTANDARDPOINT' domainObjectName='CombinerBoxStandardpoint'/>
+        <table tableName='PHOTOVOLTAICSTANDARDPOINT' domainObjectName='PhotovoltaicStandardPoint'/>
+        <table tableName='CombinerBoxTESTINGPOINTNEW' domainObjectName='CombinerBoxTestingPointNEW'/>
 
 
     </context>

web/monitor-web-sxjn/src/main/resources/mybatis/auto/CombinerBoxMapper.xml

@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.CombinerBoxMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.CombinerBox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="WINDPOWERSTATIONID" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="LONGITUDE" jdbcType="DECIMAL" property="longitude" />
+    <result column="LATITUDE" jdbcType="DECIMAL" property="latitude" />
+    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
+    <result column="STATUS" jdbcType="VARCHAR" property="status" />
+    <result column="WINDTURBINEID" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="PROJECTID" jdbcType="VARCHAR" property="projectid" />
+    <result column="LINEID" jdbcType="VARCHAR" property="lineid" />
+    <result column="FIRSTINTEGRATEDTIME" jdbcType="TIMESTAMP" property="firstintegratedtime" />
+    <result column="PHOTO" jdbcType="VARCHAR" property="photo" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="STANDARDID" jdbcType="VARCHAR" property="standardid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, CODE, WINDPOWERSTATIONID, LONGITUDE, LATITUDE, MODELID, STATUS, WINDTURBINEID, 
+    PROJECTID, LINEID, FIRSTINTEGRATEDTIME, PHOTO, NAME, STANDARDID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from COMBINERBOX
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from COMBINERBOX
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from COMBINERBOX
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from COMBINERBOX
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.CombinerBox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into COMBINERBOX (ID, CODE, WINDPOWERSTATIONID, 
+      LONGITUDE, LATITUDE, MODELID, 
+      STATUS, WINDTURBINEID, PROJECTID, 
+      LINEID, FIRSTINTEGRATEDTIME, PHOTO, 
+      NAME, STANDARDID)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
+      #{longitude,jdbcType=DECIMAL}, #{latitude,jdbcType=DECIMAL}, #{modelid,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{windturbineid,jdbcType=VARCHAR}, #{projectid,jdbcType=VARCHAR}, 
+      #{lineid,jdbcType=VARCHAR}, #{firstintegratedtime,jdbcType=TIMESTAMP}, #{photo,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{standardid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.CombinerBox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into COMBINERBOX
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="code != null">
+        CODE,
+      </if>
+      <if test="windpowerstationid != null">
+        WINDPOWERSTATIONID,
+      </if>
+      <if test="longitude != null">
+        LONGITUDE,
+      </if>
+      <if test="latitude != null">
+        LATITUDE,
+      </if>
+      <if test="modelid != null">
+        MODELID,
+      </if>
+      <if test="status != null">
+        STATUS,
+      </if>
+      <if test="windturbineid != null">
+        WINDTURBINEID,
+      </if>
+      <if test="projectid != null">
+        PROJECTID,
+      </if>
+      <if test="lineid != null">
+        LINEID,
+      </if>
+      <if test="firstintegratedtime != null">
+        FIRSTINTEGRATEDTIME,
+      </if>
+      <if test="photo != null">
+        PHOTO,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="standardid != null">
+        STANDARDID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null">
+        #{longitude,jdbcType=DECIMAL},
+      </if>
+      <if test="latitude != null">
+        #{latitude,jdbcType=DECIMAL},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="firstintegratedtime != null">
+        #{firstintegratedtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="photo != null">
+        #{photo,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="standardid != null">
+        #{standardid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from COMBINERBOX
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOX
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.longitude != null">
+        LONGITUDE = #{record.longitude,jdbcType=DECIMAL},
+      </if>
+      <if test="record.latitude != null">
+        LATITUDE = #{record.latitude,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modelid != null">
+        MODELID = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        STATUS = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windturbineid != null">
+        WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        PROJECTID = #{record.projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lineid != null">
+        LINEID = #{record.lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.firstintegratedtime != null">
+        FIRSTINTEGRATEDTIME = #{record.firstintegratedtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.photo != null">
+        PHOTO = #{record.photo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.standardid != null">
+        STANDARDID = #{record.standardid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOX
+    set ID = #{record.id,jdbcType=VARCHAR},
+      CODE = #{record.code,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
+      LONGITUDE = #{record.longitude,jdbcType=DECIMAL},
+      LATITUDE = #{record.latitude,jdbcType=DECIMAL},
+      MODELID = #{record.modelid,jdbcType=VARCHAR},
+      STATUS = #{record.status,jdbcType=VARCHAR},
+      WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      PROJECTID = #{record.projectid,jdbcType=VARCHAR},
+      LINEID = #{record.lineid,jdbcType=VARCHAR},
+      FIRSTINTEGRATEDTIME = #{record.firstintegratedtime,jdbcType=TIMESTAMP},
+      PHOTO = #{record.photo,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      STANDARDID = #{record.standardid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.CombinerBox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOX
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null">
+        LONGITUDE = #{longitude,jdbcType=DECIMAL},
+      </if>
+      <if test="latitude != null">
+        LATITUDE = #{latitude,jdbcType=DECIMAL},
+      </if>
+      <if test="modelid != null">
+        MODELID = #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        STATUS = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbineid != null">
+        WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        PROJECTID = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        LINEID = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="firstintegratedtime != null">
+        FIRSTINTEGRATEDTIME = #{firstintegratedtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="photo != null">
+        PHOTO = #{photo,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="standardid != null">
+        STANDARDID = #{standardid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.CombinerBox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOX
+    set CODE = #{code,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      LONGITUDE = #{longitude,jdbcType=DECIMAL},
+      LATITUDE = #{latitude,jdbcType=DECIMAL},
+      MODELID = #{modelid,jdbcType=VARCHAR},
+      STATUS = #{status,jdbcType=VARCHAR},
+      WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      PROJECTID = #{projectid,jdbcType=VARCHAR},
+      LINEID = #{lineid,jdbcType=VARCHAR},
+      FIRSTINTEGRATEDTIME = #{firstintegratedtime,jdbcType=TIMESTAMP},
+      PHOTO = #{photo,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      STANDARDID = #{standardid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/monitor-web-sxjn/src/main/resources/mybatis/auto/CombinerBoxStandardpointMapper.xml

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.CombinerBoxStandardpointMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.CombinerBoxStandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="UNIFORMCODE" jdbcType="VARCHAR" property="uniformcode" />
+    <result column="ORDERNUM" jdbcType="VARCHAR" property="ordernum" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, CODE, NAME, UNIFORMCODE, ORDERNUM
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxStandardpointExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from COMBINERBOXSTANDARDPOINT
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxStandardpointExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from COMBINERBOXSTANDARDPOINT
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.CombinerBoxStandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into COMBINERBOXSTANDARDPOINT (ID, CODE, NAME, 
+      UNIFORMCODE, ORDERNUM)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{uniformcode,jdbcType=VARCHAR}, #{ordernum,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.CombinerBoxStandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into COMBINERBOXSTANDARDPOINT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="code != null">
+        CODE,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE,
+      </if>
+      <if test="ordernum != null">
+        ORDERNUM,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxStandardpointExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from COMBINERBOXSTANDARDPOINT
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOXSTANDARDPOINT
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uniformcode != null">
+        UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ordernum != null">
+        ORDERNUM = #{record.ordernum,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOXSTANDARDPOINT
+    set ID = #{record.id,jdbcType=VARCHAR},
+      CODE = #{record.code,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      ORDERNUM = #{record.ordernum,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

web/monitor-web-sxjn/src/main/resources/mybatis/auto/CombinerBoxTestingPointNEWMapper.xml

@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.CombinerBoxTestingPointNEWMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.CombinerBoxTestingPointNEW">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="MODEL" jdbcType="VARCHAR" property="model" />
+    <result column="VALUEUNIT" jdbcType="VARCHAR" property="valueunit" />
+    <result column="ENGLISHNAME" jdbcType="VARCHAR" property="englishname" />
+    <result column="TYPEID" jdbcType="VARCHAR" property="typeid" />
+    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
+    <result column="MAXVAL" jdbcType="DECIMAL" property="maxval" />
+    <result column="MINVAL" jdbcType="DECIMAL" property="minval" />
+    <result column="REASONABLEMAXVAL" jdbcType="DECIMAL" property="reasonablemaxval" />
+    <result column="REASONABLEMINVAL" jdbcType="DECIMAL" property="reasonableminval" />
+    <result column="COMBINERBOXID" jdbcType="VARCHAR" property="combinerboxid" />
+    <result column="WINDTURBINEID" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="UNIFORMCODE" jdbcType="VARCHAR" property="uniformcode" />
+    <result column="SHORTID" jdbcType="VARCHAR" property="shortid" />
+    <result column="LONGID" jdbcType="VARCHAR" property="longid" />
+    <result column="WINDPOWERSTATIONID" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="REALTIMEID" jdbcType="VARCHAR" property="realtimeid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, 
+    REASONABLEMINVAL, COMBINERBOXID, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, 
+    REALTIMEID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEWExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from COMBINERBOXTESTINGPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from COMBINERBOXTESTINGPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from COMBINERBOXTESTINGPOINTNEW
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEWExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from COMBINERBOXTESTINGPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEW">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into COMBINERBOXTESTINGPOINTNEW (ID, CODE, NAME, 
+      MODEL, VALUEUNIT, ENGLISHNAME, 
+      TYPEID, MODELID, MAXVAL, 
+      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
+      COMBINERBOXID, WINDTURBINEID, UNIFORMCODE, 
+      SHORTID, LONGID, WINDPOWERSTATIONID, 
+      REALTIMEID)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{valueunit,jdbcType=VARCHAR}, #{englishname,jdbcType=VARCHAR}, 
+      #{typeid,jdbcType=VARCHAR}, #{modelid,jdbcType=VARCHAR}, #{maxval,jdbcType=DECIMAL}, 
+      #{minval,jdbcType=DECIMAL}, #{reasonablemaxval,jdbcType=DECIMAL}, #{reasonableminval,jdbcType=DECIMAL}, 
+      #{combinerboxid,jdbcType=VARCHAR}, #{windturbineid,jdbcType=VARCHAR}, #{uniformcode,jdbcType=VARCHAR}, 
+      #{shortid,jdbcType=VARCHAR}, #{longid,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
+      #{realtimeid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEW">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into COMBINERBOXTESTINGPOINTNEW
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="code != null">
+        CODE,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="model != null">
+        MODEL,
+      </if>
+      <if test="valueunit != null">
+        VALUEUNIT,
+      </if>
+      <if test="englishname != null">
+        ENGLISHNAME,
+      </if>
+      <if test="typeid != null">
+        TYPEID,
+      </if>
+      <if test="modelid != null">
+        MODELID,
+      </if>
+      <if test="maxval != null">
+        MAXVAL,
+      </if>
+      <if test="minval != null">
+        MINVAL,
+      </if>
+      <if test="reasonablemaxval != null">
+        REASONABLEMAXVAL,
+      </if>
+      <if test="reasonableminval != null">
+        REASONABLEMINVAL,
+      </if>
+      <if test="combinerboxid != null">
+        COMBINERBOXID,
+      </if>
+      <if test="windturbineid != null">
+        WINDTURBINEID,
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE,
+      </if>
+      <if test="shortid != null">
+        SHORTID,
+      </if>
+      <if test="longid != null">
+        LONGID,
+      </if>
+      <if test="windpowerstationid != null">
+        WINDPOWERSTATIONID,
+      </if>
+      <if test="realtimeid != null">
+        REALTIMEID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="valueunit != null">
+        #{valueunit,jdbcType=VARCHAR},
+      </if>
+      <if test="englishname != null">
+        #{englishname,jdbcType=VARCHAR},
+      </if>
+      <if test="typeid != null">
+        #{typeid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="maxval != null">
+        #{maxval,jdbcType=DECIMAL},
+      </if>
+      <if test="minval != null">
+        #{minval,jdbcType=DECIMAL},
+      </if>
+      <if test="reasonablemaxval != null">
+        #{reasonablemaxval,jdbcType=DECIMAL},
+      </if>
+      <if test="reasonableminval != null">
+        #{reasonableminval,jdbcType=DECIMAL},
+      </if>
+      <if test="combinerboxid != null">
+        #{combinerboxid,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="shortid != null">
+        #{shortid,jdbcType=VARCHAR},
+      </if>
+      <if test="longid != null">
+        #{longid,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="realtimeid != null">
+        #{realtimeid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEWExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from COMBINERBOXTESTINGPOINTNEW
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOXTESTINGPOINTNEW
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null">
+        MODEL = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.valueunit != null">
+        VALUEUNIT = #{record.valueunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.englishname != null">
+        ENGLISHNAME = #{record.englishname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.typeid != null">
+        TYPEID = #{record.typeid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelid != null">
+        MODELID = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.maxval != null">
+        MAXVAL = #{record.maxval,jdbcType=DECIMAL},
+      </if>
+      <if test="record.minval != null">
+        MINVAL = #{record.minval,jdbcType=DECIMAL},
+      </if>
+      <if test="record.reasonablemaxval != null">
+        REASONABLEMAXVAL = #{record.reasonablemaxval,jdbcType=DECIMAL},
+      </if>
+      <if test="record.reasonableminval != null">
+        REASONABLEMINVAL = #{record.reasonableminval,jdbcType=DECIMAL},
+      </if>
+      <if test="record.combinerboxid != null">
+        COMBINERBOXID = #{record.combinerboxid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windturbineid != null">
+        WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uniformcode != null">
+        UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shortid != null">
+        SHORTID = #{record.shortid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.longid != null">
+        LONGID = #{record.longid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.realtimeid != null">
+        REALTIMEID = #{record.realtimeid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOXTESTINGPOINTNEW
+    set ID = #{record.id,jdbcType=VARCHAR},
+      CODE = #{record.code,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      MODEL = #{record.model,jdbcType=VARCHAR},
+      VALUEUNIT = #{record.valueunit,jdbcType=VARCHAR},
+      ENGLISHNAME = #{record.englishname,jdbcType=VARCHAR},
+      TYPEID = #{record.typeid,jdbcType=VARCHAR},
+      MODELID = #{record.modelid,jdbcType=VARCHAR},
+      MAXVAL = #{record.maxval,jdbcType=DECIMAL},
+      MINVAL = #{record.minval,jdbcType=DECIMAL},
+      REASONABLEMAXVAL = #{record.reasonablemaxval,jdbcType=DECIMAL},
+      REASONABLEMINVAL = #{record.reasonableminval,jdbcType=DECIMAL},
+      COMBINERBOXID = #{record.combinerboxid,jdbcType=VARCHAR},
+      WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      SHORTID = #{record.shortid,jdbcType=VARCHAR},
+      LONGID = #{record.longid,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
+      REALTIMEID = #{record.realtimeid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEW">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOXTESTINGPOINTNEW
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        MODEL = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="valueunit != null">
+        VALUEUNIT = #{valueunit,jdbcType=VARCHAR},
+      </if>
+      <if test="englishname != null">
+        ENGLISHNAME = #{englishname,jdbcType=VARCHAR},
+      </if>
+      <if test="typeid != null">
+        TYPEID = #{typeid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        MODELID = #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="maxval != null">
+        MAXVAL = #{maxval,jdbcType=DECIMAL},
+      </if>
+      <if test="minval != null">
+        MINVAL = #{minval,jdbcType=DECIMAL},
+      </if>
+      <if test="reasonablemaxval != null">
+        REASONABLEMAXVAL = #{reasonablemaxval,jdbcType=DECIMAL},
+      </if>
+      <if test="reasonableminval != null">
+        REASONABLEMINVAL = #{reasonableminval,jdbcType=DECIMAL},
+      </if>
+      <if test="combinerboxid != null">
+        COMBINERBOXID = #{combinerboxid,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbineid != null">
+        WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="shortid != null">
+        SHORTID = #{shortid,jdbcType=VARCHAR},
+      </if>
+      <if test="longid != null">
+        LONGID = #{longid,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="realtimeid != null">
+        REALTIMEID = #{realtimeid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.CombinerBoxTestingPointNEW">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update COMBINERBOXTESTINGPOINTNEW
+    set CODE = #{code,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      MODEL = #{model,jdbcType=VARCHAR},
+      VALUEUNIT = #{valueunit,jdbcType=VARCHAR},
+      ENGLISHNAME = #{englishname,jdbcType=VARCHAR},
+      TYPEID = #{typeid,jdbcType=VARCHAR},
+      MODELID = #{modelid,jdbcType=VARCHAR},
+      MAXVAL = #{maxval,jdbcType=DECIMAL},
+      MINVAL = #{minval,jdbcType=DECIMAL},
+      REASONABLEMAXVAL = #{reasonablemaxval,jdbcType=DECIMAL},
+      REASONABLEMINVAL = #{reasonableminval,jdbcType=DECIMAL},
+      COMBINERBOXID = #{combinerboxid,jdbcType=VARCHAR},
+      WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      SHORTID = #{shortid,jdbcType=VARCHAR},
+      LONGID = #{longid,jdbcType=VARCHAR},
+      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      REALTIMEID = #{realtimeid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>