添加逆变器判定

web/monitor-web-sxjn/src/main/java/com/gyee/SpringbootStart.java

@@ -39,6 +39,8 @@ public class SpringbootStart {
 //        System.out.println("开始导出风功率测点。。。。。。");
 //        initialPointGoldenService.initalFgl();
 //        System.out.println("结束导出风功率测点。。。。。。");
+
+
 //        System.out.println("开始导出地调测点。。。。。。");
 //        initialPointGoldenService.initalDd();
 //        System.out.println("结束导出地调测点。。。。。。");
@@ -48,6 +50,14 @@ public class SpringbootStart {
 //        System.out.println("开始导出逆变器测点。。。。。。");
 //        initialPointGoldenService.initalNbq();
 //        System.out.println("结束导出逆变器测点。。。。。。");
+
+
+
+//        System.out.println("开始导出汇流箱测点。。。。。。");
+//        initialPointGoldenService.initalHlx();
+//        System.out.println("结束导出汇流箱测点。。。。。。");
+
+
 //        System.out.println("初始化结束！");
 //
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/Constant.java

@@ -27,9 +27,10 @@ public class Constant {
 //			"AGC014", "AGC015", "AGC021", "AGC022", "AGC023", "AGC024",
 //			"AGC025", "AGC026", "AGC031" };
 // 自算功率，实时功率，出线有功，有功设定,AGC可调上限,可调下限,远方,投入,减闭锁,增闭锁
-	public static final String[] TPOINT_WP_AGC = { "ZZSGL","SSZGL","AGC001", "AGC002",
-			"AGC003", "AGC004", "AGC005", "AGC006", "AGC007", "AGC008"};
-
+//	public static final String[] TPOINT_WP_AGC = { "ZZSGL","SSZGL","AGC001", "AGC002",
+//			"AGC003", "AGC004", "AGC005", "AGC006", "AGC007", "AGC008"};
+public static final String[] TPOINT_WP_AGC = { "AGC001", "AGC002",
+        "AGC003", "AGC004", "AGC005", "AGC006", "AGC007", "AGC008"};
 	public static final String[] TPOINT_WP_AGCYCGL = { "FCFGCDQ0001",
 			"FCFGCDQ0002", "FCFGCDQ0003", "FCFGCDQ0004", "FCFGCDQ0005",
 			"FCFGCDQ0006", "FCFGCDQ0007", "FCFGCDQ0008", "FCFGCDQ0009",
@@ -607,7 +608,10 @@ public static final String TPOINT_WT_60FX = "AI011";// 风机60秒风向
     public static final String TPOINT_NBQ_XL = "AIG018";// 效率
     public static final String TPOINT_NBQ_EYHT = "AIG022";// 累计二氧化碳减排量
 
-
-
+    //汇流箱测点
+    public static final String[] TPOINT_Inverter_Junctionbox = { "AIG051", "AIG052",
+            "AIG053", "AIG054", "AIG055", "AIG056", "AIG057", "AIG058", "AIG059",
+            "AIG060", "AIG061", "AIG062", "AIG063", "AIG064", "AIG065", "AIG066",
+            "AIG067"};
 
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -259,7 +259,7 @@ public class InitialRunner implements CommandLineRunner {
         {
             for(PhotovoltaicTestingPointNew mp : phls){
 
-                if(mp.getTypes().equals(PhotoVolaticType.XB))
+                if(mp.getTypes().equals(PhotoVolaticType.XB.getName()))
                 {
 
                     if(phPointmap.containsKey(mp.getBoxchangeid())){
@@ -271,7 +271,7 @@ public class InitialRunner implements CommandLineRunner {
                         map.put(mp.getUniformcode(), mp);
                         phPointmap.put(mp.getBoxchangeid(), map);
                     }
-                }else if(mp.getTypes().equals(PhotoVolaticType.NBQ))
+                }else if(mp.getTypes().equals(PhotoVolaticType.NBQ.getName()))
                 {
 
                     if(phPointmap.containsKey(mp.getInverterid())){
@@ -283,7 +283,7 @@ public class InitialRunner implements CommandLineRunner {
                         map.put(mp.getUniformcode(), mp);
                         phPointmap.put(mp.getInverterid(), map);
                     }
-                }else if(mp.getTypes().equals(PhotoVolaticType.HLX))
+                }else if(mp.getTypes().equals(PhotoVolaticType.HLX.getName()))
                 {
 
                     if(phPointmap.containsKey(mp.getJunctionboxid())){

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

@@ -1,29 +1,26 @@
 package com.gyee.frame.controller.monitor;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.google.common.collect.Maps;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.model.custom.JunctionboxVo;
 import com.gyee.frame.service.websocket.WtInfoPushService;
 import com.gyee.frame.service.websocket.WtWarnPushService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/monitorinverter")
@@ -52,12 +49,12 @@ public class MonitorInverterPushController {
 
     @GetMapping("/findInverterInfoList")
     @ResponseBody
-    @ApiOperation(value = "逆变器信息列表", notes = "逆变器信息列表")
+    @ApiOperation(value = "汇流箱信息列表", notes = "汇流箱信息列表")
     @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
     })
 
 	public AjaxResult findWtInfoList(String wpId) throws Exception {
-		List<Map<String, Object>> vos = new ArrayList<>();
+        List<JunctionboxVo> vos=new ArrayList<>();
 		vos = wtInfoPushService.findInverterInfoList(wpId);
 		if (null != vos) {
 			return AjaxResult.successData(AjaxStatus.success.code, vos);

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

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

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

@@ -2,13 +2,14 @@ package com.gyee.frame.mapper.auto;
 
 import com.gyee.frame.model.auto.Windsubstationtestingpointnew;
 import com.gyee.frame.model.auto.WindsubstationtestingpointnewExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WindsubstationtestingpointnewMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -16,7 +17,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -24,7 +25,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -32,7 +33,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -40,7 +41,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -48,7 +49,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -56,7 +57,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -64,7 +65,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -72,7 +73,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -80,7 +81,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -88,7 +89,7 @@ public interface WindsubstationtestingpointnewMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This method corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */

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

@@ -0,0 +1,112 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Windsubandwindturbiinereal implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windsubandwindturbiinereal.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windsubandwindturbiinereal.windturbineid
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windsubandwindturbiinereal.windsubstationid
+     *
+     * @mbg.generated
+     */
+    private String windsubstationid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windsubandwindturbiinereal.id
+     *
+     * @return the value of windsubandwindturbiinereal.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windsubandwindturbiinereal.id
+     *
+     * @param id the value for windsubandwindturbiinereal.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 windsubandwindturbiinereal.windturbineid
+     *
+     * @return the value of windsubandwindturbiinereal.windturbineid
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windsubandwindturbiinereal.windturbineid
+     *
+     * @param windturbineid the value for windsubandwindturbiinereal.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 windsubandwindturbiinereal.windsubstationid
+     *
+     * @return the value of windsubandwindturbiinereal.windsubstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindsubstationid() {
+        return windsubstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windsubandwindturbiinereal.windsubstationid
+     *
+     * @param windsubstationid the value for windsubandwindturbiinereal.windsubstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindsubstationid(String windsubstationid) {
+        this.windsubstationid = windsubstationid == null ? null : windsubstationid.trim();
+    }
+}

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

@@ -0,0 +1,512 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WindsubandwindturbiinerealExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public WindsubandwindturbiinerealExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windsubandwindturbiinereal
+     *
+     * @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 windsubandwindturbiinereal
+     *
+     * @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 windsubandwindturbiinereal
+     *
+     * @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 windsubandwindturbiinereal
+     *
+     * @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 windsubandwindturbiinereal
+     *
+     * @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 andWindturbineidIsNull() {
+            addCriterion("windturbineid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNotNull() {
+            addCriterion("windturbineid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidEqualTo(String value) {
+            addCriterion("windturbineid =", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotEqualTo(String value) {
+            addCriterion("windturbineid <>", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThan(String value) {
+            addCriterion("windturbineid >", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
+            addCriterion("windturbineid >=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThan(String value) {
+            addCriterion("windturbineid <", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThanOrEqualTo(String value) {
+            addCriterion("windturbineid <=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLike(String value) {
+            addCriterion("windturbineid like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotLike(String value) {
+            addCriterion("windturbineid not like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIn(List<String> values) {
+            addCriterion("windturbineid in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotIn(List<String> values) {
+            addCriterion("windturbineid not in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidBetween(String value1, String value2) {
+            addCriterion("windturbineid between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotBetween(String value1, String value2) {
+            addCriterion("windturbineid not between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidIsNull() {
+            addCriterion("windsubstationid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidIsNotNull() {
+            addCriterion("windsubstationid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidEqualTo(String value) {
+            addCriterion("windsubstationid =", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidNotEqualTo(String value) {
+            addCriterion("windsubstationid <>", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidGreaterThan(String value) {
+            addCriterion("windsubstationid >", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidGreaterThanOrEqualTo(String value) {
+            addCriterion("windsubstationid >=", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidLessThan(String value) {
+            addCriterion("windsubstationid <", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidLessThanOrEqualTo(String value) {
+            addCriterion("windsubstationid <=", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidLike(String value) {
+            addCriterion("windsubstationid like", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidNotLike(String value) {
+            addCriterion("windsubstationid not like", value, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidIn(List<String> values) {
+            addCriterion("windsubstationid in", values, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidNotIn(List<String> values) {
+            addCriterion("windsubstationid not in", values, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidBetween(String value1, String value2) {
+            addCriterion("windsubstationid between", value1, value2, "windsubstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindsubstationidNotBetween(String value1, String value2) {
+            addCriterion("windsubstationid not between", value1, value2, "windsubstationid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table windsubandwindturbiinereal
+     *
+     * @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 windsubandwindturbiinereal
+     *
+     * @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/Windsubstationtestingpointnew.java

@@ -7,7 +7,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.ID
+     * This field corresponds to the database column windsubstationtestingpointnew.id
      *
      * @mbg.generated
      */
@@ -16,7 +16,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.CODE
+     * This field corresponds to the database column windsubstationtestingpointnew.code
      *
      * @mbg.generated
      */
@@ -25,7 +25,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.NAME
+     * This field corresponds to the database column windsubstationtestingpointnew.name
      *
      * @mbg.generated
      */
@@ -34,7 +34,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.MODEL
+     * This field corresponds to the database column windsubstationtestingpointnew.model
      *
      * @mbg.generated
      */
@@ -43,7 +43,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.VALUEUNIT
+     * This field corresponds to the database column windsubstationtestingpointnew.valueunit
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.ENGLISHNAME
+     * This field corresponds to the database column windsubstationtestingpointnew.englishname
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.TYPEID
+     * This field corresponds to the database column windsubstationtestingpointnew.typeid
      *
      * @mbg.generated
      */
@@ -70,7 +70,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.MODELID
+     * This field corresponds to the database column windsubstationtestingpointnew.modelid
      *
      * @mbg.generated
      */
@@ -79,7 +79,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.MAXVAL
+     * This field corresponds to the database column windsubstationtestingpointnew.maxval
      *
      * @mbg.generated
      */
@@ -88,7 +88,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.MINVAL
+     * This field corresponds to the database column windsubstationtestingpointnew.minval
      *
      * @mbg.generated
      */
@@ -97,7 +97,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMAXVAL
+     * This field corresponds to the database column windsubstationtestingpointnew.reasonablemaxval
      *
      * @mbg.generated
      */
@@ -106,7 +106,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMINVAL
+     * This field corresponds to the database column windsubstationtestingpointnew.reasonableminval
      *
      * @mbg.generated
      */
@@ -115,7 +115,16 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.UNIFORMCODE
+     * This field corresponds to the database column windsubstationtestingpointnew.windsubstationid
+     *
+     * @mbg.generated
+     */
+    private String windsubstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windsubstationtestingpointnew.uniformcode
      *
      * @mbg.generated
      */
@@ -124,7 +133,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.SHORTID
+     * This field corresponds to the database column windsubstationtestingpointnew.shortid
      *
      * @mbg.generated
      */
@@ -133,7 +142,7 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.LONGID
+     * This field corresponds to the database column windsubstationtestingpointnew.longid
      *
      * @mbg.generated
      */
@@ -142,16 +151,16 @@ public class Windsubstationtestingpointnew implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.WINDSUBSTATIONID
+     * This field corresponds to the database column windsubstationtestingpointnew.windpowerstationid
      *
      * @mbg.generated
      */
-    private String windsubstationid;
+    private String windpowerstationid;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column WINDSUBSTATIONTESTINGPOINTNEW.REALTIMEID
+     * This field corresponds to the database column windsubstationtestingpointnew.realtimeid
      *
      * @mbg.generated
      */
@@ -159,7 +168,7 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table WINDSUBSTATIONTESTINGPOINTNEW
+     * This field corresponds to the database table windsubstationtestingpointnew
      *
      * @mbg.generated
      */
@@ -167,9 +176,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.ID
+     * This method returns the value of the database column windsubstationtestingpointnew.id
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.ID
+     * @return the value of windsubstationtestingpointnew.id
      *
      * @mbg.generated
      */
@@ -179,9 +188,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.ID
+     * This method sets the value of the database column windsubstationtestingpointnew.id
      *
-     * @param id the value for WINDSUBSTATIONTESTINGPOINTNEW.ID
+     * @param id the value for windsubstationtestingpointnew.id
      *
      * @mbg.generated
      */
@@ -191,9 +200,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.CODE
+     * This method returns the value of the database column windsubstationtestingpointnew.code
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.CODE
+     * @return the value of windsubstationtestingpointnew.code
      *
      * @mbg.generated
      */
@@ -203,9 +212,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.CODE
+     * This method sets the value of the database column windsubstationtestingpointnew.code
      *
-     * @param code the value for WINDSUBSTATIONTESTINGPOINTNEW.CODE
+     * @param code the value for windsubstationtestingpointnew.code
      *
      * @mbg.generated
      */
@@ -215,9 +224,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.NAME
+     * This method returns the value of the database column windsubstationtestingpointnew.name
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.NAME
+     * @return the value of windsubstationtestingpointnew.name
      *
      * @mbg.generated
      */
@@ -227,9 +236,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.NAME
+     * This method sets the value of the database column windsubstationtestingpointnew.name
      *
-     * @param name the value for WINDSUBSTATIONTESTINGPOINTNEW.NAME
+     * @param name the value for windsubstationtestingpointnew.name
      *
      * @mbg.generated
      */
@@ -239,9 +248,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MODEL
+     * This method returns the value of the database column windsubstationtestingpointnew.model
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.MODEL
+     * @return the value of windsubstationtestingpointnew.model
      *
      * @mbg.generated
      */
@@ -251,9 +260,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MODEL
+     * This method sets the value of the database column windsubstationtestingpointnew.model
      *
-     * @param model the value for WINDSUBSTATIONTESTINGPOINTNEW.MODEL
+     * @param model the value for windsubstationtestingpointnew.model
      *
      * @mbg.generated
      */
@@ -263,9 +272,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.VALUEUNIT
+     * This method returns the value of the database column windsubstationtestingpointnew.valueunit
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.VALUEUNIT
+     * @return the value of windsubstationtestingpointnew.valueunit
      *
      * @mbg.generated
      */
@@ -275,9 +284,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.VALUEUNIT
+     * This method sets the value of the database column windsubstationtestingpointnew.valueunit
      *
-     * @param valueunit the value for WINDSUBSTATIONTESTINGPOINTNEW.VALUEUNIT
+     * @param valueunit the value for windsubstationtestingpointnew.valueunit
      *
      * @mbg.generated
      */
@@ -287,9 +296,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.ENGLISHNAME
+     * This method returns the value of the database column windsubstationtestingpointnew.englishname
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.ENGLISHNAME
+     * @return the value of windsubstationtestingpointnew.englishname
      *
      * @mbg.generated
      */
@@ -299,9 +308,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.ENGLISHNAME
+     * This method sets the value of the database column windsubstationtestingpointnew.englishname
      *
-     * @param englishname the value for WINDSUBSTATIONTESTINGPOINTNEW.ENGLISHNAME
+     * @param englishname the value for windsubstationtestingpointnew.englishname
      *
      * @mbg.generated
      */
@@ -311,9 +320,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.TYPEID
+     * This method returns the value of the database column windsubstationtestingpointnew.typeid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.TYPEID
+     * @return the value of windsubstationtestingpointnew.typeid
      *
      * @mbg.generated
      */
@@ -323,9 +332,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.TYPEID
+     * This method sets the value of the database column windsubstationtestingpointnew.typeid
      *
-     * @param typeid the value for WINDSUBSTATIONTESTINGPOINTNEW.TYPEID
+     * @param typeid the value for windsubstationtestingpointnew.typeid
      *
      * @mbg.generated
      */
@@ -335,9 +344,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MODELID
+     * This method returns the value of the database column windsubstationtestingpointnew.modelid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.MODELID
+     * @return the value of windsubstationtestingpointnew.modelid
      *
      * @mbg.generated
      */
@@ -347,9 +356,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MODELID
+     * This method sets the value of the database column windsubstationtestingpointnew.modelid
      *
-     * @param modelid the value for WINDSUBSTATIONTESTINGPOINTNEW.MODELID
+     * @param modelid the value for windsubstationtestingpointnew.modelid
      *
      * @mbg.generated
      */
@@ -359,9 +368,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MAXVAL
+     * This method returns the value of the database column windsubstationtestingpointnew.maxval
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.MAXVAL
+     * @return the value of windsubstationtestingpointnew.maxval
      *
      * @mbg.generated
      */
@@ -371,9 +380,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MAXVAL
+     * This method sets the value of the database column windsubstationtestingpointnew.maxval
      *
-     * @param maxval the value for WINDSUBSTATIONTESTINGPOINTNEW.MAXVAL
+     * @param maxval the value for windsubstationtestingpointnew.maxval
      *
      * @mbg.generated
      */
@@ -383,9 +392,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MINVAL
+     * This method returns the value of the database column windsubstationtestingpointnew.minval
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.MINVAL
+     * @return the value of windsubstationtestingpointnew.minval
      *
      * @mbg.generated
      */
@@ -395,9 +404,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.MINVAL
+     * This method sets the value of the database column windsubstationtestingpointnew.minval
      *
-     * @param minval the value for WINDSUBSTATIONTESTINGPOINTNEW.MINVAL
+     * @param minval the value for windsubstationtestingpointnew.minval
      *
      * @mbg.generated
      */
@@ -407,9 +416,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMAXVAL
+     * This method returns the value of the database column windsubstationtestingpointnew.reasonablemaxval
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMAXVAL
+     * @return the value of windsubstationtestingpointnew.reasonablemaxval
      *
      * @mbg.generated
      */
@@ -419,9 +428,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMAXVAL
+     * This method sets the value of the database column windsubstationtestingpointnew.reasonablemaxval
      *
-     * @param reasonablemaxval the value for WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMAXVAL
+     * @param reasonablemaxval the value for windsubstationtestingpointnew.reasonablemaxval
      *
      * @mbg.generated
      */
@@ -431,9 +440,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMINVAL
+     * This method returns the value of the database column windsubstationtestingpointnew.reasonableminval
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMINVAL
+     * @return the value of windsubstationtestingpointnew.reasonableminval
      *
      * @mbg.generated
      */
@@ -443,9 +452,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMINVAL
+     * This method sets the value of the database column windsubstationtestingpointnew.reasonableminval
      *
-     * @param reasonableminval the value for WINDSUBSTATIONTESTINGPOINTNEW.REASONABLEMINVAL
+     * @param reasonableminval the value for windsubstationtestingpointnew.reasonableminval
      *
      * @mbg.generated
      */
@@ -455,9 +464,33 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.UNIFORMCODE
+     * This method returns the value of the database column windsubstationtestingpointnew.windsubstationid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.UNIFORMCODE
+     * @return the value of windsubstationtestingpointnew.windsubstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindsubstationid() {
+        return windsubstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windsubstationtestingpointnew.windsubstationid
+     *
+     * @param windsubstationid the value for windsubstationtestingpointnew.windsubstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindsubstationid(String windsubstationid) {
+        this.windsubstationid = windsubstationid == null ? null : windsubstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windsubstationtestingpointnew.uniformcode
+     *
+     * @return the value of windsubstationtestingpointnew.uniformcode
      *
      * @mbg.generated
      */
@@ -467,9 +500,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.UNIFORMCODE
+     * This method sets the value of the database column windsubstationtestingpointnew.uniformcode
      *
-     * @param uniformcode the value for WINDSUBSTATIONTESTINGPOINTNEW.UNIFORMCODE
+     * @param uniformcode the value for windsubstationtestingpointnew.uniformcode
      *
      * @mbg.generated
      */
@@ -479,9 +512,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.SHORTID
+     * This method returns the value of the database column windsubstationtestingpointnew.shortid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.SHORTID
+     * @return the value of windsubstationtestingpointnew.shortid
      *
      * @mbg.generated
      */
@@ -491,9 +524,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.SHORTID
+     * This method sets the value of the database column windsubstationtestingpointnew.shortid
      *
-     * @param shortid the value for WINDSUBSTATIONTESTINGPOINTNEW.SHORTID
+     * @param shortid the value for windsubstationtestingpointnew.shortid
      *
      * @mbg.generated
      */
@@ -503,9 +536,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.LONGID
+     * This method returns the value of the database column windsubstationtestingpointnew.longid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.LONGID
+     * @return the value of windsubstationtestingpointnew.longid
      *
      * @mbg.generated
      */
@@ -515,9 +548,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.LONGID
+     * This method sets the value of the database column windsubstationtestingpointnew.longid
      *
-     * @param longid the value for WINDSUBSTATIONTESTINGPOINTNEW.LONGID
+     * @param longid the value for windsubstationtestingpointnew.longid
      *
      * @mbg.generated
      */
@@ -527,33 +560,33 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.WINDSUBSTATIONID
+     * This method returns the value of the database column windsubstationtestingpointnew.windpowerstationid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.WINDSUBSTATIONID
+     * @return the value of windsubstationtestingpointnew.windpowerstationid
      *
      * @mbg.generated
      */
-    public String getWindsubstationid() {
-        return windsubstationid;
+    public String getWindpowerstationid() {
+        return windpowerstationid;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.WINDSUBSTATIONID
+     * This method sets the value of the database column windsubstationtestingpointnew.windpowerstationid
      *
-     * @param windsubstationid the value for WINDSUBSTATIONTESTINGPOINTNEW.WINDSUBSTATIONID
+     * @param windpowerstationid the value for windsubstationtestingpointnew.windpowerstationid
      *
      * @mbg.generated
      */
-    public void setWindsubstationid(String windsubstationid) {
-        this.windsubstationid = windsubstationid == null ? null : windsubstationid.trim();
+    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 WINDSUBSTATIONTESTINGPOINTNEW.REALTIMEID
+     * This method returns the value of the database column windsubstationtestingpointnew.realtimeid
      *
-     * @return the value of WINDSUBSTATIONTESTINGPOINTNEW.REALTIMEID
+     * @return the value of windsubstationtestingpointnew.realtimeid
      *
      * @mbg.generated
      */
@@ -563,9 +596,9 @@ public class Windsubstationtestingpointnew implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column WINDSUBSTATIONTESTINGPOINTNEW.REALTIMEID
+     * This method sets the value of the database column windsubstationtestingpointnew.realtimeid
      *
-     * @param realtimeid the value for WINDSUBSTATIONTESTINGPOINTNEW.REALTIMEID
+     * @param realtimeid the value for windsubstationtestingpointnew.realtimeid
      *
      * @mbg.generated
      */

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/custom/JunctionboxVo.java

@@ -0,0 +1,200 @@
+
+package com.gyee.frame.model.custom;
+
+/**
+ *
+ */
+
+public class JunctionboxVo {
+
+    private String id;
+    private String name;
+    private Double zdy;
+    
+    private Double dl1;
+
+    private Double dl2;
+
+    private Double dl3;
+
+    private Double dl4;
+
+    private Double dl5;
+
+    private Double dl6;
+
+    private Double dl7;
+
+    private Double dl8;
+
+    private Double dl9;
+
+    private Double dl10;
+
+    private Double dl11;
+
+    private Double dl12;
+
+    private Double dl13;
+
+    private Double dl14;
+
+    private Double dl15;
+
+    private Double dl16;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getZdy() {
+        return zdy;
+    }
+
+    public void setZdy(Double zdy) {
+        this.zdy = zdy;
+    }
+
+    public Double getDl1() {
+        return dl1;
+    }
+
+    public void setDl1(Double dl1) {
+        this.dl1 = dl1;
+    }
+
+    public Double getDl2() {
+        return dl2;
+    }
+
+    public void setDl2(Double dl2) {
+        this.dl2 = dl2;
+    }
+
+    public Double getDl3() {
+        return dl3;
+    }
+
+    public void setDl3(Double dl3) {
+        this.dl3 = dl3;
+    }
+
+    public Double getDl4() {
+        return dl4;
+    }
+
+    public void setDl4(Double dl4) {
+        this.dl4 = dl4;
+    }
+
+    public Double getDl5() {
+        return dl5;
+    }
+
+    public void setDl5(Double dl5) {
+        this.dl5 = dl5;
+    }
+
+    public Double getDl6() {
+        return dl6;
+    }
+
+    public void setDl6(Double dl6) {
+        this.dl6 = dl6;
+    }
+
+    public Double getDl7() {
+        return dl7;
+    }
+
+    public void setDl7(Double dl7) {
+        this.dl7 = dl7;
+    }
+
+    public Double getDl8() {
+        return dl8;
+    }
+
+    public void setDl8(Double dl8) {
+        this.dl8 = dl8;
+    }
+
+    public Double getDl9() {
+        return dl9;
+    }
+
+    public void setDl9(Double dl9) {
+        this.dl9 = dl9;
+    }
+
+    public Double getDl10() {
+        return dl10;
+    }
+
+    public void setDl10(Double dl10) {
+        this.dl10 = dl10;
+    }
+
+    public Double getDl11() {
+        return dl11;
+    }
+
+    public void setDl11(Double dl11) {
+        this.dl11 = dl11;
+    }
+
+    public Double getDl12() {
+        return dl12;
+    }
+
+    public void setDl12(Double dl12) {
+        this.dl12 = dl12;
+    }
+
+    public Double getDl13() {
+        return dl13;
+    }
+
+    public void setDl13(Double dl13) {
+        this.dl13 = dl13;
+    }
+
+    public Double getDl14() {
+        return dl14;
+    }
+
+    public void setDl14(Double dl14) {
+        this.dl14 = dl14;
+    }
+
+    public Double getDl15() {
+        return dl15;
+    }
+
+    public void setDl15(Double dl15) {
+        this.dl15 = dl15;
+    }
+
+    public Double getDl16() {
+        return dl16;
+    }
+
+    public void setDl16(Double dl16) {
+        this.dl16 = dl16;
+    }
+
+
+}

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

@@ -0,0 +1,110 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WindsubandwindturbiinerealMapper;
+import com.gyee.frame.model.auto.Windsubandwindturbiinereal;
+import com.gyee.frame.model.auto.WindsubandwindturbiinerealExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 项目 WindsubandwindturbiinerealService
+ * @Title: WindsubandwindturbiinerealService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WindsubandwindturbiinerealService implements BaseService<Windsubandwindturbiinereal, WindsubandwindturbiinerealExample> {
+	@Resource
+	private WindsubandwindturbiinerealMapper windsubandwindturbiinerealMapper;
+	
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			WindsubandwindturbiinerealExample example=new WindsubandwindturbiinerealExample();
+			example.createCriteria().andIdIn(lista);
+			return windsubandwindturbiinerealMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Windsubandwindturbiinereal selectByPrimaryKey(String id) {
+				
+			return windsubandwindturbiinerealMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Windsubandwindturbiinereal record) {
+		return windsubandwindturbiinerealMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Windsubandwindturbiinereal record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return windsubandwindturbiinerealMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Windsubandwindturbiinereal record, WindsubandwindturbiinerealExample example) {
+		
+		return windsubandwindturbiinerealMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Windsubandwindturbiinereal record, WindsubandwindturbiinerealExample example) {
+		
+		return windsubandwindturbiinerealMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Windsubandwindturbiinereal> selectByExample(WindsubandwindturbiinerealExample example) {
+		
+		return windsubandwindturbiinerealMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindsubandwindturbiinerealExample example) {
+		
+		return windsubandwindturbiinerealMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindsubandwindturbiinerealExample example) {
+		
+		return windsubandwindturbiinerealMapper.deleteByExample(example);
+	}
+
+	public List<Windsubandwindturbiinereal> findWtBySub(String subid){
+		WindsubandwindturbiinerealExample example=new WindsubandwindturbiinerealExample();
+		example.createCriteria().andWindsubstationidEqualTo(subid);
+		List<Windsubandwindturbiinereal> list=windsubandwindturbiinerealMapper.selectByExample(example);
+		return list;
+	}
+
+
+}

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

@@ -6,9 +6,11 @@ import com.gyee.frame.mapper.auto.WindsubstationMapper;
 import com.gyee.frame.model.auto.Windsubstation;
 import com.gyee.frame.model.auto.WindsubstationExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -103,5 +105,18 @@ public class WindsubstationService implements BaseService<Windsubstation, Windsu
 
     }
 
+    public  List<Windsubstation> findByWpId(String wpId) {
 
+        List<Windsubstation> vos =new ArrayList<>();
+
+        if(StringUtils.notEmp(wpId))
+        {
+            WindsubstationExample example = new WindsubstationExample();
+            example.createCriteria().andWindpowerstationidEqualTo(wpId);
+            vos = windsubstationMapper.selectByExample(example);
+        }
+
+        return vos;
+
+    }
 }

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

@@ -0,0 +1,147 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WindsubstationtestingpointnewMapper;
+import com.gyee.frame.model.auto.Windsubstationtestingpointnew;
+import com.gyee.frame.model.auto.WindsubstationtestingpointnewExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class WindsubstationtestingpointnewService implements BaseService<Windsubstationtestingpointnew, WindsubstationtestingpointnewExample> {
+    @Resource
+    private WindsubstationtestingpointnewMapper windsubstationtestingpointnewMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista = Convert.toListStrArray(ids);
+        WindsubstationtestingpointnewExample example = new WindsubstationtestingpointnewExample();
+        example.createCriteria().andIdIn(lista);
+        return windsubstationtestingpointnewMapper.deleteByExample(example);
+
+
+    }
+
+
+    @Override
+    public Windsubstationtestingpointnew selectByPrimaryKey(String id) {
+
+        return windsubstationtestingpointnewMapper.selectByPrimaryKey(id);
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(Windsubstationtestingpointnew record) {
+        return windsubstationtestingpointnewMapper.updateByPrimaryKeySelective(record);
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(Windsubstationtestingpointnew record) {
+
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+
+        return windsubstationtestingpointnewMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(Windsubstationtestingpointnew record, WindsubstationtestingpointnewExample example) {
+
+        return windsubstationtestingpointnewMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(Windsubstationtestingpointnew record, WindsubstationtestingpointnewExample example) {
+
+        return windsubstationtestingpointnewMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<Windsubstationtestingpointnew> selectByExample(WindsubstationtestingpointnewExample example) {
+
+        return windsubstationtestingpointnewMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(WindsubstationtestingpointnewExample example) {
+
+        return windsubstationtestingpointnewMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(WindsubstationtestingpointnewExample example) {
+
+        return windsubstationtestingpointnewMapper.deleteByExample(example);
+    }
+
+
+    public  List<Windsubstationtestingpointnew> findAllList() {
+
+        WindsubstationtestingpointnewExample example = new WindsubstationtestingpointnewExample();
+
+        List<Windsubstationtestingpointnew> vos = windsubstationtestingpointnewMapper.selectByExample(example);
+
+
+        return vos;
+
+    }
+
+    public  List<Windsubstationtestingpointnew> findBySubId(String subId) {
+
+        List<Windsubstationtestingpointnew> vos =new ArrayList<>();
+
+        if(StringUtils.notEmp(subId))
+        {
+            WindsubstationtestingpointnewExample example = new WindsubstationtestingpointnewExample();
+            example.createCriteria().andWindsubstationidEqualTo(subId);
+            vos = windsubstationtestingpointnewMapper.selectByExample(example);
+        }
+
+        return vos;
+
+    }
+
+    public Map<String,Windsubstationtestingpointnew> findBySubIdMap(String subId) {
+
+        Map<String,Windsubstationtestingpointnew> map=new HashMap<>();
+
+        if(StringUtils.notEmp(subId))
+        {
+            WindsubstationtestingpointnewExample example = new WindsubstationtestingpointnewExample();
+            example.createCriteria().andWindsubstationidEqualTo(subId);
+            List<Windsubstationtestingpointnew>  vos = windsubstationtestingpointnewMapper.selectByExample(example);
+            if(!vos.isEmpty())
+            {
+                for(Windsubstationtestingpointnew sub:vos)
+                {
+                    map.put(sub.getUniformcode(),sub);
+                }
+            }
+        }
+
+
+        return map;
+
+    }
+}

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

@@ -979,7 +979,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
                         po.setModelid(null);
                         po.setWindsubstationid(wsub.getId());
                         po.setUniformcode(stp.getUniformcode());
-
+                        po.setWindpowerstationid(wsub.getWindpowerstationid());
                         sb =new StringBuilder();
                         if(StringUtils.notEmp(wp.getPhoto()))
                         {
@@ -1633,15 +1633,11 @@ public class InitialPointGoldenService implements  IinitialPoint{
             List<PhotovoltaicTestingPointNew> allpoints=new ArrayList<>();
 
 
-
-
             for (Windpowerstation wp:InitialRunner.wpallls)
             {
 
-
                 List<Junctionbox> wtls=InitialRunner.gp_hlxmap.get(wp.getId());
 
-
                 if( wp.getId().endsWith("GDC") && wp.getId().equals("SY_GDC"))
                 {
                     for(Junctionbox wt:wtls)
@@ -1723,6 +1719,8 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             po.setWindpowerstationid(wt.getWindpowerstationid());
                             po.setBoxchangeid(wt.getBoxchangeid());
                             po.setSquareid(wt.getSquareid());
+                            po.setInverterid(wt.getInverterid());
+                            po.setJunctionboxid(wt.getId());
                             po.setTypes(PhotoVolaticType.HLX.getName());
                             if(stp.getCode().equals(CI))
                             {

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/photovolatic/PhotovoltaicTestingPointNewService.java

@@ -105,18 +105,15 @@ public class PhotovoltaicTestingPointNewService implements BaseService<Photovolt
 
     public PhotovoltaicTestingPointNew getPhotovoltaicTestingPointNew(String wtId, String unicode)  {
 
-        PhotovoltaicTestingPointNew point=new PhotovoltaicTestingPointNew();
+        PhotovoltaicTestingPointNew point=null;
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
         {
-            if(InitialRunner.nbqmap.containsKey(wtId))
+            if(InitialRunner.phPointmap.containsKey(wtId))
             {
-                if(InitialRunner.phPointmap.containsKey(wtId))
+                Map<String, PhotovoltaicTestingPointNew> map=InitialRunner.phPointmap.get(wtId);
+                if(map.containsKey(unicode))
                 {
-                    Map<String, PhotovoltaicTestingPointNew> map=InitialRunner.phPointmap.get(wtId);
-                    if(map.containsKey(unicode))
-                    {
-                        point=map.get(unicode);
-                    }
+                    point=map.get(unicode);
                 }
             }
         }
@@ -125,7 +122,7 @@ public class PhotovoltaicTestingPointNewService implements BaseService<Photovolt
     }
 
 
-    public List<PhotovoltaicTestingPointNew> getPhotovoltaicTestingPointNewList(String wtId)  {
+    public List<PhotovoltaicTestingPointNew> getPhotovoltaicTestingPointNewDiList(String wtId)  {
 
         List<PhotovoltaicTestingPointNew> list=new ArrayList<>();
 

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

@@ -4,13 +4,13 @@ import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.agc.AgcVo;
 import com.gyee.frame.model.auto.Windpowerstation;
-import com.gyee.frame.model.auto.Windpowerstationpointnew;
+import com.gyee.frame.model.auto.Windsubstation;
+import com.gyee.frame.model.auto.Windsubstationtestingpointnew;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
-import com.gyee.frame.util.DateUtils;
-import com.gyee.frame.util.IRealTimeDataBaseUtil;
-import com.gyee.frame.util.MathUtil;
-import com.gyee.frame.util.StringUtils;
+import com.gyee.frame.service.WindsubstationService;
+import com.gyee.frame.service.WindsubstationtestingpointnewService;
+import com.gyee.frame.util.*;
 import com.gyee.frame.util.golden.EdosUtil;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +31,14 @@ public class AgcService {
     private IRealTimeDataBaseUtil ednaApiUtil = new EdosUtil();
     @Resource
     private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
+    @Resource
+    private WindsubstationService windsubstationService;
+    @Resource
+    private WindsubstationtestingpointnewService windsubstationtestingpointnewService;
+
+    IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
+
+
     String[] ycPoints1 = Constant.TPOINT_WP_FGLYC.split(",");
 
     public List<Map<String, Object>> getAgcValues() throws Exception {
@@ -40,55 +48,29 @@ public class AgcService {
 
 
         Map<String, Object> linemap=getAgcLine();
-
         for (Windpowerstation wp : InitialRunner.wpallls) {
 
+            String id = wp.getId();
+            List<Windsubstation> subls = windsubstationService.findByWpId(wp.getId());
+            if (!subls.isEmpty()) {
+                for (Windsubstation sub : subls) {
+                    Map<String, Object> map=new HashMap<>();
 
-            Map<String, Object> map=new HashMap<>();
+                    if(objmap.containsKey(sub.getId()))
+                    {
+                        map.put("jcxx",objmap.get(sub.getId()));
+                    }
 
-            if(objmap.containsKey(wp.getId()))
-            {
-                map.put("jcxx",objmap.get(wp.getId()));
-            }
+                    if(linemap.containsKey(sub.getId()))
+                    {
+                        map.put("tb",linemap.get(sub.getId()));
+                    }
 
-            if(linemap.containsKey(wp.getId()))
-            {
-                map.put("tb",linemap.get(wp.getId()));
+                    vos.add(map);
+                }
             }
-
-            vos.add(map);
-//            if(wp.getId().equals("QS_FDC"))
-//            {
-//
-//                Map<String, Object> tempmap=new HashMap<>();
-//                if(objmap.containsKey("QS_FDC02"))
-//                {
-//                    tempmap.put("jcxx",objmap.get("QS_FDC02"));
-//                }
-//
-//                if(linemap.containsKey("QS_FDC02"))
-//                {
-//                    tempmap.put("tb",linemap.get("QS_FDC02"));
-//                }
-//
-//                vos.add(tempmap);
-//            }else if(wp.getId().equals("SBQ_FDC"))
-//            {
-//                Map<String, Object> tempmap=new HashMap<>();
-//                if(objmap.containsKey("SBQ_FDC02"))
-//                {
-//                    tempmap.put("jcxx",objmap.get("SBQ_FDC02"));
-//                }
-//
-//                if(linemap.containsKey("SBQ_FDC02"))
-//                {
-//                    tempmap.put("tb",linemap.get("SBQ_FDC02"));
-//                }
-//
-//                vos.add(tempmap);
-//            }
-
         }
+
         return vos;
     }
 
@@ -102,88 +84,55 @@ public class AgcService {
         Map<String, Object> objmap = new HashMap<String, Object>();
 
         List<Windpowerstation> wpList = InitialRunner.wpallls;
-        for (Windpowerstation wp : wpList) {
-
-            Map<String, Object> resultmap = new HashMap<String, Object>();
-            String[] agcPoints = Constant.TPOINT_WP_AGC;
-
-            Map<String, Windpowerstationpointnew> map = InitialRunner.wpPointmap.get(wp.getId());
-
-            for (int i = 0; i < agcPoints.length; i++) {
-                String ai;
-                if (map.get(agcPoints[i])!=null) {
-                    ai = map.get(agcPoints[i]).getCode();
-                    if (ai != null) {
-                        PointData data;
-                        try {
-                            data = ednaApiUtil.getRealData(ai);
-                            if (data != null) {
-
-                                if(i==0) {
-                                    resultmap.put( agcPoints[i],
-                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                }else if(i==2){
-                                    resultmap.put( agcPoints[i],
-                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                }else if(i==4){
-                                    resultmap.put( agcPoints[i],
-                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                }
-                                else if(i==5){
-                                    resultmap.put( agcPoints[i],
-                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                }
-                                else {
-                                    resultmap.put( agcPoints[i],
-                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
-
 
-                                }
+        String[] agcPoints = Constant.TPOINT_WP_AGC;
 
+        for (Windpowerstation wp : InitialRunner.wpallls) {
 
-                            }else{
-                                resultmap.put(agcPoints[i],0.0);
+            String id = wp.getId();
+            List<Windsubstation> subls = windsubstationService.findByWpId(wp.getId());
+            if (!subls.isEmpty()) {
+                for (Windsubstation sub : subls) {
+                    Map<String, Object> resultmap = new HashMap<String, Object>();
+                    resultmap.put("ddmc", sub.getName());
+                    resultmap.put("name", sub.getName());
+
+/*****************************************************各调度AGC指标******************************************************************/
+                    Map<String, Windsubstationtestingpointnew> submap = windsubstationtestingpointnewService.findBySubIdMap(sub.getId());
+                    if (!submap.isEmpty()) {
+                        List<String> jczbls = new ArrayList<>();
+
+                        for (int i = 0; i < agcPoints.length; i++) {
+                            if (submap.containsKey(agcPoints[i])) {
+                                jczbls.add(submap.get(agcPoints[i]).getCode());
                             }
-                        } catch (Exception e) {
-                            e.printStackTrace();
                         }
-                    }
-                }
 
-            }
+                        List<PointData> jczblist = realApiUtil.getRealData(jczbls);
 
-            PointData data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]));
-            resultmap.put("ycgl",MathUtil.decimal(data.getPointValueInDouble(), 2));
-            data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT));
-            double zt=data.getPointValueInDouble();
-            if(zt==5)
-            {
-                resultmap.put("zt",0);
-            }else
-            {
-                resultmap.put("zt",1);
-            }
+                        if (!jczblist.isEmpty() && jczblist.size() == jczbls.size()) {
 
-            resultmap.put("name",wp.getName());
-
-            if(wp.getId().equals("SBQ_FDC"))
-            {
-                resultmap.put("ddmc","星能第六风电场");
-            }else  if(wp.getId().equals("MHS_FDC")){
-                resultmap.put("ddmc","麻黄山第二风电场");
-            }else  if(wp.getId().equals("NSS_FDC")){
-                resultmap.put("ddmc","牛首山第二风电场");
-            }else  if(wp.getId().equals("QS_FDC")){
-                resultmap.put("ddmc","麻黄山第六风电场");
-            }else  if(wp.getId().equals("XS_FDC")){
-                resultmap.put("ddmc","香山第五风电场");
-            }else  {
-                resultmap.put("ddmc",wp.getName());
-            }
 
-            objmap.put(wp.getId(),resultmap);
+                            for (int i = 0; i < agcPoints.length; i++) {
+
+                                PointData data=jczblist.get(i);
+                                resultmap.put( agcPoints[i],MathUtil.decimal(data.getPointValueInDouble(), 2));
+                            }
+
+                        } else {
+                            for (int i = 0; i < agcPoints.length; i++) {
+
+                                resultmap.put( agcPoints[i],0.0);
+                            }
+
+                        }
+                    }
+                    objmap.put(sub.getId(),resultmap);
+                }
+            }
 
         }
+
         return objmap;
     }
 
@@ -211,141 +160,80 @@ public class AgcService {
             num++;
         }
         String[] agcPoints = Constant.TPOINT_WP_AGC;
-        String[] ycPoints = Constant.TPOINT_WP_FGLYC.split(",");
-        String[] ycPointsSB = Constant.TPOINT_WP_FGLYCSB.split(",");
-        String[] ycPoints2 = Constant.TPOINT_WP_FGLYC2.split(",");
-        String[] ycPoints2SB = Constant.TPOINT_WP_FGLYC2SB.split(",");
+
         int length = 48;
-        for (Windpowerstation wp : wpList) {
-            Calendar cal2 = Calendar.getInstance();
-            cal2.setTime(beginDate);
-            List<AgcVo> vos = new ArrayList<>();
-            for (int i = 0; i < length; i++) {
-                AgcVo vo = new AgcVo();
-//                vo.setSjgl(0.0);
-//                vo.setLlgl(0.0);
-//                vo.setXdzl(0.0);
-                vo.setTime(cal2.getTime().getTime());
-                cal2.add(Calendar.MINUTE, 30);
-                vos.add(vo);
-            }
 
-            Map<String, Windpowerstationpointnew> map = InitialRunner.wpPointmap.get(wp.getId());
-
-            Windpowerstationpointnew sjgl = map.get(agcPoints[3]);
-            if (null != sjgl) {
-                List<PointData> sjglls = ednaApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000,
-                        endDate.getTime() / 1000, (long) length, 1800L);
-                double temp1 = 0;
-                for (int i = 0; i < vos.size(); i++) {
-                    if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i).getPointTime())) {
-                        if (vos.get(i).getTime() <= new Date().getTime()) {
-                            temp1 = sjglls.get(i).getPointValueInDouble();
-                            temp1 = new BigDecimal(temp1).divide(new BigDecimal(1), 4, RoundingMode.HALF_EVEN)
-                                    .doubleValue();
-                            vos.get(i).setSjgl(StringUtils.round(temp1, 2));// 实际功率
-                        } else {
-                            vos.get(i).setSjgl(0d);// 实际功率
-                        }
-                    }
-                }
 
+        for (Windpowerstation wp : InitialRunner.wpallls) {
 
-            }
-            Windpowerstationpointnew llgl = map.get(Constant.TPOINT_WP_ZZSGL);
-            if (null != llgl) {
-                List<PointData> llglls;
-                llglls= ednaApiUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000,
-                        endDate.getTime() / 1000, (long) length, 1800L);
-                int count = 0;
-                double temp1 = 0;
-                for (int i = 0; i < vos.size(); i++) {
-
-                    if (i < llglls.size() && StringUtils.notEmp(llglls.get(i).getPointTime())) {
-
-                        if (vos.get(i).getTime() <= new Date().getTime()) {
-                            temp1 = llglls.get(i).getPointValueInDouble() / 1000;
-                            vos.get(i).setLlgl(StringUtils.round(temp1, 2));// 理论功率
-                        } else {
-                            vos.get(i).setLlgl(0d);// 理论功率
-                        }
+            String id = wp.getId();
+            List<Windsubstation> subls = windsubstationService.findByWpId(wp.getId());
+            if (!subls.isEmpty()) {
+                for (Windsubstation sub : subls) {
+
+                    Calendar cal2 = Calendar.getInstance();
+                    cal2.setTime(beginDate);
+                    List<AgcVo> vos = new ArrayList<>();
+                    for (int i = 0; i < length; i++) {
+                        AgcVo vo = new AgcVo();
+                        vo.setTime(cal2.getTime().getTime());
+                        cal2.add(Calendar.MINUTE, 30);
+                        vos.add(vo);
                     }
-                }
 
-            }
-            Windpowerstationpointnew xdgl = map.get(agcPoints[2]);
-            if (null != xdgl) {
-                List<PointData> xdglls = ednaApiUtil.getHistoryDatasSnap(xdgl, beginDate.getTime() / 1000,
-                        endDate.getTime() / 1000, (long) length, 1800L);
-                double temp1 = 0;
-                for (int i = 0; i < vos.size(); i++) {
 
-                    if (i < xdglls.size() && StringUtils.notEmp(xdglls.get(i).getPointTime())) {
+                    Map<String, Windsubstationtestingpointnew> submap = windsubstationtestingpointnewService.findBySubIdMap(sub.getId());
+                    if (!submap.isEmpty()) {
 
-                        if (vos.get(i).getTime() <= new Date().getTime()) {
-                            temp1 = xdglls.get(i).getPointValueInDouble();
-                            vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
 
-                        } else {
-                            vos.get(i).setXdzl(0d);// 限电功率
+                        if (submap.containsKey(Constant.AGC001)) {
+                            Windsubstationtestingpointnew sjgl = submap.get(Constant.AGC001);
+
+                            List<PointData> sjglls = ednaApiUtil.getHistoryDatasSnap(sjgl.getCode(), beginDate.getTime() / 1000,
+                                    endDate.getTime() / 1000, (long) length, 1800L);
+                            double temp1 = 0;
+                            for (int i = 0; i < vos.size(); i++) {
+                                if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i).getPointTime())) {
+                                    if (vos.get(i).getTime() <= new Date().getTime()) {
+                                        temp1 = sjglls.get(i).getPointValueInDouble();
+                                        temp1 = new BigDecimal(temp1).divide(new BigDecimal(1), 4, RoundingMode.HALF_EVEN)
+                                                .doubleValue();
+                                        vos.get(i).setSjgl(StringUtils.round(temp1, 2));// 实际功率
+                                    } else {
+                                        vos.get(i).setSjgl(0d);// 实际功率
+                                    }
+                                }
+                            }
                         }
-                    }
-                }
 
-            }
 
-                if (map.containsKey(ycPoints[0])) {
+                        Windsubstationtestingpointnew xdgl = submap.get(Constant.AGC002);
+                        if (null != xdgl) {
+                            List<PointData> xdglls = ednaApiUtil.getHistoryDatasSnap(xdgl.getCode(), beginDate.getTime() / 1000,
+                                    endDate.getTime() / 1000, (long) length, 1800L);
+                            double temp1 = 0;
+                            for (int i = 0; i < vos.size(); i++) {
+
+                                if (i < xdglls.size() && StringUtils.notEmp(xdglls.get(i).getPointTime())) {
+
+                                    if (vos.get(i).getTime() <= new Date().getTime()) {
+                                        temp1 = xdglls.get(i).getPointValueInDouble();
+                                        vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
 
-                        Windpowerstationpointnew ycgl1 = map.get(ycPoints[0]);
-                        if (num > 0) {
-                            List<PointData> datas = new ArrayList<PointData>();
-                            datas = ednaApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000,
-                                    endDate.getTime() / 1000, num, 1800L);
-                            for (int j = 0; j < datas.size(); j++) {
-                                vos.get(j).setYcgl(StringUtils.round(datas.get(j).getPointValueInDouble(), 2));
-                            }
-                            int subresult = 0;
-                            int total = 0;
-                            if (length > datas.size()) {
-                                subresult = length - datas.size();
-                                if (subresult >= 8) {
-                                    subresult = 8;
-                                } else {
-                                    subresult = length - datas.size();
-                                }
-                                for (int i = 0; i < subresult; i++) {
-                                    Windpowerstationpointnew ycgl = map
-                                            .get(ycPoints2[i]);
-                                    Windpowerstationpointnew ycgld = map
-                                            .get(ycPoints[i]);
-                                    double value = 0.0;
-                                    int minute = Calendar.getInstance().get(
-                                            Calendar.MINUTE);
-                                    if ((minute >= 0 && minute < 15)
-                                            || (minute >= 30 && minute < 45)) {
-                                        value = ednaApiUtil.getRealData(ycgld)
-                                                .getPointValueInDouble();
                                     } else {
-                                        value = ednaApiUtil.getRealData(ycgl)
-                                                .getPointValueInDouble();
+                                        vos.get(i).setXdzl(0d);// 限电功率
                                     }
-                                    vos.get(datas.size() + i).setYcgl(
-                                            StringUtils.round(value, 2));
                                 }
-                                total = datas.size() + subresult;
-                                subresult = length - (total);
-                                if (subresult > 0) {
-                                    for (int i = 0; i < subresult; i++) {
-                                        cal.add(Calendar.MINUTE, 30);
-                                        vos.get(total + i).setYcgl(null);
-                                    }
-                                }
-
                             }
+
                         }
+
+                        resultmap.put(sub.getId(), vos);
                     }
+                }
+
+            }
 
-            resultmap.put(wp.getId(), vos);
         }
 
 

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

@@ -10,6 +10,7 @@ import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.*;
+import com.gyee.frame.service.photovolatic.PhotovoltaicTestingPointNewService;
 import com.gyee.frame.service.weather.WeatherDay5Service;
 import com.gyee.frame.service.weather.WeatherService;
 import com.gyee.frame.util.*;
@@ -45,7 +46,8 @@ public class GenreSetPushService {
     private WeatherDay5Service weatherDay5Service;
     @Resource
     private PowerToPowerService powerToPowerService;
-
+    @Resource
+    private PhotovoltaicTestingPointNewService photovoltaicTestingPointNewService;
     @Resource
     private RecommenmainService recommenmainService;
 
@@ -403,7 +405,7 @@ public class GenreSetPushService {
                         List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
                         for (Inverter wt : wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     }
 
@@ -655,19 +657,19 @@ public class GenreSetPushService {
                         List<Inverter> wtls = InitialRunner.gp_nbqmap.get(id);
                         for(Inverter wt:wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     }  else  if( InitialRunner.pj_nbqmap.containsKey(id)){
                         List<Inverter> wtls = InitialRunner.pj_nbqmap.get(id);
                         for(Inverter wt:wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     }else if( InitialRunner.ln_nbqmap.containsKey(id)){
                         List<Inverter> wtls = InitialRunner.ln_nbqmap.get(id);
                         for(Inverter wt:wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     } else  if( InitialRunner.pj_wtmap.containsKey(id)){
                         List<Windturbine> wtls = InitialRunner.pj_wtmap.get(id);
@@ -2142,7 +2144,7 @@ public class GenreSetPushService {
                         List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
                         for (Inverter wt : wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     }
 
@@ -2162,7 +2164,7 @@ public class GenreSetPushService {
                             List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
                             for (Inverter wt : wtls) {
                                 //状态
-                                gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                                gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                             }
                         }
 
@@ -2355,19 +2357,19 @@ public class GenreSetPushService {
                         List<Inverter> wtls = InitialRunner.gp_nbqmap.get(id);
                         for(Inverter wt:wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     }  else  if( InitialRunner.pj_nbqmap.containsKey(id)){
                         List<Inverter> wtls = InitialRunner.pj_nbqmap.get(id);
                         for(Inverter wt:wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     }else if( InitialRunner.ln_nbqmap.containsKey(id)){
                         List<Inverter> wtls = InitialRunner.ln_nbqmap.get(id);
                         for(Inverter wt:wtls) {
                             //状态
-                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                            gfzbls.add(photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), Constant.FJZT).getCode());
                         }
                     } else  if( InitialRunner.pj_wtmap.containsKey(id)){
                         List<Windturbine> wtls = InitialRunner.pj_wtmap.get(id);

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

@@ -6,6 +6,7 @@ import com.google.common.collect.Maps;
 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.JunctionboxVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.*;
 import com.gyee.frame.service.photovolatic.JunctionboxService;
@@ -39,7 +40,8 @@ public class WtInfoPushService {
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 
     String QS_FDC = "QS_FDC";
-
+    String JZ = "JZ";
+    String ZC="ZC";
     public Map<String, Object> genreSetMap() throws Exception {
 
         Map<String, Object> map = new HashMap<>();
@@ -1160,69 +1162,78 @@ public class WtInfoPushService {
         return vos;
     }
 
-	public List<Map<String, Object>> findInverterInfoList(String wpId) throws Exception {
-		List<Map<String, Object>> vos = new ArrayList<>();
+	public List<JunctionboxVo> findInverterInfoList(String wpId) throws Exception {
+        List<JunctionboxVo> vos=new ArrayList<>();
 		if (StringUtils.notEmp(wpId) && InitialRunner.gp_nbqmap.containsKey(wpId)) {
 			List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wpId);
 			for (Inverter wt : wtls) {
-				Map<String, Object> map = new HashMap<String, Object>();
-				map.put("model", wt.getModelid());
-				map.put("wpid", wt.getWindpowerstationid());
-				map.put("pjid", wt.getProjectid());
-				map.put("lnid", wt.getLineid());
-				map.put("code", wt.getCode());
-				map.put("wtId", wt.getId());
 
-                List<Junctionbox> jbls=junctionboxService.selectByInverterId(wpId);
+			    if(StringUtils.notEmp(wt.getSquareid()) && InitialRunner.sqmap.containsKey(wt.getSquareid()))
+                {
+                    Square square=InitialRunner.sqmap.get(wt.getSquareid());
+
+                    if(square.getTypes().equals(ZC))
+                    {
+                        continue;
+                    }
+                }
+
+                List<Junctionbox> jbls=junctionboxService.selectByInverterId(wt.getId());
 
                 if(!jbls.isEmpty())
                 {
+                    List<String> pointcodes=new ArrayList<>();
                     for(Junctionbox jb:jbls)
                     {
+                        String[] strs=Constant.TPOINT_Inverter_Junctionbox;
+                        for(int i=0;i<strs.length;i++)
+                        {
+                            PhotovoltaicTestingPointNew pt=photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(jb.getId(),strs[i]);
+                            if(StringUtils.notEmp(pt) && StringUtils.notEmp(pt.getCode()))
+                            {
+                                pointcodes.add(pt.getCode());
+                            }
+                        }
+
+                        List<PointData> ptlist = realApiUtil.getRealData(pointcodes);
+
+                        if(!ptlist.isEmpty() && ptlist.size()==pointcodes.size())
+                        {
+                            JunctionboxVo vo=new JunctionboxVo();
+                            vo.setId(jb.getId());
+                            vo.setName(jb.getName());
+                            vo.setZdy(ptlist.get(0).getPointValueInDouble());
+                            vo.setDl1(ptlist.get(1).getPointValueInDouble());
+                            vo.setDl2(ptlist.get(2).getPointValueInDouble());
+                            vo.setDl3(ptlist.get(3).getPointValueInDouble());
+                            vo.setDl4(ptlist.get(4).getPointValueInDouble());
+                            vo.setDl5(ptlist.get(5).getPointValueInDouble());
+                            vo.setDl6(ptlist.get(6).getPointValueInDouble());
+                            vo.setDl7(ptlist.get(7).getPointValueInDouble());
+                            vo.setDl8(ptlist.get(8).getPointValueInDouble());
+                            vo.setDl9(ptlist.get(9).getPointValueInDouble());
+                            vo.setDl10(ptlist.get(10).getPointValueInDouble());
+                            vo.setDl11(ptlist.get(11).getPointValueInDouble());
+                            vo.setDl12(ptlist.get(12).getPointValueInDouble());
+                            vo.setDl13(ptlist.get(13).getPointValueInDouble());
+                            vo.setDl14(ptlist.get(14).getPointValueInDouble());
+                            vo.setDl15(ptlist.get(15).getPointValueInDouble());
+                            vo.setDl16(ptlist.get(16).getPointValueInDouble());
+                            vos.add(vo);
+                        }
 
                     }
-                }
-				List<String> zbls = new ArrayList<>();
 
 
-				String[] codeName[] = { 
-						{ Constant.TPOINT_NBQ_JLDY, "交流电压"},
-						{ Constant.TPOINT_NBQ_ZLDY, "直流电压"},
-						{ Constant.TPOINT_NBQ_JLDL, "交流电流"},
-						{ Constant.TPOINT_NBQ_ZLDL, "直流电流"},
-						{ Constant.TPOINT_NBQ_XL, "逆变效率" },
-						{ Constant.TPOINT_NBQ_GL, "有功功率"},
-						{ Constant.TPOINT_NBQ_GLYS, "功率因数" },
-						{ Constant.TPOINT_NBQ_RFDL, "日发电量" },
-						{ Constant.TPOINT_NBQ_YFDL, "月发电量" },
-						{ Constant.TPOINT_NBQ_NFDL, "年发电量" },
-						{ Constant.TPOINT_NBQ_ZFDL, "累计发电量" }
-				};
-				// 遍历定义码，获取测点Id集合
-				Map<String, String> pointUniformMap = Maps.newHashMap();
-				for (String[] str1 : codeName) {
-					String pointid =photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNew(wt.getId(), str1[0]).getCode();
-					zbls.add(pointid);
-					pointUniformMap.put(pointid, str1[0]);
-				}
-				// 获取测点值，与定义码绑定
-				List<PointData> zblist = realApiUtil.getRealData(zbls);
-//				Map<String, Object> uniformValueMap = Maps.newHashMap();
-//				uniformValueMap.put("定义码对照", codeName);
-				for (PointData p : zblist) {
-					String ednaId = p.getEdnaId();
-					Double val = MathUtil.twoBit(p.getPointValueInDouble());
-					String uniformCode = pointUniformMap.get(ednaId);
-					map.put(uniformCode, val);
-				}
-				vos.add(map);
+                }
+
 			}
 		}
 		return vos;
 	}
 
 	public Object findInverterDI(String id) throws Exception {
-		List<PhotovoltaicTestingPointNew> pointList = photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNewList(id);
+		List<PhotovoltaicTestingPointNew> pointList = photovoltaicTestingPointNewService.getPhotovoltaicTestingPointNewDiList(id);
 		Map<String, String> idName = Maps.newHashMap();
 		List<String> pointids = Lists.newArrayList();
 		for (PhotovoltaicTestingPointNew point : pointList) {

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

@@ -57,16 +57,16 @@ server :
 #dev环境  mysql7.0
 spring :
   application:
-    name: monitor-hb-provider
-    cloud:
-      nacos:
-        discovery:
-          server-addr: 10.81.3.155:8848
-          #指定yaml格式的配置
-          file-extension: yaml
-          cluster-name: master
-        username: nacos
-        password: nacos
+#    name: monitor-hb-provider
+#    cloud:
+#      nacos:
+#        discovery:
+#          server-addr: 10.81.3.155:8848
+#          #指定yaml格式的配置
+#          file-extension: yaml
+#          cluster-name: master
+#        username: nacos
+#        password: nacos
     #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
     #include: ftpHX,ftpCloud
   servlet:

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

@@ -125,7 +125,7 @@
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
 
-        <table tableName='PhotovoltaicStandardPoint' domainObjectName='PhotovoltaicStandardPoint'/>
+        <table tableName='Windsubandwindturbiinereal' domainObjectName='Windsubandwindturbiinereal'/>
 
 
     </context>

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

@@ -0,0 +1,241 @@
+<?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.WindsubandwindturbiinerealMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windsubandwindturbiinereal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="windturbineid" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="windsubstationid" jdbcType="VARCHAR" property="windsubstationid" />
+  </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, windturbineid, windsubstationid
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindsubandwindturbiinerealExample" 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 windsubandwindturbiinereal
+    <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 windsubandwindturbiinereal
+    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 windsubandwindturbiinereal
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindsubandwindturbiinerealExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from windsubandwindturbiinereal
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windsubandwindturbiinereal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into windsubandwindturbiinereal (id, windturbineid, windsubstationid
+      )
+    values (#{id,jdbcType=VARCHAR}, #{windturbineid,jdbcType=VARCHAR}, #{windsubstationid,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Windsubandwindturbiinereal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into windsubandwindturbiinereal
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="windturbineid != null">
+        windturbineid,
+      </if>
+      <if test="windsubstationid != null">
+        windsubstationid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="windsubstationid != null">
+        #{windsubstationid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindsubandwindturbiinerealExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from windsubandwindturbiinereal
+    <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 windsubandwindturbiinereal
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windturbineid != null">
+        windturbineid = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windsubstationid != null">
+        windsubstationid = #{record.windsubstationid,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 windsubandwindturbiinereal
+    set id = #{record.id,jdbcType=VARCHAR},
+      windturbineid = #{record.windturbineid,jdbcType=VARCHAR},
+      windsubstationid = #{record.windsubstationid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Windsubandwindturbiinereal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update windsubandwindturbiinereal
+    <set>
+      <if test="windturbineid != null">
+        windturbineid = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="windsubstationid != null">
+        windsubstationid = #{windsubstationid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windsubandwindturbiinereal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update windsubandwindturbiinereal
+    set windturbineid = #{windturbineid,jdbcType=VARCHAR},
+      windsubstationid = #{windsubstationid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -6,23 +6,24 @@
       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="UNIFORMCODE" jdbcType="VARCHAR" property="uniformcode" />
-    <result column="SHORTID" jdbcType="VARCHAR" property="shortid" />
-    <result column="LONGID" jdbcType="VARCHAR" property="longid" />
-    <result column="WINDSUBSTATIONID" jdbcType="VARCHAR" property="windsubstationid" />
-    <result column="REALTIMEID" jdbcType="VARCHAR" property="realtimeid" />
+    <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="NUMERIC" property="maxval" />
+    <result column="minval" jdbcType="NUMERIC" property="minval" />
+    <result column="reasonablemaxval" jdbcType="NUMERIC" property="reasonablemaxval" />
+    <result column="reasonableminval" jdbcType="NUMERIC" property="reasonableminval" />
+    <result column="windsubstationid" jdbcType="VARCHAR" property="windsubstationid" />
+    <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">
     <!--
@@ -95,8 +96,9 @@
       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, UNIFORMCODE, SHORTID, LONGID, WINDSUBSTATIONID, REALTIMEID
+    id, code, name, model, valueunit, englishname, typeid, modelid, maxval, minval, reasonablemaxval, 
+    reasonableminval, windsubstationid, uniformcode, shortid, longid, windpowerstationid, 
+    realtimeid
   </sql>
   <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindsubstationtestingpointnewExample" resultMap="BaseResultMap">
     <!--
@@ -108,7 +110,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from WINDSUBSTATIONTESTINGPOINTNEW
+    from windsubstationtestingpointnew
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -123,23 +125,23 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from WINDSUBSTATIONTESTINGPOINTNEW
-    where ID = #{id,jdbcType=VARCHAR}
+    from windsubstationtestingpointnew
+    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 WINDSUBSTATIONTESTINGPOINTNEW
-    where ID = #{id,jdbcType=VARCHAR}
+    delete from windsubstationtestingpointnew
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindsubstationtestingpointnewExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from WINDSUBSTATIONTESTINGPOINTNEW
+    delete from windsubstationtestingpointnew
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -149,76 +151,81 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDSUBSTATIONTESTINGPOINTNEW (ID, CODE, NAME, 
-      MODEL, VALUEUNIT, ENGLISHNAME, 
-      TYPEID, MODELID, MAXVAL, 
-      MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, 
-      UNIFORMCODE, SHORTID, LONGID, 
-      WINDSUBSTATIONID, REALTIMEID)
+    insert into windsubstationtestingpointnew (id, code, name, 
+      model, valueunit, englishname, 
+      typeid, modelid, maxval, 
+      minval, reasonablemaxval, reasonableminval, 
+      windsubstationid, 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}, 
-      #{uniformcode,jdbcType=VARCHAR}, #{shortid,jdbcType=VARCHAR}, #{longid,jdbcType=VARCHAR}, 
-      #{windsubstationid,jdbcType=VARCHAR}, #{realtimeid,jdbcType=VARCHAR})
+      #{typeid,jdbcType=VARCHAR}, #{modelid,jdbcType=VARCHAR}, #{maxval,jdbcType=NUMERIC}, 
+      #{minval,jdbcType=NUMERIC}, #{reasonablemaxval,jdbcType=NUMERIC}, #{reasonableminval,jdbcType=NUMERIC}, 
+      #{windsubstationid,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.Windsubstationtestingpointnew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into WINDSUBSTATIONTESTINGPOINTNEW
+    insert into windsubstationtestingpointnew
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
-        ID,
+        id,
       </if>
       <if test="code != null">
-        CODE,
+        code,
       </if>
       <if test="name != null">
-        NAME,
+        name,
       </if>
       <if test="model != null">
-        MODEL,
+        model,
       </if>
       <if test="valueunit != null">
-        VALUEUNIT,
+        valueunit,
       </if>
       <if test="englishname != null">
-        ENGLISHNAME,
+        englishname,
       </if>
       <if test="typeid != null">
-        TYPEID,
+        typeid,
       </if>
       <if test="modelid != null">
-        MODELID,
+        modelid,
       </if>
       <if test="maxval != null">
-        MAXVAL,
+        maxval,
       </if>
       <if test="minval != null">
-        MINVAL,
+        minval,
       </if>
       <if test="reasonablemaxval != null">
-        REASONABLEMAXVAL,
+        reasonablemaxval,
       </if>
       <if test="reasonableminval != null">
-        REASONABLEMINVAL,
+        reasonableminval,
+      </if>
+      <if test="windsubstationid != null">
+        windsubstationid,
       </if>
       <if test="uniformcode != null">
-        UNIFORMCODE,
+        uniformcode,
       </if>
       <if test="shortid != null">
-        SHORTID,
+        shortid,
       </if>
       <if test="longid != null">
-        LONGID,
+        longid,
       </if>
-      <if test="windsubstationid != null">
-        WINDSUBSTATIONID,
+      <if test="windpowerstationid != null">
+        windpowerstationid,
       </if>
       <if test="realtimeid != null">
-        REALTIMEID,
+        realtimeid,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -247,16 +254,19 @@
         #{modelid,jdbcType=VARCHAR},
       </if>
       <if test="maxval != null">
-        #{maxval,jdbcType=DECIMAL},
+        #{maxval,jdbcType=NUMERIC},
       </if>
       <if test="minval != null">
-        #{minval,jdbcType=DECIMAL},
+        #{minval,jdbcType=NUMERIC},
       </if>
       <if test="reasonablemaxval != null">
-        #{reasonablemaxval,jdbcType=DECIMAL},
+        #{reasonablemaxval,jdbcType=NUMERIC},
       </if>
       <if test="reasonableminval != null">
-        #{reasonableminval,jdbcType=DECIMAL},
+        #{reasonableminval,jdbcType=NUMERIC},
+      </if>
+      <if test="windsubstationid != null">
+        #{windsubstationid,jdbcType=VARCHAR},
       </if>
       <if test="uniformcode != null">
         #{uniformcode,jdbcType=VARCHAR},
@@ -267,8 +277,8 @@
       <if test="longid != null">
         #{longid,jdbcType=VARCHAR},
       </if>
-      <if test="windsubstationid != null">
-        #{windsubstationid,jdbcType=VARCHAR},
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
       </if>
       <if test="realtimeid != null">
         #{realtimeid,jdbcType=VARCHAR},
@@ -280,7 +290,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from WINDSUBSTATIONTESTINGPOINTNEW
+    select count(*) from windsubstationtestingpointnew
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -290,58 +300,61 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDSUBSTATIONTESTINGPOINTNEW
+    update windsubstationtestingpointnew
     <set>
       <if test="record.id != null">
-        ID = #{record.id,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.code != null">
-        CODE = #{record.code,jdbcType=VARCHAR},
+        code = #{record.code,jdbcType=VARCHAR},
       </if>
       <if test="record.name != null">
-        NAME = #{record.name,jdbcType=VARCHAR},
+        name = #{record.name,jdbcType=VARCHAR},
       </if>
       <if test="record.model != null">
-        MODEL = #{record.model,jdbcType=VARCHAR},
+        model = #{record.model,jdbcType=VARCHAR},
       </if>
       <if test="record.valueunit != null">
-        VALUEUNIT = #{record.valueunit,jdbcType=VARCHAR},
+        valueunit = #{record.valueunit,jdbcType=VARCHAR},
       </if>
       <if test="record.englishname != null">
-        ENGLISHNAME = #{record.englishname,jdbcType=VARCHAR},
+        englishname = #{record.englishname,jdbcType=VARCHAR},
       </if>
       <if test="record.typeid != null">
-        TYPEID = #{record.typeid,jdbcType=VARCHAR},
+        typeid = #{record.typeid,jdbcType=VARCHAR},
       </if>
       <if test="record.modelid != null">
-        MODELID = #{record.modelid,jdbcType=VARCHAR},
+        modelid = #{record.modelid,jdbcType=VARCHAR},
       </if>
       <if test="record.maxval != null">
-        MAXVAL = #{record.maxval,jdbcType=DECIMAL},
+        maxval = #{record.maxval,jdbcType=NUMERIC},
       </if>
       <if test="record.minval != null">
-        MINVAL = #{record.minval,jdbcType=DECIMAL},
+        minval = #{record.minval,jdbcType=NUMERIC},
       </if>
       <if test="record.reasonablemaxval != null">
-        REASONABLEMAXVAL = #{record.reasonablemaxval,jdbcType=DECIMAL},
+        reasonablemaxval = #{record.reasonablemaxval,jdbcType=NUMERIC},
       </if>
       <if test="record.reasonableminval != null">
-        REASONABLEMINVAL = #{record.reasonableminval,jdbcType=DECIMAL},
+        reasonableminval = #{record.reasonableminval,jdbcType=NUMERIC},
+      </if>
+      <if test="record.windsubstationid != null">
+        windsubstationid = #{record.windsubstationid,jdbcType=VARCHAR},
       </if>
       <if test="record.uniformcode != null">
-        UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+        uniformcode = #{record.uniformcode,jdbcType=VARCHAR},
       </if>
       <if test="record.shortid != null">
-        SHORTID = #{record.shortid,jdbcType=VARCHAR},
+        shortid = #{record.shortid,jdbcType=VARCHAR},
       </if>
       <if test="record.longid != null">
-        LONGID = #{record.longid,jdbcType=VARCHAR},
+        longid = #{record.longid,jdbcType=VARCHAR},
       </if>
-      <if test="record.windsubstationid != null">
-        WINDSUBSTATIONID = #{record.windsubstationid,jdbcType=VARCHAR},
+      <if test="record.windpowerstationid != null">
+        windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
       </if>
       <if test="record.realtimeid != null">
-        REALTIMEID = #{record.realtimeid,jdbcType=VARCHAR},
+        realtimeid = #{record.realtimeid,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -353,24 +366,25 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDSUBSTATIONTESTINGPOINTNEW
-    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},
-      UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
-      SHORTID = #{record.shortid,jdbcType=VARCHAR},
-      LONGID = #{record.longid,jdbcType=VARCHAR},
-      WINDSUBSTATIONID = #{record.windsubstationid,jdbcType=VARCHAR},
-      REALTIMEID = #{record.realtimeid,jdbcType=VARCHAR}
+    update windsubstationtestingpointnew
+    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=NUMERIC},
+      minval = #{record.minval,jdbcType=NUMERIC},
+      reasonablemaxval = #{record.reasonablemaxval,jdbcType=NUMERIC},
+      reasonableminval = #{record.reasonableminval,jdbcType=NUMERIC},
+      windsubstationid = #{record.windsubstationid,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>
@@ -380,81 +394,85 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDSUBSTATIONTESTINGPOINTNEW
+    update windsubstationtestingpointnew
     <set>
       <if test="code != null">
-        CODE = #{code,jdbcType=VARCHAR},
+        code = #{code,jdbcType=VARCHAR},
       </if>
       <if test="name != null">
-        NAME = #{name,jdbcType=VARCHAR},
+        name = #{name,jdbcType=VARCHAR},
       </if>
       <if test="model != null">
-        MODEL = #{model,jdbcType=VARCHAR},
+        model = #{model,jdbcType=VARCHAR},
       </if>
       <if test="valueunit != null">
-        VALUEUNIT = #{valueunit,jdbcType=VARCHAR},
+        valueunit = #{valueunit,jdbcType=VARCHAR},
       </if>
       <if test="englishname != null">
-        ENGLISHNAME = #{englishname,jdbcType=VARCHAR},
+        englishname = #{englishname,jdbcType=VARCHAR},
       </if>
       <if test="typeid != null">
-        TYPEID = #{typeid,jdbcType=VARCHAR},
+        typeid = #{typeid,jdbcType=VARCHAR},
       </if>
       <if test="modelid != null">
-        MODELID = #{modelid,jdbcType=VARCHAR},
+        modelid = #{modelid,jdbcType=VARCHAR},
       </if>
       <if test="maxval != null">
-        MAXVAL = #{maxval,jdbcType=DECIMAL},
+        maxval = #{maxval,jdbcType=NUMERIC},
       </if>
       <if test="minval != null">
-        MINVAL = #{minval,jdbcType=DECIMAL},
+        minval = #{minval,jdbcType=NUMERIC},
       </if>
       <if test="reasonablemaxval != null">
-        REASONABLEMAXVAL = #{reasonablemaxval,jdbcType=DECIMAL},
+        reasonablemaxval = #{reasonablemaxval,jdbcType=NUMERIC},
       </if>
       <if test="reasonableminval != null">
-        REASONABLEMINVAL = #{reasonableminval,jdbcType=DECIMAL},
+        reasonableminval = #{reasonableminval,jdbcType=NUMERIC},
+      </if>
+      <if test="windsubstationid != null">
+        windsubstationid = #{windsubstationid,jdbcType=VARCHAR},
       </if>
       <if test="uniformcode != null">
-        UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+        uniformcode = #{uniformcode,jdbcType=VARCHAR},
       </if>
       <if test="shortid != null">
-        SHORTID = #{shortid,jdbcType=VARCHAR},
+        shortid = #{shortid,jdbcType=VARCHAR},
       </if>
       <if test="longid != null">
-        LONGID = #{longid,jdbcType=VARCHAR},
+        longid = #{longid,jdbcType=VARCHAR},
       </if>
-      <if test="windsubstationid != null">
-        WINDSUBSTATIONID = #{windsubstationid,jdbcType=VARCHAR},
+      <if test="windpowerstationid != null">
+        windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
       </if>
       <if test="realtimeid != null">
-        REALTIMEID = #{realtimeid,jdbcType=VARCHAR},
+        realtimeid = #{realtimeid,jdbcType=VARCHAR},
       </if>
     </set>
-    where ID = #{id,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windsubstationtestingpointnew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update WINDSUBSTATIONTESTINGPOINTNEW
-    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},
-      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
-      SHORTID = #{shortid,jdbcType=VARCHAR},
-      LONGID = #{longid,jdbcType=VARCHAR},
-      WINDSUBSTATIONID = #{windsubstationid,jdbcType=VARCHAR},
-      REALTIMEID = #{realtimeid,jdbcType=VARCHAR}
-    where ID = #{id,jdbcType=VARCHAR}
+    update windsubstationtestingpointnew
+    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=NUMERIC},
+      minval = #{minval,jdbcType=NUMERIC},
+      reasonablemaxval = #{reasonablemaxval,jdbcType=NUMERIC},
+      reasonableminval = #{reasonableminval,jdbcType=NUMERIC},
+      windsubstationid = #{windsubstationid,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>