Browse Source

添加逆变器判定

shilin 2 years ago
parent
commit
03c3b6d4c4
41 changed files with 13507 additions and 196 deletions
  1. 173 1
      web/monitor-hb/src/main/java/com/gyee/frame/common/spring/InitialRunner.java
  2. 97 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/BoxChangeMapper.java
  3. 97 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/InverterMapper.java
  4. 65 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/InverterStandardPointMapper.java
  5. 97 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/JunctionboxMapper.java
  6. 65 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/PhotovoltaicStandardPointMapper.java
  7. 97 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/PhotovoltaicTestingPointNewMapper.java
  8. 97 0
      web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/SquareMapper.java
  9. 244 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/BoxChange.java
  10. 792 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/BoxChangeExample.java
  11. 343 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/Inverter.java
  12. 992 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/InverterExample.java
  13. 211 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/InverterStandardPoint.java
  14. 722 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/InverterStandardPointExample.java
  15. 310 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/Junctionbox.java
  16. 932 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/JunctionboxExample.java
  17. 178 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicStandardPoint.java
  18. 652 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicStandardPointExample.java
  19. 773 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicTestingPointNew.java
  20. 1873 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicTestingPointNewExample.java
  21. 244 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/Square.java
  22. 792 0
      web/monitor-hb/src/main/java/com/gyee/frame/model/auto/SquareExample.java
  23. 100 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/BoxChangeService.java
  24. 100 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/InverterService.java
  25. 119 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/InverterStandardPointService.java
  26. 109 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/JunctionboxService.java
  27. 40 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/PhotoVolaticType.java
  28. 109 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/PhotovoltaicStandardPointService.java
  29. 148 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/PhotovoltaicTestingPointNewService.java
  30. 100 0
      web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/SquareService.java
  31. 251 78
      web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java
  32. 84 38
      web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixDetialPushService.java
  33. 81 29
      web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixPushService.java
  34. 122 50
      web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java
  35. 303 0
      web/monitor-hb/src/main/resources/mybatis/auto/BoxChangeMapper.xml
  36. 351 0
      web/monitor-hb/src/main/resources/mybatis/auto/InverterMapper.xml
  37. 232 0
      web/monitor-hb/src/main/resources/mybatis/auto/InverterStandardPointMapper.xml
  38. 335 0
      web/monitor-hb/src/main/resources/mybatis/auto/JunctionboxMapper.xml
  39. 219 0
      web/monitor-hb/src/main/resources/mybatis/auto/PhotovoltaicStandardPointMapper.xml
  40. 555 0
      web/monitor-hb/src/main/resources/mybatis/auto/PhotovoltaicTestingPointNewMapper.xml
  41. 303 0
      web/monitor-hb/src/main/resources/mybatis/auto/SquareMapper.xml

+ 173 - 1
web/monitor-hb/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.gyee.frame.common.cache.IGlobalCache;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.service.*;
+import com.gyee.frame.service.photovolatic.*;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
@@ -62,7 +63,16 @@ public class InitialRunner implements CommandLineRunner {
     private Alertrule2ervice alertrule2ervice;
     @Resource
     private WindturbinepartsService windturbinepartsService;
-
+    @Resource
+    private SquareService squareService;
+    @Resource
+    private InverterService inverterService;
+    @Resource
+    private BoxChangeService boxChangeService;
+    @Resource
+    private JunctionboxService junctionboxService;
+    @Resource
+    private PhotovoltaicTestingPointNewService photovoltaicTestingPointNewService;
     public static List<Windpowerstation> wpallls = new ArrayList<Windpowerstation>(); // 风电场LIST集合(包含光电电)
     public static List<Project> pjallls = new ArrayList<Project>(); //项目LIST集合(包含光电电)
     public static List<Line> lineallls = new ArrayList<Line>(); // 线路LIST集合(包含光电电)
@@ -123,10 +133,172 @@ public class InitialRunner implements CommandLineRunner {
     private final String FD = "-1";
     private final String GF = "-2";
 
+
+    /***********************************************光伏初始化*************************************************************/
+    public static Map<String,Square> sqmap = new HashMap<String, Square>();
+
+
+    public static Map<String, List<BoxChange>> gp_xbmap = new HashMap<String, List<BoxChange>>();
+    public static Map<String,BoxChange> xbmap = new HashMap<String, BoxChange>();
+    public static Map<String, List<Inverter>> gp_nbqmap = new HashMap<String, List<Inverter>>();
+    public static Map<String, List<Inverter>> pj_nbqmap = new HashMap<String, List<Inverter>>();
+    public static Map<String, List<Inverter>> ln_nbqmap = new HashMap<String, List<Inverter>>();
+    public static Map<String, List<Inverter>> sq_nbqmap = new HashMap<String, List<Inverter>>();
+    public static Map<String,Inverter> nbqmap = new HashMap<String, Inverter>();
+    public static Map<String, List<Junctionbox>> gp_hlxmap = new HashMap<String, List<Junctionbox>>();
+    public static Map<String,Junctionbox> hlxmap = new HashMap<String, Junctionbox>();
+    public static Map<String, Map<String, PhotovoltaicTestingPointNew>> phPointmap = new HashMap<String, Map<String, PhotovoltaicTestingPointNew>>();// 逆变器测点
+    /***********************************************光伏初始化*************************************************************/
+
     @Override
     public void run(String... args) throws Exception {
         System.out.println(">>>>>>>>>>>>>>>服务启动执行,换成测点关联数据 <<<<<<<<<<<<<");
 
+//        List<Square> sqqls=squareService.selectAll();
+//        if(!sqqls.isEmpty())
+//        {
+//            for (Square sq : sqqls) {
+//                sqmap.put(sq.getId(),sq);
+//            }
+//        }
+//
+//        List<Inverter> nbqls=inverterService.selectAll();
+//
+//        if(!nbqls.isEmpty())
+//        {
+//            for (Inverter it : nbqls) {
+//                if (gp_nbqmap.containsKey(it.getWindpowerstationid())) {
+//                    List<Inverter> ls=gp_nbqmap.get(it.getWindpowerstationid());
+//                    ls.add(it);
+//                    gp_nbqmap.put(it.getWindpowerstationid(),ls);
+//                }else
+//                {
+//                    List<Inverter> ls=new ArrayList<>();
+//                    ls.add(it);
+//                    gp_nbqmap.put(it.getWindpowerstationid(),ls);
+//                }
+//                if (sq_nbqmap.containsKey(it.getSquareid())) {
+//                    List<Inverter> ls=sq_nbqmap.get(it.getSquareid());
+//                    ls.add(it);
+//                    sq_nbqmap.put(it.getSquareid(),ls);
+//                }else
+//                {
+//                    List<Inverter> ls=new ArrayList<>();
+//                    ls.add(it);
+//                    sq_nbqmap.put(it.getSquareid(),ls);
+//                }
+//
+//                if (pj_nbqmap.containsKey(it.getProjectid())) {
+//                    List<Inverter> ls = pj_nbqmap.get(it.getProjectid());
+//                    ls.add(it);
+//                    pj_nbqmap.put(it.getProjectid(), ls);
+//                } else {
+//                    List<Inverter> ls = new ArrayList();
+//                    ls.add(it);
+//                    pj_nbqmap.put(it.getProjectid(), ls);
+//                }
+//
+//
+//                if (ln_nbqmap.containsKey(it.getLineid())) {
+//                    List<Inverter> ls = ln_nbqmap.get(it.getLineid());
+//                    ls.add(it);
+//                    ln_nbqmap.put(it.getLineid(), ls);
+//                } else {
+//                    List<Inverter> ls = new ArrayList();
+//                    ls.add(it);
+//                    ln_nbqmap.put(it.getLineid(), ls);
+//                }
+//
+//                nbqmap.put(it.getId(),it);
+//            }
+//        }
+//
+//
+//        List<BoxChange> xbls=boxChangeService.selectAll();
+//
+//        if(!xbls.isEmpty())
+//        {
+//            for (BoxChange it : xbls) {
+//                if (gp_xbmap.containsKey(it.getWindpowerstationid())) {
+//                    List<BoxChange> ls=gp_xbmap.get(it.getWindpowerstationid());
+//                    ls.add(it);
+//                    gp_xbmap.put(it.getWindpowerstationid(),ls);
+//                }else
+//                {
+//                    List<BoxChange> ls=new ArrayList<>();
+//                    ls.add(it);
+//                    gp_xbmap.put(it.getWindpowerstationid(),ls);
+//                }
+//
+//                xbmap.put(it.getId(),it);
+//            }
+//        }
+//
+//        List<Junctionbox> hlxls=junctionboxService.selectAll();
+//
+//        if(!hlxls.isEmpty())
+//        {
+//            for (Junctionbox it : hlxls) {
+//                if (gp_hlxmap.containsKey(it.getWindpowerstationid())) {
+//                    List<Junctionbox> ls=gp_hlxmap.get(it.getWindpowerstationid());
+//                    ls.add(it);
+//                    gp_hlxmap.put(it.getWindpowerstationid(),ls);
+//                }else
+//                {
+//                    List<Junctionbox> ls=new ArrayList<>();
+//                    ls.add(it);
+//                    gp_hlxmap.put(it.getWindpowerstationid(),ls);
+//                }
+//                hlxmap.put(it.getId(),it);
+//            }
+//        }
+//
+//        List<PhotovoltaicTestingPointNew> phls=photovoltaicTestingPointNewService.selectAll();
+//
+//        if(!phls.isEmpty())
+//        {
+//            for(PhotovoltaicTestingPointNew mp : phls){
+//
+//                if(mp.getTypes().equals(PhotoVolaticType.XB))
+//                {
+//
+//                    if(phPointmap.containsKey(mp.getBoxchangeid())){
+//                        Map<String, PhotovoltaicTestingPointNew> map = phPointmap.get(mp.getBoxchangeid());
+//                        map.put(mp.getUniformcode(), mp);
+//                        phPointmap.put(mp.getBoxchangeid(), map);
+//                    }else{
+//                        Map<String, PhotovoltaicTestingPointNew> map = new HashMap<String, PhotovoltaicTestingPointNew>();
+//                        map.put(mp.getUniformcode(), mp);
+//                        phPointmap.put(mp.getBoxchangeid(), map);
+//                    }
+//                }else if(mp.getTypes().equals(PhotoVolaticType.NBQ))
+//                {
+//
+//                    if(phPointmap.containsKey(mp.getInverterid())){
+//                        Map<String, PhotovoltaicTestingPointNew> map = phPointmap.get(mp.getInverterid());
+//                        map.put(mp.getUniformcode(), mp);
+//                        phPointmap.put(mp.getInverterid(), map);
+//                    }else{
+//                        Map<String, PhotovoltaicTestingPointNew> map = new HashMap<String, PhotovoltaicTestingPointNew>();
+//                        map.put(mp.getUniformcode(), mp);
+//                        phPointmap.put(mp.getInverterid(), map);
+//                    }
+//                }else if(mp.getTypes().equals(PhotoVolaticType.HLX))
+//                {
+//
+//                    if(phPointmap.containsKey(mp.getJunctionboxid())){
+//                        Map<String, PhotovoltaicTestingPointNew> map = phPointmap.get(mp.getJunctionboxid());
+//                        map.put(mp.getUniformcode(), mp);
+//                        phPointmap.put(mp.getJunctionboxid(), map);
+//                    }else{
+//                        Map<String, PhotovoltaicTestingPointNew> map = new HashMap<String, PhotovoltaicTestingPointNew>();
+//                        map.put(mp.getUniformcode(), mp);
+//                        phPointmap.put(mp.getJunctionboxid(), map);
+//                    }
+//                }
+//
+//            }
+//        }
         //配置追加功率曲线测点
         Map<String, Object> ycmap = new HashMap<>();
 

+ 97 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/BoxChangeMapper.java

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

+ 97 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/InverterMapper.java

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

+ 65 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/InverterStandardPointMapper.java

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

+ 97 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/JunctionboxMapper.java

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

+ 65 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/PhotovoltaicStandardPointMapper.java

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

+ 97 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/PhotovoltaicTestingPointNewMapper.java

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

+ 97 - 0
web/monitor-hb/src/main/java/com/gyee/frame/mapper/auto/SquareMapper.java

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

+ 244 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/BoxChange.java

@@ -0,0 +1,244 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class BoxChange implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.projectid
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.lineid
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column boxchange.squareid
+     *
+     * @mbg.generated
+     */
+    private String squareid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column boxchange.id
+     *
+     * @return the value of boxchange.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.id
+     *
+     * @param id the value for boxchange.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 boxchange.code
+     *
+     * @return the value of boxchange.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.code
+     *
+     * @param code the value for boxchange.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column boxchange.windpowerstationid
+     *
+     * @return the value of boxchange.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.windpowerstationid
+     *
+     * @param windpowerstationid the value for boxchange.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column boxchange.projectid
+     *
+     * @return the value of boxchange.projectid
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.projectid
+     *
+     * @param projectid the value for boxchange.projectid
+     *
+     * @mbg.generated
+     */
+    public void setProjectid(String projectid) {
+        this.projectid = projectid == null ? null : projectid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column boxchange.lineid
+     *
+     * @return the value of boxchange.lineid
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.lineid
+     *
+     * @param lineid the value for boxchange.lineid
+     *
+     * @mbg.generated
+     */
+    public void setLineid(String lineid) {
+        this.lineid = lineid == null ? null : lineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column boxchange.name
+     *
+     * @return the value of boxchange.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.name
+     *
+     * @param name the value for boxchange.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column boxchange.squareid
+     *
+     * @return the value of boxchange.squareid
+     *
+     * @mbg.generated
+     */
+    public String getSquareid() {
+        return squareid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column boxchange.squareid
+     *
+     * @param squareid the value for boxchange.squareid
+     *
+     * @mbg.generated
+     */
+    public void setSquareid(String squareid) {
+        this.squareid = squareid == null ? null : squareid.trim();
+    }
+}

+ 792 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/BoxChangeExample.java

@@ -0,0 +1,792 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BoxChangeExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public BoxChangeExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table boxchange
+     *
+     * @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 boxchange
+     *
+     * @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 boxchange
+     *
+     * @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 boxchange
+     *
+     * @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 boxchange
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNull() {
+            addCriterion("windpowerstationid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNotNull() {
+            addCriterion("windpowerstationid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidEqualTo(String value) {
+            addCriterion("windpowerstationid =", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotEqualTo(String value) {
+            addCriterion("windpowerstationid <>", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThan(String value) {
+            addCriterion("windpowerstationid >", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid >=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThan(String value) {
+            addCriterion("windpowerstationid <", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid <=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLike(String value) {
+            addCriterion("windpowerstationid like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotLike(String value) {
+            addCriterion("windpowerstationid not like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIn(List<String> values) {
+            addCriterion("windpowerstationid in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotIn(List<String> values) {
+            addCriterion("windpowerstationid not in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidBetween(String value1, String value2) {
+            addCriterion("windpowerstationid between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotBetween(String value1, String value2) {
+            addCriterion("windpowerstationid not between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNull() {
+            addCriterion("projectid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNotNull() {
+            addCriterion("projectid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidEqualTo(String value) {
+            addCriterion("projectid =", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotEqualTo(String value) {
+            addCriterion("projectid <>", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThan(String value) {
+            addCriterion("projectid >", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThanOrEqualTo(String value) {
+            addCriterion("projectid >=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThan(String value) {
+            addCriterion("projectid <", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThanOrEqualTo(String value) {
+            addCriterion("projectid <=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLike(String value) {
+            addCriterion("projectid like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotLike(String value) {
+            addCriterion("projectid not like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIn(List<String> values) {
+            addCriterion("projectid in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotIn(List<String> values) {
+            addCriterion("projectid not in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidBetween(String value1, String value2) {
+            addCriterion("projectid between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotBetween(String value1, String value2) {
+            addCriterion("projectid not between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNull() {
+            addCriterion("lineid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNotNull() {
+            addCriterion("lineid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidEqualTo(String value) {
+            addCriterion("lineid =", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotEqualTo(String value) {
+            addCriterion("lineid <>", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThan(String value) {
+            addCriterion("lineid >", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThanOrEqualTo(String value) {
+            addCriterion("lineid >=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThan(String value) {
+            addCriterion("lineid <", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThanOrEqualTo(String value) {
+            addCriterion("lineid <=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLike(String value) {
+            addCriterion("lineid like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotLike(String value) {
+            addCriterion("lineid not like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIn(List<String> values) {
+            addCriterion("lineid in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotIn(List<String> values) {
+            addCriterion("lineid not in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidBetween(String value1, String value2) {
+            addCriterion("lineid between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotBetween(String value1, String value2) {
+            addCriterion("lineid not between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIsNull() {
+            addCriterion("squareid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIsNotNull() {
+            addCriterion("squareid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidEqualTo(String value) {
+            addCriterion("squareid =", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotEqualTo(String value) {
+            addCriterion("squareid <>", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidGreaterThan(String value) {
+            addCriterion("squareid >", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidGreaterThanOrEqualTo(String value) {
+            addCriterion("squareid >=", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLessThan(String value) {
+            addCriterion("squareid <", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLessThanOrEqualTo(String value) {
+            addCriterion("squareid <=", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLike(String value) {
+            addCriterion("squareid like", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotLike(String value) {
+            addCriterion("squareid not like", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIn(List<String> values) {
+            addCriterion("squareid in", values, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotIn(List<String> values) {
+            addCriterion("squareid not in", values, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidBetween(String value1, String value2) {
+            addCriterion("squareid between", value1, value2, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotBetween(String value1, String value2) {
+            addCriterion("squareid not between", value1, value2, "squareid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table boxchange
+     *
+     * @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 boxchange
+     *
+     * @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);
+        }
+    }
+}

+ 343 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/Inverter.java

@@ -0,0 +1,343 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Inverter implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.projectid
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.lineid
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.squareid
+     *
+     * @mbg.generated
+     */
+    private String squareid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.boxchangeid
+     *
+     * @mbg.generated
+     */
+    private String boxchangeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.isstandard
+     *
+     * @mbg.generated
+     */
+    private Integer isstandard;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverter.modelId
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.id
+     *
+     * @return the value of inverter.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.id
+     *
+     * @param id the value for inverter.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 inverter.code
+     *
+     * @return the value of inverter.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.code
+     *
+     * @param code the value for inverter.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.windpowerstationid
+     *
+     * @return the value of inverter.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.windpowerstationid
+     *
+     * @param windpowerstationid the value for inverter.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.projectid
+     *
+     * @return the value of inverter.projectid
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.projectid
+     *
+     * @param projectid the value for inverter.projectid
+     *
+     * @mbg.generated
+     */
+    public void setProjectid(String projectid) {
+        this.projectid = projectid == null ? null : projectid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.lineid
+     *
+     * @return the value of inverter.lineid
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.lineid
+     *
+     * @param lineid the value for inverter.lineid
+     *
+     * @mbg.generated
+     */
+    public void setLineid(String lineid) {
+        this.lineid = lineid == null ? null : lineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.name
+     *
+     * @return the value of inverter.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.name
+     *
+     * @param name the value for inverter.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.squareid
+     *
+     * @return the value of inverter.squareid
+     *
+     * @mbg.generated
+     */
+    public String getSquareid() {
+        return squareid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.squareid
+     *
+     * @param squareid the value for inverter.squareid
+     *
+     * @mbg.generated
+     */
+    public void setSquareid(String squareid) {
+        this.squareid = squareid == null ? null : squareid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.boxchangeid
+     *
+     * @return the value of inverter.boxchangeid
+     *
+     * @mbg.generated
+     */
+    public String getBoxchangeid() {
+        return boxchangeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.boxchangeid
+     *
+     * @param boxchangeid the value for inverter.boxchangeid
+     *
+     * @mbg.generated
+     */
+    public void setBoxchangeid(String boxchangeid) {
+        this.boxchangeid = boxchangeid == null ? null : boxchangeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.isstandard
+     *
+     * @return the value of inverter.isstandard
+     *
+     * @mbg.generated
+     */
+    public Integer getIsstandard() {
+        return isstandard;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.isstandard
+     *
+     * @param isstandard the value for inverter.isstandard
+     *
+     * @mbg.generated
+     */
+    public void setIsstandard(Integer isstandard) {
+        this.isstandard = isstandard;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverter.modelId
+     *
+     * @return the value of inverter.modelId
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverter.modelId
+     *
+     * @param modelid the value for inverter.modelId
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+}

+ 992 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/InverterExample.java

@@ -0,0 +1,992 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InverterExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public InverterExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table inverter
+     *
+     * @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 inverter
+     *
+     * @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 inverter
+     *
+     * @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 inverter
+     *
+     * @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 inverter
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNull() {
+            addCriterion("windpowerstationid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNotNull() {
+            addCriterion("windpowerstationid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidEqualTo(String value) {
+            addCriterion("windpowerstationid =", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotEqualTo(String value) {
+            addCriterion("windpowerstationid <>", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThan(String value) {
+            addCriterion("windpowerstationid >", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid >=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThan(String value) {
+            addCriterion("windpowerstationid <", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid <=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLike(String value) {
+            addCriterion("windpowerstationid like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotLike(String value) {
+            addCriterion("windpowerstationid not like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIn(List<String> values) {
+            addCriterion("windpowerstationid in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotIn(List<String> values) {
+            addCriterion("windpowerstationid not in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidBetween(String value1, String value2) {
+            addCriterion("windpowerstationid between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotBetween(String value1, String value2) {
+            addCriterion("windpowerstationid not between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNull() {
+            addCriterion("projectid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNotNull() {
+            addCriterion("projectid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidEqualTo(String value) {
+            addCriterion("projectid =", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotEqualTo(String value) {
+            addCriterion("projectid <>", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThan(String value) {
+            addCriterion("projectid >", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThanOrEqualTo(String value) {
+            addCriterion("projectid >=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThan(String value) {
+            addCriterion("projectid <", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThanOrEqualTo(String value) {
+            addCriterion("projectid <=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLike(String value) {
+            addCriterion("projectid like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotLike(String value) {
+            addCriterion("projectid not like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIn(List<String> values) {
+            addCriterion("projectid in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotIn(List<String> values) {
+            addCriterion("projectid not in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidBetween(String value1, String value2) {
+            addCriterion("projectid between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotBetween(String value1, String value2) {
+            addCriterion("projectid not between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNull() {
+            addCriterion("lineid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNotNull() {
+            addCriterion("lineid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidEqualTo(String value) {
+            addCriterion("lineid =", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotEqualTo(String value) {
+            addCriterion("lineid <>", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThan(String value) {
+            addCriterion("lineid >", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThanOrEqualTo(String value) {
+            addCriterion("lineid >=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThan(String value) {
+            addCriterion("lineid <", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThanOrEqualTo(String value) {
+            addCriterion("lineid <=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLike(String value) {
+            addCriterion("lineid like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotLike(String value) {
+            addCriterion("lineid not like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIn(List<String> values) {
+            addCriterion("lineid in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotIn(List<String> values) {
+            addCriterion("lineid not in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidBetween(String value1, String value2) {
+            addCriterion("lineid between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotBetween(String value1, String value2) {
+            addCriterion("lineid not between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIsNull() {
+            addCriterion("squareid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIsNotNull() {
+            addCriterion("squareid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidEqualTo(String value) {
+            addCriterion("squareid =", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotEqualTo(String value) {
+            addCriterion("squareid <>", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidGreaterThan(String value) {
+            addCriterion("squareid >", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidGreaterThanOrEqualTo(String value) {
+            addCriterion("squareid >=", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLessThan(String value) {
+            addCriterion("squareid <", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLessThanOrEqualTo(String value) {
+            addCriterion("squareid <=", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLike(String value) {
+            addCriterion("squareid like", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotLike(String value) {
+            addCriterion("squareid not like", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIn(List<String> values) {
+            addCriterion("squareid in", values, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotIn(List<String> values) {
+            addCriterion("squareid not in", values, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidBetween(String value1, String value2) {
+            addCriterion("squareid between", value1, value2, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotBetween(String value1, String value2) {
+            addCriterion("squareid not between", value1, value2, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidIsNull() {
+            addCriterion("boxchangeid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidIsNotNull() {
+            addCriterion("boxchangeid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidEqualTo(String value) {
+            addCriterion("boxchangeid =", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotEqualTo(String value) {
+            addCriterion("boxchangeid <>", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidGreaterThan(String value) {
+            addCriterion("boxchangeid >", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidGreaterThanOrEqualTo(String value) {
+            addCriterion("boxchangeid >=", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidLessThan(String value) {
+            addCriterion("boxchangeid <", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidLessThanOrEqualTo(String value) {
+            addCriterion("boxchangeid <=", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidLike(String value) {
+            addCriterion("boxchangeid like", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotLike(String value) {
+            addCriterion("boxchangeid not like", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidIn(List<String> values) {
+            addCriterion("boxchangeid in", values, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotIn(List<String> values) {
+            addCriterion("boxchangeid not in", values, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidBetween(String value1, String value2) {
+            addCriterion("boxchangeid between", value1, value2, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotBetween(String value1, String value2) {
+            addCriterion("boxchangeid not between", value1, value2, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardIsNull() {
+            addCriterion("isstandard is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardIsNotNull() {
+            addCriterion("isstandard is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardEqualTo(Integer value) {
+            addCriterion("isstandard =", value, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardNotEqualTo(Integer value) {
+            addCriterion("isstandard <>", value, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardGreaterThan(Integer value) {
+            addCriterion("isstandard >", value, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardGreaterThanOrEqualTo(Integer value) {
+            addCriterion("isstandard >=", value, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardLessThan(Integer value) {
+            addCriterion("isstandard <", value, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardLessThanOrEqualTo(Integer value) {
+            addCriterion("isstandard <=", value, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardIn(List<Integer> values) {
+            addCriterion("isstandard in", values, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardNotIn(List<Integer> values) {
+            addCriterion("isstandard not in", values, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardBetween(Integer value1, Integer value2) {
+            addCriterion("isstandard between", value1, value2, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsstandardNotBetween(Integer value1, Integer value2) {
+            addCriterion("isstandard not between", value1, value2, "isstandard");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNull() {
+            addCriterion("modelId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNotNull() {
+            addCriterion("modelId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidEqualTo(String value) {
+            addCriterion("modelId =", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotEqualTo(String value) {
+            addCriterion("modelId <>", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThan(String value) {
+            addCriterion("modelId >", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThanOrEqualTo(String value) {
+            addCriterion("modelId >=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThan(String value) {
+            addCriterion("modelId <", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThanOrEqualTo(String value) {
+            addCriterion("modelId <=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLike(String value) {
+            addCriterion("modelId like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotLike(String value) {
+            addCriterion("modelId not like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIn(List<String> values) {
+            addCriterion("modelId in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotIn(List<String> values) {
+            addCriterion("modelId not in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidBetween(String value1, String value2) {
+            addCriterion("modelId between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotBetween(String value1, String value2) {
+            addCriterion("modelId not between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table inverter
+     *
+     * @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 inverter
+     *
+     * @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);
+        }
+    }
+}

+ 211 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/InverterStandardPoint.java

@@ -0,0 +1,211 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class InverterStandardPoint implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverterstandardpoint.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverterstandardpoint.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverterstandardpoint.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverterstandardpoint.uniformcode
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverterstandardpoint.ordernum
+     *
+     * @mbg.generated
+     */
+    private String ordernum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column inverterstandardpoint.types
+     *
+     * @mbg.generated
+     */
+    private String types;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table inverterstandardpoint
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverterstandardpoint.id
+     *
+     * @return the value of inverterstandardpoint.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverterstandardpoint.id
+     *
+     * @param id the value for inverterstandardpoint.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 inverterstandardpoint.code
+     *
+     * @return the value of inverterstandardpoint.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverterstandardpoint.code
+     *
+     * @param code the value for inverterstandardpoint.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverterstandardpoint.name
+     *
+     * @return the value of inverterstandardpoint.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverterstandardpoint.name
+     *
+     * @param name the value for inverterstandardpoint.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverterstandardpoint.uniformcode
+     *
+     * @return the value of inverterstandardpoint.uniformcode
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverterstandardpoint.uniformcode
+     *
+     * @param uniformcode the value for inverterstandardpoint.uniformcode
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverterstandardpoint.ordernum
+     *
+     * @return the value of inverterstandardpoint.ordernum
+     *
+     * @mbg.generated
+     */
+    public String getOrdernum() {
+        return ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverterstandardpoint.ordernum
+     *
+     * @param ordernum the value for inverterstandardpoint.ordernum
+     *
+     * @mbg.generated
+     */
+    public void setOrdernum(String ordernum) {
+        this.ordernum = ordernum == null ? null : ordernum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column inverterstandardpoint.types
+     *
+     * @return the value of inverterstandardpoint.types
+     *
+     * @mbg.generated
+     */
+    public String getTypes() {
+        return types;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column inverterstandardpoint.types
+     *
+     * @param types the value for inverterstandardpoint.types
+     *
+     * @mbg.generated
+     */
+    public void setTypes(String types) {
+        this.types = types == null ? null : types.trim();
+    }
+}

+ 722 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/InverterStandardPointExample.java

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

+ 310 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/Junctionbox.java

@@ -0,0 +1,310 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Junctionbox implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.projectid
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.lineid
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.squareid
+     *
+     * @mbg.generated
+     */
+    private String squareid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.boxchangeid
+     *
+     * @mbg.generated
+     */
+    private String boxchangeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column junctionbox.inverterid
+     *
+     * @mbg.generated
+     */
+    private String inverterid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.id
+     *
+     * @return the value of junctionbox.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.id
+     *
+     * @param id the value for junctionbox.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 junctionbox.code
+     *
+     * @return the value of junctionbox.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.code
+     *
+     * @param code the value for junctionbox.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.windpowerstationid
+     *
+     * @return the value of junctionbox.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.windpowerstationid
+     *
+     * @param windpowerstationid the value for junctionbox.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.projectid
+     *
+     * @return the value of junctionbox.projectid
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.projectid
+     *
+     * @param projectid the value for junctionbox.projectid
+     *
+     * @mbg.generated
+     */
+    public void setProjectid(String projectid) {
+        this.projectid = projectid == null ? null : projectid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.lineid
+     *
+     * @return the value of junctionbox.lineid
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.lineid
+     *
+     * @param lineid the value for junctionbox.lineid
+     *
+     * @mbg.generated
+     */
+    public void setLineid(String lineid) {
+        this.lineid = lineid == null ? null : lineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.name
+     *
+     * @return the value of junctionbox.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.name
+     *
+     * @param name the value for junctionbox.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.squareid
+     *
+     * @return the value of junctionbox.squareid
+     *
+     * @mbg.generated
+     */
+    public String getSquareid() {
+        return squareid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.squareid
+     *
+     * @param squareid the value for junctionbox.squareid
+     *
+     * @mbg.generated
+     */
+    public void setSquareid(String squareid) {
+        this.squareid = squareid == null ? null : squareid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.boxchangeid
+     *
+     * @return the value of junctionbox.boxchangeid
+     *
+     * @mbg.generated
+     */
+    public String getBoxchangeid() {
+        return boxchangeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.boxchangeid
+     *
+     * @param boxchangeid the value for junctionbox.boxchangeid
+     *
+     * @mbg.generated
+     */
+    public void setBoxchangeid(String boxchangeid) {
+        this.boxchangeid = boxchangeid == null ? null : boxchangeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column junctionbox.inverterid
+     *
+     * @return the value of junctionbox.inverterid
+     *
+     * @mbg.generated
+     */
+    public String getInverterid() {
+        return inverterid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column junctionbox.inverterid
+     *
+     * @param inverterid the value for junctionbox.inverterid
+     *
+     * @mbg.generated
+     */
+    public void setInverterid(String inverterid) {
+        this.inverterid = inverterid == null ? null : inverterid.trim();
+    }
+}

+ 932 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/JunctionboxExample.java

@@ -0,0 +1,932 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class JunctionboxExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public JunctionboxExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table junctionbox
+     *
+     * @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 junctionbox
+     *
+     * @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 junctionbox
+     *
+     * @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 junctionbox
+     *
+     * @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 junctionbox
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNull() {
+            addCriterion("windpowerstationid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNotNull() {
+            addCriterion("windpowerstationid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidEqualTo(String value) {
+            addCriterion("windpowerstationid =", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotEqualTo(String value) {
+            addCriterion("windpowerstationid <>", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThan(String value) {
+            addCriterion("windpowerstationid >", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid >=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThan(String value) {
+            addCriterion("windpowerstationid <", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid <=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLike(String value) {
+            addCriterion("windpowerstationid like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotLike(String value) {
+            addCriterion("windpowerstationid not like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIn(List<String> values) {
+            addCriterion("windpowerstationid in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotIn(List<String> values) {
+            addCriterion("windpowerstationid not in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidBetween(String value1, String value2) {
+            addCriterion("windpowerstationid between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotBetween(String value1, String value2) {
+            addCriterion("windpowerstationid not between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNull() {
+            addCriterion("projectid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNotNull() {
+            addCriterion("projectid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidEqualTo(String value) {
+            addCriterion("projectid =", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotEqualTo(String value) {
+            addCriterion("projectid <>", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThan(String value) {
+            addCriterion("projectid >", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThanOrEqualTo(String value) {
+            addCriterion("projectid >=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThan(String value) {
+            addCriterion("projectid <", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThanOrEqualTo(String value) {
+            addCriterion("projectid <=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLike(String value) {
+            addCriterion("projectid like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotLike(String value) {
+            addCriterion("projectid not like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIn(List<String> values) {
+            addCriterion("projectid in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotIn(List<String> values) {
+            addCriterion("projectid not in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidBetween(String value1, String value2) {
+            addCriterion("projectid between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotBetween(String value1, String value2) {
+            addCriterion("projectid not between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNull() {
+            addCriterion("lineid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNotNull() {
+            addCriterion("lineid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidEqualTo(String value) {
+            addCriterion("lineid =", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotEqualTo(String value) {
+            addCriterion("lineid <>", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThan(String value) {
+            addCriterion("lineid >", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThanOrEqualTo(String value) {
+            addCriterion("lineid >=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThan(String value) {
+            addCriterion("lineid <", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThanOrEqualTo(String value) {
+            addCriterion("lineid <=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLike(String value) {
+            addCriterion("lineid like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotLike(String value) {
+            addCriterion("lineid not like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIn(List<String> values) {
+            addCriterion("lineid in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotIn(List<String> values) {
+            addCriterion("lineid not in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidBetween(String value1, String value2) {
+            addCriterion("lineid between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotBetween(String value1, String value2) {
+            addCriterion("lineid not between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIsNull() {
+            addCriterion("squareid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIsNotNull() {
+            addCriterion("squareid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidEqualTo(String value) {
+            addCriterion("squareid =", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotEqualTo(String value) {
+            addCriterion("squareid <>", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidGreaterThan(String value) {
+            addCriterion("squareid >", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidGreaterThanOrEqualTo(String value) {
+            addCriterion("squareid >=", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLessThan(String value) {
+            addCriterion("squareid <", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLessThanOrEqualTo(String value) {
+            addCriterion("squareid <=", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidLike(String value) {
+            addCriterion("squareid like", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotLike(String value) {
+            addCriterion("squareid not like", value, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidIn(List<String> values) {
+            addCriterion("squareid in", values, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotIn(List<String> values) {
+            addCriterion("squareid not in", values, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidBetween(String value1, String value2) {
+            addCriterion("squareid between", value1, value2, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSquareidNotBetween(String value1, String value2) {
+            addCriterion("squareid not between", value1, value2, "squareid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidIsNull() {
+            addCriterion("boxchangeid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidIsNotNull() {
+            addCriterion("boxchangeid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidEqualTo(String value) {
+            addCriterion("boxchangeid =", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotEqualTo(String value) {
+            addCriterion("boxchangeid <>", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidGreaterThan(String value) {
+            addCriterion("boxchangeid >", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidGreaterThanOrEqualTo(String value) {
+            addCriterion("boxchangeid >=", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidLessThan(String value) {
+            addCriterion("boxchangeid <", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidLessThanOrEqualTo(String value) {
+            addCriterion("boxchangeid <=", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidLike(String value) {
+            addCriterion("boxchangeid like", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotLike(String value) {
+            addCriterion("boxchangeid not like", value, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidIn(List<String> values) {
+            addCriterion("boxchangeid in", values, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotIn(List<String> values) {
+            addCriterion("boxchangeid not in", values, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidBetween(String value1, String value2) {
+            addCriterion("boxchangeid between", value1, value2, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBoxchangeidNotBetween(String value1, String value2) {
+            addCriterion("boxchangeid not between", value1, value2, "boxchangeid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridIsNull() {
+            addCriterion("inverterid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridIsNotNull() {
+            addCriterion("inverterid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridEqualTo(String value) {
+            addCriterion("inverterid =", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridNotEqualTo(String value) {
+            addCriterion("inverterid <>", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridGreaterThan(String value) {
+            addCriterion("inverterid >", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridGreaterThanOrEqualTo(String value) {
+            addCriterion("inverterid >=", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridLessThan(String value) {
+            addCriterion("inverterid <", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridLessThanOrEqualTo(String value) {
+            addCriterion("inverterid <=", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridLike(String value) {
+            addCriterion("inverterid like", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridNotLike(String value) {
+            addCriterion("inverterid not like", value, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridIn(List<String> values) {
+            addCriterion("inverterid in", values, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridNotIn(List<String> values) {
+            addCriterion("inverterid not in", values, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridBetween(String value1, String value2) {
+            addCriterion("inverterid between", value1, value2, "inverterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInverteridNotBetween(String value1, String value2) {
+            addCriterion("inverterid not between", value1, value2, "inverterid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table junctionbox
+     *
+     * @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 junctionbox
+     *
+     * @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);
+        }
+    }
+}

+ 178 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicStandardPoint.java

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

+ 652 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicStandardPointExample.java

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

+ 773 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicTestingPointNew.java

@@ -0,0 +1,773 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class PhotovoltaicTestingPointNew implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.model
+     *
+     * @mbg.generated
+     */
+    private String model;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.valueunit
+     *
+     * @mbg.generated
+     */
+    private String valueunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.englishname
+     *
+     * @mbg.generated
+     */
+    private String englishname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.typeid
+     *
+     * @mbg.generated
+     */
+    private String typeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.modelid
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.maxval
+     *
+     * @mbg.generated
+     */
+    private BigDecimal maxval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.minval
+     *
+     * @mbg.generated
+     */
+    private BigDecimal minval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.reasonablemaxval
+     *
+     * @mbg.generated
+     */
+    private BigDecimal reasonablemaxval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.reasonableminval
+     *
+     * @mbg.generated
+     */
+    private BigDecimal reasonableminval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.windturbineid
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.uniformcode
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.shortid
+     *
+     * @mbg.generated
+     */
+    private String shortid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.longid
+     *
+     * @mbg.generated
+     */
+    private String longid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.realtimeid
+     *
+     * @mbg.generated
+     */
+    private String realtimeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.squareid
+     *
+     * @mbg.generated
+     */
+    private String squareid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.boxchangeid
+     *
+     * @mbg.generated
+     */
+    private String boxchangeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.inverterid
+     *
+     * @mbg.generated
+     */
+    private String inverterid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.junctionboxid
+     *
+     * @mbg.generated
+     */
+    private String junctionboxid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column photovoltaictestingpointnew.types
+     *
+     * @mbg.generated
+     */
+    private String types;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table photovoltaictestingpointnew
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.id
+     *
+     * @return the value of photovoltaictestingpointnew.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.id
+     *
+     * @param id the value for photovoltaictestingpointnew.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 photovoltaictestingpointnew.code
+     *
+     * @return the value of photovoltaictestingpointnew.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.code
+     *
+     * @param code the value for photovoltaictestingpointnew.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.name
+     *
+     * @return the value of photovoltaictestingpointnew.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.name
+     *
+     * @param name the value for photovoltaictestingpointnew.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.model
+     *
+     * @return the value of photovoltaictestingpointnew.model
+     *
+     * @mbg.generated
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.model
+     *
+     * @param model the value for photovoltaictestingpointnew.model
+     *
+     * @mbg.generated
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.valueunit
+     *
+     * @return the value of photovoltaictestingpointnew.valueunit
+     *
+     * @mbg.generated
+     */
+    public String getValueunit() {
+        return valueunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.valueunit
+     *
+     * @param valueunit the value for photovoltaictestingpointnew.valueunit
+     *
+     * @mbg.generated
+     */
+    public void setValueunit(String valueunit) {
+        this.valueunit = valueunit == null ? null : valueunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.englishname
+     *
+     * @return the value of photovoltaictestingpointnew.englishname
+     *
+     * @mbg.generated
+     */
+    public String getEnglishname() {
+        return englishname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.englishname
+     *
+     * @param englishname the value for photovoltaictestingpointnew.englishname
+     *
+     * @mbg.generated
+     */
+    public void setEnglishname(String englishname) {
+        this.englishname = englishname == null ? null : englishname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.typeid
+     *
+     * @return the value of photovoltaictestingpointnew.typeid
+     *
+     * @mbg.generated
+     */
+    public String getTypeid() {
+        return typeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.typeid
+     *
+     * @param typeid the value for photovoltaictestingpointnew.typeid
+     *
+     * @mbg.generated
+     */
+    public void setTypeid(String typeid) {
+        this.typeid = typeid == null ? null : typeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.modelid
+     *
+     * @return the value of photovoltaictestingpointnew.modelid
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.modelid
+     *
+     * @param modelid the value for photovoltaictestingpointnew.modelid
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.maxval
+     *
+     * @return the value of photovoltaictestingpointnew.maxval
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMaxval() {
+        return maxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.maxval
+     *
+     * @param maxval the value for photovoltaictestingpointnew.maxval
+     *
+     * @mbg.generated
+     */
+    public void setMaxval(BigDecimal maxval) {
+        this.maxval = maxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.minval
+     *
+     * @return the value of photovoltaictestingpointnew.minval
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMinval() {
+        return minval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.minval
+     *
+     * @param minval the value for photovoltaictestingpointnew.minval
+     *
+     * @mbg.generated
+     */
+    public void setMinval(BigDecimal minval) {
+        this.minval = minval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.reasonablemaxval
+     *
+     * @return the value of photovoltaictestingpointnew.reasonablemaxval
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getReasonablemaxval() {
+        return reasonablemaxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.reasonablemaxval
+     *
+     * @param reasonablemaxval the value for photovoltaictestingpointnew.reasonablemaxval
+     *
+     * @mbg.generated
+     */
+    public void setReasonablemaxval(BigDecimal reasonablemaxval) {
+        this.reasonablemaxval = reasonablemaxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.reasonableminval
+     *
+     * @return the value of photovoltaictestingpointnew.reasonableminval
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getReasonableminval() {
+        return reasonableminval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.reasonableminval
+     *
+     * @param reasonableminval the value for photovoltaictestingpointnew.reasonableminval
+     *
+     * @mbg.generated
+     */
+    public void setReasonableminval(BigDecimal reasonableminval) {
+        this.reasonableminval = reasonableminval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.windturbineid
+     *
+     * @return the value of photovoltaictestingpointnew.windturbineid
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.windturbineid
+     *
+     * @param windturbineid the value for photovoltaictestingpointnew.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 photovoltaictestingpointnew.uniformcode
+     *
+     * @return the value of photovoltaictestingpointnew.uniformcode
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.uniformcode
+     *
+     * @param uniformcode the value for photovoltaictestingpointnew.uniformcode
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.shortid
+     *
+     * @return the value of photovoltaictestingpointnew.shortid
+     *
+     * @mbg.generated
+     */
+    public String getShortid() {
+        return shortid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.shortid
+     *
+     * @param shortid the value for photovoltaictestingpointnew.shortid
+     *
+     * @mbg.generated
+     */
+    public void setShortid(String shortid) {
+        this.shortid = shortid == null ? null : shortid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.longid
+     *
+     * @return the value of photovoltaictestingpointnew.longid
+     *
+     * @mbg.generated
+     */
+    public String getLongid() {
+        return longid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.longid
+     *
+     * @param longid the value for photovoltaictestingpointnew.longid
+     *
+     * @mbg.generated
+     */
+    public void setLongid(String longid) {
+        this.longid = longid == null ? null : longid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.windpowerstationid
+     *
+     * @return the value of photovoltaictestingpointnew.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.windpowerstationid
+     *
+     * @param windpowerstationid the value for photovoltaictestingpointnew.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.realtimeid
+     *
+     * @return the value of photovoltaictestingpointnew.realtimeid
+     *
+     * @mbg.generated
+     */
+    public String getRealtimeid() {
+        return realtimeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.realtimeid
+     *
+     * @param realtimeid the value for photovoltaictestingpointnew.realtimeid
+     *
+     * @mbg.generated
+     */
+    public void setRealtimeid(String realtimeid) {
+        this.realtimeid = realtimeid == null ? null : realtimeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.squareid
+     *
+     * @return the value of photovoltaictestingpointnew.squareid
+     *
+     * @mbg.generated
+     */
+    public String getSquareid() {
+        return squareid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.squareid
+     *
+     * @param squareid the value for photovoltaictestingpointnew.squareid
+     *
+     * @mbg.generated
+     */
+    public void setSquareid(String squareid) {
+        this.squareid = squareid == null ? null : squareid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.boxchangeid
+     *
+     * @return the value of photovoltaictestingpointnew.boxchangeid
+     *
+     * @mbg.generated
+     */
+    public String getBoxchangeid() {
+        return boxchangeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.boxchangeid
+     *
+     * @param boxchangeid the value for photovoltaictestingpointnew.boxchangeid
+     *
+     * @mbg.generated
+     */
+    public void setBoxchangeid(String boxchangeid) {
+        this.boxchangeid = boxchangeid == null ? null : boxchangeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.inverterid
+     *
+     * @return the value of photovoltaictestingpointnew.inverterid
+     *
+     * @mbg.generated
+     */
+    public String getInverterid() {
+        return inverterid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.inverterid
+     *
+     * @param inverterid the value for photovoltaictestingpointnew.inverterid
+     *
+     * @mbg.generated
+     */
+    public void setInverterid(String inverterid) {
+        this.inverterid = inverterid == null ? null : inverterid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.junctionboxid
+     *
+     * @return the value of photovoltaictestingpointnew.junctionboxid
+     *
+     * @mbg.generated
+     */
+    public String getJunctionboxid() {
+        return junctionboxid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.junctionboxid
+     *
+     * @param junctionboxid the value for photovoltaictestingpointnew.junctionboxid
+     *
+     * @mbg.generated
+     */
+    public void setJunctionboxid(String junctionboxid) {
+        this.junctionboxid = junctionboxid == null ? null : junctionboxid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column photovoltaictestingpointnew.types
+     *
+     * @return the value of photovoltaictestingpointnew.types
+     *
+     * @mbg.generated
+     */
+    public String getTypes() {
+        return types;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column photovoltaictestingpointnew.types
+     *
+     * @param types the value for photovoltaictestingpointnew.types
+     *
+     * @mbg.generated
+     */
+    public void setTypes(String types) {
+        this.types = types == null ? null : types.trim();
+    }
+}

File diff suppressed because it is too large
+ 1873 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/PhotovoltaicTestingPointNewExample.java


+ 244 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/Square.java

@@ -0,0 +1,244 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Square implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.projectid
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.lineid
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column square.types
+     *
+     * @mbg.generated
+     */
+    private String types;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column square.id
+     *
+     * @return the value of square.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.id
+     *
+     * @param id the value for square.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 square.code
+     *
+     * @return the value of square.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.code
+     *
+     * @param code the value for square.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column square.windpowerstationid
+     *
+     * @return the value of square.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.windpowerstationid
+     *
+     * @param windpowerstationid the value for square.windpowerstationid
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column square.projectid
+     *
+     * @return the value of square.projectid
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.projectid
+     *
+     * @param projectid the value for square.projectid
+     *
+     * @mbg.generated
+     */
+    public void setProjectid(String projectid) {
+        this.projectid = projectid == null ? null : projectid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column square.lineid
+     *
+     * @return the value of square.lineid
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.lineid
+     *
+     * @param lineid the value for square.lineid
+     *
+     * @mbg.generated
+     */
+    public void setLineid(String lineid) {
+        this.lineid = lineid == null ? null : lineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column square.name
+     *
+     * @return the value of square.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.name
+     *
+     * @param name the value for square.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column square.types
+     *
+     * @return the value of square.types
+     *
+     * @mbg.generated
+     */
+    public String getTypes() {
+        return types;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column square.types
+     *
+     * @param types the value for square.types
+     *
+     * @mbg.generated
+     */
+    public void setTypes(String types) {
+        this.types = types == null ? null : types.trim();
+    }
+}

+ 792 - 0
web/monitor-hb/src/main/java/com/gyee/frame/model/auto/SquareExample.java

@@ -0,0 +1,792 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SquareExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public SquareExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table square
+     *
+     * @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 square
+     *
+     * @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 square
+     *
+     * @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 square
+     *
+     * @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 square
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNull() {
+            addCriterion("windpowerstationid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNotNull() {
+            addCriterion("windpowerstationid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidEqualTo(String value) {
+            addCriterion("windpowerstationid =", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotEqualTo(String value) {
+            addCriterion("windpowerstationid <>", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThan(String value) {
+            addCriterion("windpowerstationid >", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid >=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThan(String value) {
+            addCriterion("windpowerstationid <", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThanOrEqualTo(String value) {
+            addCriterion("windpowerstationid <=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLike(String value) {
+            addCriterion("windpowerstationid like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotLike(String value) {
+            addCriterion("windpowerstationid not like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIn(List<String> values) {
+            addCriterion("windpowerstationid in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotIn(List<String> values) {
+            addCriterion("windpowerstationid not in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidBetween(String value1, String value2) {
+            addCriterion("windpowerstationid between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotBetween(String value1, String value2) {
+            addCriterion("windpowerstationid not between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNull() {
+            addCriterion("projectid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNotNull() {
+            addCriterion("projectid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidEqualTo(String value) {
+            addCriterion("projectid =", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotEqualTo(String value) {
+            addCriterion("projectid <>", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThan(String value) {
+            addCriterion("projectid >", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThanOrEqualTo(String value) {
+            addCriterion("projectid >=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThan(String value) {
+            addCriterion("projectid <", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThanOrEqualTo(String value) {
+            addCriterion("projectid <=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLike(String value) {
+            addCriterion("projectid like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotLike(String value) {
+            addCriterion("projectid not like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIn(List<String> values) {
+            addCriterion("projectid in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotIn(List<String> values) {
+            addCriterion("projectid not in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidBetween(String value1, String value2) {
+            addCriterion("projectid between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotBetween(String value1, String value2) {
+            addCriterion("projectid not between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNull() {
+            addCriterion("lineid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNotNull() {
+            addCriterion("lineid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidEqualTo(String value) {
+            addCriterion("lineid =", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotEqualTo(String value) {
+            addCriterion("lineid <>", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThan(String value) {
+            addCriterion("lineid >", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThanOrEqualTo(String value) {
+            addCriterion("lineid >=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThan(String value) {
+            addCriterion("lineid <", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThanOrEqualTo(String value) {
+            addCriterion("lineid <=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLike(String value) {
+            addCriterion("lineid like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotLike(String value) {
+            addCriterion("lineid not like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIn(List<String> values) {
+            addCriterion("lineid in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotIn(List<String> values) {
+            addCriterion("lineid not in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidBetween(String value1, String value2) {
+            addCriterion("lineid between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotBetween(String value1, String value2) {
+            addCriterion("lineid not between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesIsNull() {
+            addCriterion("types is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesIsNotNull() {
+            addCriterion("types is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesEqualTo(String value) {
+            addCriterion("types =", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotEqualTo(String value) {
+            addCriterion("types <>", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesGreaterThan(String value) {
+            addCriterion("types >", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesGreaterThanOrEqualTo(String value) {
+            addCriterion("types >=", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesLessThan(String value) {
+            addCriterion("types <", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesLessThanOrEqualTo(String value) {
+            addCriterion("types <=", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesLike(String value) {
+            addCriterion("types like", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotLike(String value) {
+            addCriterion("types not like", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesIn(List<String> values) {
+            addCriterion("types in", values, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotIn(List<String> values) {
+            addCriterion("types not in", values, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesBetween(String value1, String value2) {
+            addCriterion("types between", value1, value2, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotBetween(String value1, String value2) {
+            addCriterion("types not between", value1, value2, "types");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table square
+     *
+     * @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 square
+     *
+     * @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);
+        }
+    }
+}

+ 100 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/BoxChangeService.java

@@ -0,0 +1,100 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.BoxChangeMapper;
+import com.gyee.frame.model.auto.BoxChange;
+import com.gyee.frame.model.auto.BoxChangeExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class BoxChangeService implements BaseService<BoxChange, BoxChangeExample> {
+	@Resource
+	private BoxChangeMapper boxChangeMapper;
+	
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			BoxChangeExample example=new BoxChangeExample();
+			example.createCriteria().andIdIn(lista);
+			return boxChangeMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public BoxChange selectByPrimaryKey(String id) {
+				
+			return boxChangeMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(BoxChange record) {
+		return boxChangeMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(BoxChange record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return boxChangeMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(BoxChange record, BoxChangeExample example) {
+		
+		return boxChangeMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(BoxChange record, BoxChangeExample example) {
+		
+		return boxChangeMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<BoxChange> selectByExample(BoxChangeExample example) {
+		
+		return boxChangeMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(BoxChangeExample example) {
+		
+		return boxChangeMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(BoxChangeExample example) {
+		
+		return boxChangeMapper.deleteByExample(example);
+	}
+
+
+    public List<BoxChange> selectAll() {
+        BoxChangeExample example=new BoxChangeExample();
+        return boxChangeMapper.selectByExample(example);
+
+    }
+
+}

+ 100 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/InverterService.java

@@ -0,0 +1,100 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.InverterMapper;
+import com.gyee.frame.model.auto.Inverter;
+import com.gyee.frame.model.auto.InverterExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class InverterService implements BaseService<Inverter, InverterExample> {
+	@Resource
+	private InverterMapper inverterMapper;
+	
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			InverterExample example=new InverterExample();
+			example.createCriteria().andIdIn(lista);
+			return inverterMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Inverter selectByPrimaryKey(String id) {
+				
+			return inverterMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Inverter record) {
+		return inverterMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Inverter record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return inverterMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Inverter record, InverterExample example) {
+		
+		return inverterMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Inverter record, InverterExample example) {
+		
+		return inverterMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Inverter> selectByExample(InverterExample example) {
+		
+		return inverterMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(InverterExample example) {
+		
+		return inverterMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(InverterExample example) {
+		
+		return inverterMapper.deleteByExample(example);
+	}
+
+
+    public List<Inverter> selectAll() {
+        InverterExample example=new InverterExample();
+        return inverterMapper.selectByExample(example);
+
+    }
+
+}

+ 119 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/InverterStandardPointService.java

@@ -0,0 +1,119 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.InverterStandardPointMapper;
+import com.gyee.frame.model.auto.InverterStandardPoint;
+import com.gyee.frame.model.auto.InverterStandardPointExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class InverterStandardPointService implements BaseService<InverterStandardPoint, InverterStandardPointExample> {
+    @Resource
+    private InverterStandardPointMapper inverterStandardPointMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista = Convert.toListStrArray(ids);
+        InverterStandardPointExample example = new InverterStandardPointExample();
+        example.createCriteria().andIdIn(lista);
+        return inverterStandardPointMapper.deleteByExample(example);
+
+
+    }
+
+
+    @Override
+    public InverterStandardPoint selectByPrimaryKey(String id) {
+
+        return null;
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(InverterStandardPoint record) {
+        return -1;
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(InverterStandardPoint record) {
+
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+
+        return inverterStandardPointMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(InverterStandardPoint record, InverterStandardPointExample example) {
+
+        return inverterStandardPointMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(InverterStandardPoint record, InverterStandardPointExample example) {
+
+        return inverterStandardPointMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<InverterStandardPoint> selectByExample(InverterStandardPointExample example) {
+
+        return inverterStandardPointMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(InverterStandardPointExample example) {
+
+        return inverterStandardPointMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(InverterStandardPointExample example) {
+
+        return inverterStandardPointMapper.deleteByExample(example);
+    }
+
+
+    public  List<InverterStandardPoint> findAllList() {
+
+        InverterStandardPointExample example = new InverterStandardPointExample();
+        example.setOrderByClause("id ASC");
+        List<InverterStandardPoint> vos = inverterStandardPointMapper.selectByExample(example);
+
+
+        return vos;
+
+    }
+
+    public  List<InverterStandardPoint> findByType(Enum PhotoVolaticType) {
+
+        InverterStandardPointExample example = new InverterStandardPointExample();
+        example.createCriteria().andTypesEqualTo(PhotoVolaticType.name());
+        example.setOrderByClause("id ASC");
+        List<InverterStandardPoint> vos = inverterStandardPointMapper.selectByExample(example);
+
+
+        return vos;
+
+    }
+
+
+}

+ 109 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/JunctionboxService.java

@@ -0,0 +1,109 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.JunctionboxMapper;
+import com.gyee.frame.model.auto.Junctionbox;
+import com.gyee.frame.model.auto.JunctionboxExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class JunctionboxService implements BaseService<Junctionbox, JunctionboxExample> {
+	@Resource
+	private JunctionboxMapper junctionboxMapper;
+	
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			JunctionboxExample example=new JunctionboxExample();
+			example.createCriteria().andIdIn(lista);
+			return junctionboxMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Junctionbox selectByPrimaryKey(String id) {
+				
+			return junctionboxMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Junctionbox record) {
+		return junctionboxMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Junctionbox record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return junctionboxMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Junctionbox record, JunctionboxExample example) {
+		
+		return junctionboxMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Junctionbox record, JunctionboxExample example) {
+		
+		return junctionboxMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Junctionbox> selectByExample(JunctionboxExample example) {
+		
+		return junctionboxMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(JunctionboxExample example) {
+		
+		return junctionboxMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(JunctionboxExample example) {
+		
+		return junctionboxMapper.deleteByExample(example);
+	}
+
+
+    public List<Junctionbox> selectAll() {
+        JunctionboxExample example=new JunctionboxExample();
+        return junctionboxMapper.selectByExample(example);
+
+    }
+
+
+    public List<Junctionbox> selectByInverterId(String id) {
+        JunctionboxExample example=new JunctionboxExample();
+        example.createCriteria().andInverteridEqualTo(id);
+        return junctionboxMapper.selectByExample(example);
+
+    }
+
+
+}

+ 40 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/PhotoVolaticType.java

@@ -0,0 +1,40 @@
+package com.gyee.frame.service.photovolatic;
+
+
+public enum PhotoVolaticType {
+    /**
+     * 方阵
+     */
+    FZ("FZ"),
+    /**
+     * 箱变
+     */
+    XB("XB"),
+    /**
+     * 逆变器
+     */
+    NBQ("NBQ"),
+    /**
+     * 汇流箱
+     */
+    HLX("HLX");
+
+
+    private String name;
+
+    private PhotoVolaticType(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return this.toString();
+    }
+}

+ 109 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/PhotovoltaicStandardPointService.java

@@ -0,0 +1,109 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.PhotovoltaicStandardPointMapper;
+import com.gyee.frame.model.auto.PhotovoltaicStandardPoint;
+import com.gyee.frame.model.auto.PhotovoltaicStandardPointExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class PhotovoltaicStandardPointService implements BaseService<PhotovoltaicStandardPoint, PhotovoltaicStandardPointExample> {
+    @Resource
+    private PhotovoltaicStandardPointMapper photovoltaicStandardPointMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista = Convert.toListStrArray(ids);
+        PhotovoltaicStandardPointExample example = new PhotovoltaicStandardPointExample();
+        example.createCriteria().andIdIn(lista);
+        return photovoltaicStandardPointMapper.deleteByExample(example);
+
+
+    }
+
+
+    @Override
+    public PhotovoltaicStandardPoint selectByPrimaryKey(String id) {
+
+        return null;
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(PhotovoltaicStandardPoint record) {
+        return -1;
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(PhotovoltaicStandardPoint record) {
+
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+
+        return photovoltaicStandardPointMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(PhotovoltaicStandardPoint record, PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(PhotovoltaicStandardPoint record, PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<PhotovoltaicStandardPoint> selectByExample(PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(PhotovoltaicStandardPointExample example) {
+
+        return photovoltaicStandardPointMapper.deleteByExample(example);
+    }
+
+
+    public  List<PhotovoltaicStandardPoint> findAllList() {
+
+        PhotovoltaicStandardPointExample example = new PhotovoltaicStandardPointExample();
+        example.setOrderByClause("id ASC");
+        List<PhotovoltaicStandardPoint> vos = photovoltaicStandardPointMapper.selectByExample(example);
+
+
+        return vos;
+
+    }
+
+
+
+
+}

+ 148 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/PhotovoltaicTestingPointNewService.java

@@ -0,0 +1,148 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.PhotovoltaicTestingPointNewMapper;
+import com.gyee.frame.model.auto.PhotovoltaicTestingPointNew;
+import com.gyee.frame.model.auto.PhotovoltaicTestingPointNewExample;
+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;
+import java.util.Map;
+
+
+@Service
+public class PhotovoltaicTestingPointNewService implements BaseService<PhotovoltaicTestingPointNew, PhotovoltaicTestingPointNewExample> {
+	@Resource
+	private PhotovoltaicTestingPointNewMapper photovoltaicTestingPointNewMapper;
+	
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			PhotovoltaicTestingPointNewExample example=new PhotovoltaicTestingPointNewExample();
+			example.createCriteria().andIdIn(lista);
+			return photovoltaicTestingPointNewMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public PhotovoltaicTestingPointNew selectByPrimaryKey(String id) {
+				
+			return photovoltaicTestingPointNewMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(PhotovoltaicTestingPointNew record) {
+		return photovoltaicTestingPointNewMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(PhotovoltaicTestingPointNew record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return photovoltaicTestingPointNewMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(PhotovoltaicTestingPointNew record, PhotovoltaicTestingPointNewExample example) {
+		
+		return photovoltaicTestingPointNewMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(PhotovoltaicTestingPointNew record, PhotovoltaicTestingPointNewExample example) {
+		
+		return photovoltaicTestingPointNewMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<PhotovoltaicTestingPointNew> selectByExample(PhotovoltaicTestingPointNewExample example) {
+		
+		return photovoltaicTestingPointNewMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(PhotovoltaicTestingPointNewExample example) {
+		
+		return photovoltaicTestingPointNewMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(PhotovoltaicTestingPointNewExample example) {
+		
+		return photovoltaicTestingPointNewMapper.deleteByExample(example);
+	}
+
+
+    public List<PhotovoltaicTestingPointNew> selectAll() {
+        PhotovoltaicTestingPointNewExample example=new PhotovoltaicTestingPointNewExample();
+        return photovoltaicTestingPointNewMapper.selectByExample(example);
+
+    }
+
+
+
+    public PhotovoltaicTestingPointNew getPhotovoltaicTestingPointNew(String wtId, String unicode)  {
+
+        PhotovoltaicTestingPointNew point=new PhotovoltaicTestingPointNew();
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
+        {
+            if(InitialRunner.nbqmap.containsKey(wtId))
+            {
+                if(InitialRunner.phPointmap.containsKey(wtId))
+                {
+                    Map<String, PhotovoltaicTestingPointNew> map=InitialRunner.phPointmap.get(wtId);
+                    if(map.containsKey(unicode))
+                    {
+                        point=map.get(unicode);
+                    }
+                }
+            }
+        }
+
+        return point;
+    }
+
+
+    public List<PhotovoltaicTestingPointNew> getPhotovoltaicTestingPointNewList(String wtId)  {
+
+        List<PhotovoltaicTestingPointNew> list=new ArrayList<>();
+
+
+        if(StringUtils.notEmp(wtId))
+        {
+            PhotovoltaicTestingPointNewExample example=new PhotovoltaicTestingPointNewExample();
+            example.setOrderByClause("id ASC");
+            example.isDistinct();
+            PhotovoltaicTestingPointNewExample.Criteria criteria =example.createCriteria();
+            criteria.andWindturbineidEqualTo(wtId);
+            criteria.andUniformcodeLike("DI");
+            list= photovoltaicTestingPointNewMapper.selectByExample(example);
+
+        }
+
+        return list;
+    }
+
+}

+ 100 - 0
web/monitor-hb/src/main/java/com/gyee/frame/service/photovolatic/SquareService.java

@@ -0,0 +1,100 @@
+package com.gyee.frame.service.photovolatic;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.SquareMapper;
+import com.gyee.frame.model.auto.Square;
+import com.gyee.frame.model.auto.SquareExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class SquareService implements BaseService<Square, SquareExample> {
+	@Resource
+	private SquareMapper squareMapper;
+	
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			SquareExample example=new SquareExample();
+			example.createCriteria().andIdIn(lista);
+			return squareMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Square selectByPrimaryKey(String id) {
+				
+			return squareMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Square record) {
+		return squareMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Square record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return squareMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Square record, SquareExample example) {
+		
+		return squareMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Square record, SquareExample example) {
+		
+		return squareMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Square> selectByExample(SquareExample example) {
+		
+		return squareMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(SquareExample example) {
+		
+		return squareMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(SquareExample example) {
+		
+		return squareMapper.deleteByExample(example);
+	}
+
+
+    public List<Square> selectAll() {
+        SquareExample example=new SquareExample();
+        return squareMapper.selectByExample(example);
+
+    }
+
+}

+ 251 - 78
web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -82,7 +82,7 @@ public class GenreSetPushService {
         if (StringUtils.notEmp(id)) {
 
 
-            Double zjrl = 1.0;
+            Double zjrl = 0.0;
             Double zjts = 0.0;
 
             Double sjgl = 0.0;
@@ -102,21 +102,21 @@ public class GenreSetPushService {
 
             Map<String, Object> fcmap = new HashMap<>();
 
-              if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
+            if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
 
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
-                  List<Windpowerstation> templs=null;
-
-                  if(InitialRunner.re_wpmap.containsKey(id))
-                  {
-                      templs=InitialRunner.re_wpmap.get(id);
-                  }else
-                  {
-                      templs=InitialRunner.wpallls;
-                  }
+                List<Windpowerstation> templs=null;
+
+                if(InitialRunner.re_wpmap.containsKey(id))
+                {
+                    templs=InitialRunner.re_wpmap.get(id);
+                }else
+                {
+                    templs=InitialRunner.wpallls;
+                }
                 for (Windpowerstation wp : templs) {
                     if (id.equals(FD)) {
                         if (wp.getId().endsWith("FDC")) {
@@ -128,8 +128,56 @@ public class GenreSetPushService {
                         }
                     } else if (id.equals(QS)) {
                         wplist.add(wp);
+                    }else if (id.indexOf(FD)>0) {
+                        if (wp.getId().endsWith("FDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(GF)>0)  {
+                        if (wp.getId().endsWith("GDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(QS)>0) {
+                        wplist.add(wp);
+                    }
+
+                }
+
+
+                Map<String,Double> sftjmap=new HashMap<>();//省份装机容量和台数统计
+                for (Windpowerstation wp : wplist) {
+
+                    if(StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid()+"_zjrl"))
+                    {
+
+                        double temp=sftjmap.get(wp.getCompanyid()+"_zjrl");
+                        temp=temp+wp.getCapacity();
+                        sftjmap.put(wp.getCompanyid()+"_zjrl",temp);
+                    }else
+                    {
+                        double temp=wp.getCapacity();
+                        sftjmap.put(wp.getCompanyid()+"_zjrl",temp);
                     }
+                    if(StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid()+"_zjts"))
+                    {
+
+                        double temp=sftjmap.get(wp.getCompanyid()+"_zjts");
+                        temp=temp+wp.getQuantity();
+                        sftjmap.put(wp.getCompanyid()+"_zjts",temp);
+                    }else
+                    {
+                        double temp=wp.getQuantity();
+                        sftjmap.put(wp.getCompanyid()+"_zjts",temp);
+                    }
+                }
 
+
+                Set<Map.Entry<String, Double>> set = sftjmap.entrySet();
+                for (Iterator<Map.Entry<String,Double>> it = set.iterator(); it.hasNext();) {
+                    Map.Entry<String, Double> entry = (Map.Entry<String, Double>) it.next();
+
+                    // System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+                    fcmap.put(entry.getKey(), entry.getValue());
                 }
 
 
@@ -299,6 +347,16 @@ public class GenreSetPushService {
                         }
                     } else if (id.equals(QS)) {
                         wplist.add(wp);
+                    }else if (id.indexOf(FD)>0) {
+                        if (wp.getId().endsWith("FDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(GF)>0)  {
+                        if (wp.getId().endsWith("GDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(QS)>0) {
+                        wplist.add(wp);
                     }
 
                 }
@@ -332,19 +390,21 @@ public class GenreSetPushService {
                 Double lxnum = 0.0;
                 for (Windpowerstation wp : wplist) {
 
-                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+//                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
 
                     List<MatrixVo> vos = new ArrayList<>();
                     List<String> fjzbls = new ArrayList<>();
                     List<String> gfzbls = new ArrayList<>();
                     //光伏没有明细计算点,所以区分开
-                    if (wp.getId().endsWith("FDC")) {
+                    if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId())){
+                        List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
                         for (Windturbine wt : wtls) {
                             //明细状态
                             fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getCode());
                         }
-                    } else if (wp.getId().endsWith("GDC")) {
-                        for (Windturbine wt : wtls) {
+                    } else  if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId())){
+                        List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                        for (Inverter wt : wtls) {
                             //状态
                             gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
                         }
@@ -357,8 +417,8 @@ public class GenreSetPushService {
                     if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
 
 
-                        for (int i = 0; i < wtls.size(); i++) {
-                            Windturbine wt = wtls.get(i);
+                        for (int i = 0; i < fjzblist.size(); i++) {
+
 
 
                             double fjzt = MathUtil.twoBit(MathUtil.twoBit(fjzblist.get(i).getPointValueInDouble()));
@@ -412,7 +472,7 @@ public class GenreSetPushService {
                     }
 
                     if (!gfzblist.isEmpty() && gfzblist.size() == gfzblist.size()) {
-                        for (int i = 0; i < wtls.size(); i++) {
+                        for (int i = 0; i < gfzblist.size(); i++) {
                             double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfzblist.get(i).getPointValueInDouble()));
                             switch (Double.valueOf(gfzt).intValue()) {
                                 case 0:
@@ -592,25 +652,40 @@ public class GenreSetPushService {
 
                 }else if (id.endsWith("GDC") || InitialRunner.pjmap.containsKey(id) || InitialRunner.lnmap.containsKey(id)){
                     List<String> gfzbls = new ArrayList<>();
-                    List<Windturbine> wtls =null;
-                    if(id.endsWith("GDC"))
-                    {
-                        wtls =InitialRunner.wp_wtmap.get(id);
-                    }else  if(InitialRunner.pjmap.containsKey(id))
-                    {
-                        wtls =InitialRunner.pj_wtmap.get(id);
-                    }else  if(InitialRunner.lnmap.containsKey(id))
-                    {
-                        wtls =InitialRunner.ln_wtmap.get(id);
-                    }
-
-                    for(Windturbine wt:wtls) {
-                        //状态
-                        gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                    if(id.endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(id)){
+                        List<Inverter> wtls = InitialRunner.gp_nbqmap.get(id);
+                        for(Inverter wt:wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(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());
+                        }
+                    }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());
+                        }
+                    } else  if( InitialRunner.pj_wtmap.containsKey(id)){
+                        List<Windturbine> wtls = InitialRunner.pj_wtmap.get(id);
+                        for(Windturbine wt:wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                        }
+                    }else  if( InitialRunner.ln_wtmap.containsKey(id)){
+                        List<Windturbine> wtls = InitialRunner.ln_wtmap.get(id);
+                        for(Windturbine wt:wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                        }
                     }
                     List<PointData> gfzblist = realApiUtil.getRealData(gfzbls);
                     if (!gfzblist.isEmpty() && gfzblist.size() == gfzblist.size()) {
-                        for (int i = 0; i < wtls.size(); i++) {
+                        for (int i = 0; i < gfzblist.size(); i++) {
                             double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfzblist.get(i).getPointValueInDouble()));
                             switch (Double.valueOf(gfzt).intValue()) {
                                 case 0:
@@ -692,7 +767,7 @@ public class GenreSetPushService {
         if (StringUtils.notEmp(id)) {
 
 
-            Double zjrl = 1.0;
+            Double zjrl = 0.0;
             Double zjts = 0.0;
 
             Double sjgl = 0.0;
@@ -755,11 +830,23 @@ public class GenreSetPushService {
                 //年发电量
                 nfdl = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble());
                 jczbmap.put("nfdl", nfdl);
-                //月利用小时
-                jczbmap.put("ylyxs", (new BigDecimal(jczblist.get(2).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
-                //年利用小时
-                jczbmap.put("nlyxs", (new BigDecimal(jczblist.get(3).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
-                //实时风速
+
+                if(zjrl!=0)
+                {
+                    //月利用小时
+                    jczbmap.put("ylyxs", (new BigDecimal(jczblist.get(2).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
+                    //年利用小时
+                    jczbmap.put("nlyxs", (new BigDecimal(jczblist.get(3).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+                }else
+                {
+                    //月利用小时
+                    jczbmap.put("ylyxs",0.0);
+                    //年利用小时
+                    jczbmap.put("nlyxs", 0.0);
+
+                }
+                   //实时风速
                 jczbmap.put("ssfs", MathUtil.twoBit(jczblist.get(4).getPointValueInDouble()));
                 //上网电量
                 jczbmap.put("swdl", MathUtil.twoBit(jczblist.get(5).getPointValueInDouble()));
@@ -1537,7 +1624,7 @@ public class GenreSetPushService {
         if (StringUtils.notEmp(id)) {
 
 
-            Double zjrl = 1.0;
+            Double zjrl = 0.0;
             Double zjts = 0.0;
 
             Double sjgl = 0.0;
@@ -1555,23 +1642,24 @@ public class GenreSetPushService {
             Date endDate = cal2.getTime();
 /*************************************************风场指标*************************************************************/
 
+
             Map<String, Object> fcmap = new HashMap<>();
 
-                   if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
+            if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
 
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
-                       List<Windpowerstation> templs=null;
+                List<Windpowerstation> templs=null;
 
-                       if(InitialRunner.re_wpmap.containsKey(id))
-                       {
-                           templs=InitialRunner.re_wpmap.get(id);
-                       }else
-                       {
-                           templs=InitialRunner.wpallls;
-                       }
+                if(InitialRunner.re_wpmap.containsKey(id))
+                {
+                    templs=InitialRunner.re_wpmap.get(id);
+                }else
+                {
+                    templs=InitialRunner.wpallls;
+                }
                 for (Windpowerstation wp : templs) {
                     if (id.equals(FD)) {
                         if (wp.getId().endsWith("FDC")) {
@@ -1583,11 +1671,58 @@ public class GenreSetPushService {
                         }
                     } else if (id.equals(QS)) {
                         wplist.add(wp);
+                    }else if (id.indexOf(FD)>0) {
+                        if (wp.getId().endsWith("FDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(GF)>0)  {
+                        if (wp.getId().endsWith("GDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(QS)>0) {
+                        wplist.add(wp);
                     }
 
                 }
 
 
+                Map<String,Double> sftjmap=new HashMap<>();//省份装机容量和台数统计
+                for (Windpowerstation wp : wplist) {
+
+                    if(StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid()+"_zjrl"))
+                    {
+
+                        double temp=sftjmap.get(wp.getCompanyid()+"_zjrl");
+                        temp=temp+wp.getCapacity();
+                        sftjmap.put(wp.getCompanyid()+"_zjrl",temp);
+                    }else
+                    {
+                        double temp=wp.getCapacity();
+                        sftjmap.put(wp.getCompanyid()+"_zjrl",temp);
+                    }
+                    if(StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid()+"_zjts"))
+                    {
+
+                        double temp=sftjmap.get(wp.getCompanyid()+"_zjts");
+                        temp=temp+wp.getQuantity();
+                        sftjmap.put(wp.getCompanyid()+"_zjts",temp);
+                    }else
+                    {
+                        double temp=wp.getQuantity();
+                        sftjmap.put(wp.getCompanyid()+"_zjts",temp);
+                    }
+                }
+
+
+                Set<Map.Entry<String, Double>> set = sftjmap.entrySet();
+                for (Iterator<Map.Entry<String,Double>> it = set.iterator(); it.hasNext();) {
+                    Map.Entry<String, Double> entry = (Map.Entry<String, Double>) it.next();
+
+                    // System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+                    fcmap.put(entry.getKey(), entry.getValue());
+                }
+
                 for (Windpowerstation wp : wplist) {
 
                     zjrl += wp.getCapacity();
@@ -1784,11 +1919,22 @@ public class GenreSetPushService {
                 //年发电量
                 nfdl = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble());
                 jczbmap.put("nfdl", nfdl);
-                //月利用小时
-                jczbmap.put("ylyxs", (new BigDecimal(jczblist.get(2).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
-                //年利用小时
-                jczbmap.put("nlyxs", (new BigDecimal(jczblist.get(3).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
-                //实时风速
+                if(zjrl!=0)
+                {
+                    //月利用小时
+                    jczbmap.put("ylyxs", (new BigDecimal(jczblist.get(2).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
+                    //年利用小时
+                    jczbmap.put("nlyxs", (new BigDecimal(jczblist.get(3).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+                }else
+                {
+                    //月利用小时
+                    jczbmap.put("ylyxs", 0.0);
+                    //年利用小时
+                    jczbmap.put("nlyxs",0.0);
+
+                }
+                   //实时风速
                 jczbmap.put("ssfs", MathUtil.twoBit(jczblist.get(4).getPointValueInDouble()));
                 //上网电量
                 jczbmap.put("swdl", MathUtil.twoBit(jczblist.get(5).getPointValueInDouble()));
@@ -1955,7 +2101,7 @@ public class GenreSetPushService {
 
             Map<String, Double> mxztmap = new HashMap<>();
 
-                   if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
+            if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
                 //初始化场站信息
 
@@ -1980,6 +2126,16 @@ public class GenreSetPushService {
                         }
                     } else if (id.equals(QS)) {
                         wplist.add(wp);
+                    }else if (id.indexOf(FD)>0) {
+                        if (wp.getId().endsWith("FDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(GF)>0)  {
+                        if (wp.getId().endsWith("GDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(QS)>0) {
+                        wplist.add(wp);
                     }
 
                 }
@@ -2013,19 +2169,21 @@ public class GenreSetPushService {
                 Double lxnum = 0.0;
                 for (Windpowerstation wp : wplist) {
 
-                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+//                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
 
                     List<MatrixVo> vos = new ArrayList<>();
                     List<String> fjzbls = new ArrayList<>();
                     List<String> gfzbls = new ArrayList<>();
                     //光伏没有明细计算点,所以区分开
-                    if (wp.getId().endsWith("FDC")) {
+                    if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId())){
+                        List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
                         for (Windturbine wt : wtls) {
                             //明细状态
                             fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getCode());
                         }
-                    } else if (wp.getId().endsWith("GDC")) {
-                        for (Windturbine wt : wtls) {
+                    } else  if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId())){
+                        List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                        for (Inverter wt : wtls) {
                             //状态
                             gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
                         }
@@ -2038,8 +2196,7 @@ public class GenreSetPushService {
                     if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
 
 
-                        for (int i = 0; i < wtls.size(); i++) {
-                            Windturbine wt = wtls.get(i);
+                        for (int i = 0; i < fjzblist.size(); i++) {
 
 
                             double fjzt = MathUtil.twoBit(MathUtil.twoBit(fjzblist.get(i).getPointValueInDouble()));
@@ -2093,7 +2250,7 @@ public class GenreSetPushService {
                     }
 
                     if (!gfzblist.isEmpty() && gfzblist.size() == gfzblist.size()) {
-                        for (int i = 0; i < wtls.size(); i++) {
+                        for (int i = 0; i < gfzblist.size(); i++) {
                             double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfzblist.get(i).getPointValueInDouble()));
                             switch (Double.valueOf(gfzt).intValue()) {
                                 case 0:
@@ -2273,25 +2430,41 @@ public class GenreSetPushService {
 
                 }else if (id.endsWith("GDC") || InitialRunner.pjmap.containsKey(id) || InitialRunner.lnmap.containsKey(id)){
                     List<String> gfzbls = new ArrayList<>();
-                    List<Windturbine> wtls =null;
-                    if(id.endsWith("GDC"))
-                    {
-                        wtls =InitialRunner.wp_wtmap.get(id);
-                    }else  if(InitialRunner.pjmap.containsKey(id))
-                    {
-                        wtls =InitialRunner.pj_wtmap.get(id);
-                    }else  if(InitialRunner.lnmap.containsKey(id))
-                    {
-                        wtls =InitialRunner.ln_wtmap.get(id);
-                    }
 
-                    for(Windturbine wt:wtls) {
-                        //状态
-                        gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                    if(id.endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(id)){
+                        List<Inverter> wtls = InitialRunner.gp_nbqmap.get(id);
+                        for(Inverter wt:wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(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());
+                        }
+                    }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());
+                        }
+                    } else  if( InitialRunner.pj_wtmap.containsKey(id)){
+                        List<Windturbine> wtls = InitialRunner.pj_wtmap.get(id);
+                        for(Windturbine wt:wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                        }
+                    }else  if( InitialRunner.ln_wtmap.containsKey(id)){
+                        List<Windturbine> wtls = InitialRunner.ln_wtmap.get(id);
+                        for(Windturbine wt:wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                        }
                     }
                     List<PointData> gfzblist = realApiUtil.getRealData(gfzbls);
                     if (!gfzblist.isEmpty() && gfzblist.size() == gfzblist.size()) {
-                        for (int i = 0; i < wtls.size(); i++) {
+                        for (int i = 0; i < gfzblist.size(); i++) {
                             double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfzblist.get(i).getPointValueInDouble()));
                             switch (Double.valueOf(gfzt).intValue()) {
                                 case 0:

+ 84 - 38
web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixDetialPushService.java

@@ -4,6 +4,7 @@ package com.gyee.frame.service.websocket;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Equipmentmodel;
+import com.gyee.frame.model.auto.Inverter;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
@@ -15,7 +16,6 @@ import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.MathUtil;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
-import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -305,66 +305,112 @@ public class MatrixDetialPushService {
 /*************************************************风机指标统计*************************************************************/
             List<String> fjzbls = new ArrayList<>();
 
-            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+//            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
 
             List<MatrixVo> vos = new ArrayList<>();
+            if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId()))
+            {
+                List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+                for (Windturbine wt : wtls) {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getCode());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
+
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getCode());
 
-            for (Windturbine wt : wtls) {
-                //风机状态
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getCode());
-                //风速
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
-                //功率
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
-
-//                //风机转数
-//                if (wt.getWindpowerstationid().equals("QS_FDC")) {
-//                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.QSTPOINT_WT_FDJZS).getCode());
-//                } else {
-//                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getCode());
-//                }
-
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getCode());
+                }
+            }else   if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId()))
+            {
+                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                for (Inverter wt : wtls) {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getCode());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
+
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getCode());
+
+                }
             }
 
+
             List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
 
             if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
 
 
                 int step = 4;
-                for (int i = 0; i < wtls.size(); i++) {
-                    Windturbine wt = wtls.get(i);
 
-                    MatrixVo vo = new MatrixVo();
-                    vo.setWtId(wt.getId());
-                    if (StringUtils.notEmp(wt.getStatus())) {
-                        String num = wt.getStatus().substring(wt.getStatus().length() - 3);
-                        vo.setWtnum(num);
+                if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId()))
+                {
+                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+                    for (int i = 0; i < wtls.size(); i++) {
+                        Windturbine wt = wtls.get(i);
 
-                    }
+                        MatrixVo vo = new MatrixVo();
+                        vo.setWtId(wt.getId());
+                        String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                        vo.setWtnum(num);
 
-                    vo.setFjzt(MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble()));
-                    vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
-                    vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
+                        vo.setFjzt(MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble()));
+                        vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
+                        vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
 
-                    //风机转数
+                        //风机转数
 
-                    double fdjzs = MathUtil.twoBit(fjzblist.get(i * step + 3).getPointValueInDouble());
-                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
-                    if (model.getPowerproduction() == 2000) {
-                        vo.setFdjzs(fdjzs * 9.55);
-                    } else {
+                        double fdjzs = MathUtil.twoBit(fjzblist.get(i * step + 3).getPointValueInDouble());
+                        Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+//                    if (model.getPowerproduction() == 2000) {
+//                        vo.setFdjzs(fdjzs * 9.55);
+//                    } else {
+//                        vo.setFdjzs(fdjzs);
+//                    }
                         vo.setFdjzs(fdjzs);
+
+                        vo.setWtCode(wt.getCode());
+                        vo.setWpId(wt.getWindpowerstationid());
+                        vos.add(vo);
+
                     }
+                }else   if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId()))
+                {
+                    List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                    for (int i = 0; i < wtls.size(); i++) {
+                        Inverter wt = wtls.get(i);
+
+                        MatrixVo vo = new MatrixVo();
+                        vo.setWtId(wt.getId());
+                        String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                        vo.setWtnum(num);
 
+                        vo.setFjzt(MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble()));
+                        vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
+                        vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
 
-                    vo.setWtCode(wt.getCode());
-                    vo.setWpId(wt.getWindpowerstationid());
-                    vos.add(vo);
+                        //风机转数
+
+                        double fdjzs = MathUtil.twoBit(fjzblist.get(i * step + 3).getPointValueInDouble());
+                        Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+//                    if (model.getPowerproduction() == 2000) {
+//                        vo.setFdjzs(fdjzs * 9.55);
+//                    } else {
+//                        vo.setFdjzs(fdjzs);
+//                    }
+                        vo.setFdjzs(fdjzs);
 
+                        vo.setWtCode(wt.getCode());
+                        vo.setWpId(wt.getWindpowerstationid());
+                        vos.add(vo);
+
+                    }
                 }
 
+
             }
             fjvos.add(vos);
 

+ 81 - 29
web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixPushService.java

@@ -3,6 +3,7 @@ package com.gyee.frame.service.websocket;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.Inverter;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
@@ -209,18 +210,33 @@ public class MatrixPushService {
 /*************************************************风机指标统计*************************************************************/
             List<String> fjzbls = new ArrayList<>();
 
-            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
 
             List<MatrixVo> vos = new ArrayList<>();
 
-            for (Windturbine wt : wtls) {
-                //风机状态
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
-                //风速
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
-                //功率
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
+            if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId()))
+            {
+                List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+                for (Windturbine wt : wtls) {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
 
+                }
+            }else   if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId()))
+            {
+                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                for (Inverter wt : wtls) {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
+
+                }
             }
 
             List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
@@ -230,33 +246,66 @@ public class MatrixPushService {
 
                 int step = 3;
                 int slts = 0;
-                for (int i = 0; i < wtls.size(); i++) {
-                    Windturbine wt = wtls.get(i);
-
-                    MatrixVo vo = new MatrixVo();
-                    vo.setWtId(wt.getId());
-                    if (StringUtils.notEmp(wt.getStatus())) {
-                        // String num = wt.getStatus().substring(wt.getStatus().length() - 3);
-                        String num = wt.getStatus().substring(wt.getId().indexOf("_")+1);
-                        vo.setWtnum(num);
+                if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId()))
+                {
+                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+                    for (int i = 0; i < wtls.size(); i++) {
+                        Windturbine wt = wtls.get(i);
+
+                        MatrixVo vo = new MatrixVo();
+                        vo.setWtId(wt.getId());
+                        if (StringUtils.notEmp(wt.getId())) {
+                            // String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                            String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                            vo.setWtnum(num);
+
+                        }
+
+
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                        if (fjzt == 6) {
+                            slts++;
+                        }
+                        vo.setFjzt(fjzt);
+                        vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
+                        vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
+                        vo.setWtCode(wt.getCode());
+                        vo.setWpId(wt.getWindpowerstationid());
+                        vos.add(vo);
 
                     }
+                }else   if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId()))
+                {
+                    List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                    for (int i = 0; i < wtls.size(); i++) {
+                        Inverter wt = wtls.get(i);
+
+                        MatrixVo vo = new MatrixVo();
+                        vo.setWtId(wt.getId());
+                        if (StringUtils.notEmp(wt.getId())) {
+                            // String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                            String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                            vo.setWtnum(num);
+
+                        }
+
+
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                        if (fjzt == 6) {
+                            slts++;
+                        }
+                        vo.setFjzt(fjzt);
+                        vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
+                        vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
+                        vo.setWtCode(wt.getCode());
+                        vo.setWpId(wt.getWindpowerstationid());
+                        vos.add(vo);
 
-
-                    double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
-                    if (fjzt == 6) {
-                        slts++;
                     }
-                    vo.setFjzt(fjzt);
-                    vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
-                    vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
-                    vo.setWtCode(wt.getCode());
-                    vo.setWpId(wt.getWindpowerstationid());
-                    vos.add(vo);
-
                 }
 
 
+
                 jczbmap.put("slts", 0.0);
 
                 double djts=(Double)jczbmap.get("djts");
@@ -273,7 +322,10 @@ public class MatrixPushService {
                 }
 
             }
-            fjvos.add(vos);
+            if(!vos.isEmpty())
+            {
+                fjvos.add(vos);
+            }
 
 /*************************************************风机指标统计*************************************************************/
 

+ 122 - 50
web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java

@@ -4,6 +4,7 @@ package com.gyee.frame.service.websocket;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Equipmentmodel;
+import com.gyee.frame.model.auto.Inverter;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
@@ -199,20 +200,37 @@ public class MatrixQfPushService {
 /*************************************************风机指标统计*************************************************************/
             List<String> fjzbls = new ArrayList<>();
 
-            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+//            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
 
             List<MatrixVo> vos = new ArrayList<>();
 
-            for (Windturbine wt : wtls) {
-                //风机状态
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
-                //风速
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
-                //功率
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
+            if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId()))
+            {
+                List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+                for (Windturbine wt : wtls) {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
 
+                }
+            }else  if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId()))
+            {
+                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                for (Inverter wt : wtls) {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getCode());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
+
+                }
             }
 
+
             List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
 
             if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
@@ -220,52 +238,106 @@ public class MatrixQfPushService {
 
                 int step = 3;
                 double slts=0;
-                for (int i = 0; i < wtls.size(); i++) {
-                    Windturbine wt = wtls.get(i);
 
-                    MatrixVo vo = new MatrixVo();
-                    vo.setWtId(wt.getId());
-                    if (StringUtils.notEmp(wt.getStatus())) {
-                        String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                if(wp.getId().endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wp.getId()))
+                {
+                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wp.getId());
+                    for (int i = 0; i < wtls.size(); i++) {
+                        Windturbine wt = wtls.get(i);
 
-                        vo.setWtnum(num);
+                        MatrixVo vo = new MatrixVo();
+                        vo.setWtId(wt.getId());
+                        if (StringUtils.notEmp(wt.getId())) {
+                            String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                            vo.setWtnum(num);
 
-                    }
-                    double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
-                    vo.setFjzt(fjzt);
-                    double fs = MathUtil.twoBit(fjzblist.get(i * step+1).getPointValueInDouble());
-                    vo.setFs(fs);
-                    double gl = MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble());
-                    vo.setGl(gl);
-                    vo.setWtCode(wt.getCode());
-                    if (fjzt == 3) {
-                        vo.setLyl(0.0);
-                    } else {
-                        if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
-                            Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
-                            double generatingcapacity = ml.getPowerproduction();
-                            BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
-                            double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();
-                            vo.setLyl(lyl);
-                        } else {
+                        }
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                        vo.setFjzt(fjzt);
+                        double fs = MathUtil.twoBit(fjzblist.get(i * step+1).getPointValueInDouble());
+                        vo.setFs(fs);
+                        double gl = MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble());
+                        vo.setGl(gl);
+                        vo.setWtCode(wt.getCode());
+                        if (fjzt == 3) {
                             vo.setLyl(0.0);
+                        } else {
+                            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
+                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+                                double generatingcapacity = ml.getPowerproduction();
+                                BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                                double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();
+                                vo.setLyl(lyl);
+                            } else {
+                                vo.setLyl(0.0);
+                            }
                         }
-                    }
 
-                    if(fjzt==6)
-                    {
-                        slts++;
-                    }
-                    if(StringUtils.notEmp(wt.getStatus()))
-                    {
-                        String num=wt.getStatus().substring(wt.getStatus().length()-3);
-                        vo.setWtnum(num);
+                        if(fjzt==6)
+                        {
+                            slts++;
+                        }
+                        if(StringUtils.notEmp(wt.getId()))
+                        {
+                            String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                            vo.setWtnum(num);
+
+                        }
 
+                        vo.setWpId(wt.getWindpowerstationid());
+                        vos.add(vo);
                     }
+                }else  if(wp.getId().endsWith("GDC") && InitialRunner.gp_nbqmap.containsKey(wp.getId()))
+                {
+                    List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                    for (int i = 0; i < wtls.size(); i++) {
+                        Inverter wt = wtls.get(i);
 
-                    vo.setWpId(wt.getWindpowerstationid());
-                    vos.add(vo);
+                        MatrixVo vo = new MatrixVo();
+                        vo.setWtId(wt.getId());
+                        if (StringUtils.notEmp(wt.getId())) {
+                            String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+
+                            vo.setWtnum(num);
+
+                        }
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                        vo.setFjzt(fjzt);
+                        double fs = MathUtil.twoBit(fjzblist.get(i * step+1).getPointValueInDouble());
+                        vo.setFs(fs);
+                        double gl = MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble());
+                        vo.setGl(gl);
+                        vo.setWtCode(wt.getCode());
+                        if (fjzt == 3) {
+                            vo.setLyl(0.0);
+                        } else {
+                            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
+                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+                                double generatingcapacity = ml.getPowerproduction();
+                                BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                                double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();
+                                vo.setLyl(lyl);
+                            } else {
+                                vo.setLyl(0.0);
+                            }
+                        }
+
+                        if(fjzt==6)
+                        {
+                            slts++;
+                        }
+                        if(StringUtils.notEmp(wt.getId()))
+                        {
+                            String num = wt.getId().substring(wt.getId().indexOf("_")+1);
+                            vo.setWtnum(num);
+
+                        }
+
+                        vo.setWpId(wt.getWindpowerstationid());
+                        vos.add(vo);
+                    }
                 }
+
                 //限电台数
                 jczbmap.put("slts", 0.0);
                 double djts=(Double)jczbmap.get("djts");
@@ -277,7 +349,7 @@ public class MatrixQfPushService {
                 jczbmap.put("jrts", Double.valueOf(slts)+djts+yxts+gzts+lxts+whts+xdts);
                 fcslnum=fcslnum+Double.valueOf(slts).intValue();
             }
-           // fjmap.put(wp.getId(), vos);
+            // fjmap.put(wp.getId(), vos);
             fjvos.add(vos);
 /*************************************************风机指标统计*************************************************************/
 
@@ -307,15 +379,15 @@ public class MatrixQfPushService {
         map.put("fcjrnum", fcdjnum+fcyxnum+fcgznum+fclxnum+fcwhnum+fcxdnum+fcslnum);
         List<String> qfzbls = new ArrayList<>();
         //日0欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R0QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R0QFZT).getCode());
         //日1欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R1QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R1QFZT).getCode());
         //日2欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R2QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R2QFZT).getCode());
         //日3欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R3QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R3QFZT).getCode());
         //日4欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R4QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R4QFZT).getCode());
         List<PointData> qfzblist = realApiUtil.getRealData(qfzbls);
 
         if (!qfzblist.isEmpty() && qfzblist.size() == qfzbls.size()) {

+ 303 - 0
web/monitor-hb/src/main/resources/mybatis/auto/BoxChangeMapper.xml

@@ -0,0 +1,303 @@
+<?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.BoxChangeMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.BoxChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="windpowerstationid" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="projectid" jdbcType="VARCHAR" property="projectid" />
+    <result column="lineid" jdbcType="VARCHAR" property="lineid" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="squareid" jdbcType="VARCHAR" property="squareid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, windpowerstationid, projectid, lineid, name, squareid
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.BoxChangeExample" 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 boxchange
+    <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 boxchange
+    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 boxchange
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.BoxChangeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from boxchange
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.BoxChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into boxchange (id, code, windpowerstationid, 
+      projectid, lineid, name, 
+      squareid)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
+      #{projectid,jdbcType=VARCHAR}, #{lineid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{squareid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.BoxChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into boxchange
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid,
+      </if>
+      <if test="projectid != null">
+        projectid,
+      </if>
+      <if test="lineid != null">
+        lineid,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="squareid != null">
+        squareid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        #{squareid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.BoxChangeExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from boxchange
+    <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 boxchange
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        projectid = #{record.projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lineid != null">
+        lineid = #{record.lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.squareid != null">
+        squareid = #{record.squareid,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 boxchange
+    set id = #{record.id,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{record.projectid,jdbcType=VARCHAR},
+      lineid = #{record.lineid,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      squareid = #{record.squareid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.BoxChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update boxchange
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        projectid = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        lineid = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        squareid = #{squareid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.BoxChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update boxchange
+    set code = #{code,jdbcType=VARCHAR},
+      windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{projectid,jdbcType=VARCHAR},
+      lineid = #{lineid,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      squareid = #{squareid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 351 - 0
web/monitor-hb/src/main/resources/mybatis/auto/InverterMapper.xml

@@ -0,0 +1,351 @@
+<?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.InverterMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Inverter">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="windpowerstationid" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="projectid" jdbcType="VARCHAR" property="projectid" />
+    <result column="lineid" jdbcType="VARCHAR" property="lineid" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="squareid" jdbcType="VARCHAR" property="squareid" />
+    <result column="boxchangeid" jdbcType="VARCHAR" property="boxchangeid" />
+    <result column="isstandard" jdbcType="INTEGER" property="isstandard" />
+    <result column="modelId" jdbcType="VARCHAR" property="modelid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, windpowerstationid, projectid, lineid, name, squareid, boxchangeid, isstandard, 
+    modelId
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.InverterExample" 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 inverter
+    <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 inverter
+    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 inverter
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.InverterExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from inverter
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Inverter">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into inverter (id, code, windpowerstationid, 
+      projectid, lineid, name, 
+      squareid, boxchangeid, isstandard, 
+      modelId)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
+      #{projectid,jdbcType=VARCHAR}, #{lineid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{squareid,jdbcType=VARCHAR}, #{boxchangeid,jdbcType=VARCHAR}, #{isstandard,jdbcType=INTEGER}, 
+      #{modelid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Inverter">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into inverter
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid,
+      </if>
+      <if test="projectid != null">
+        projectid,
+      </if>
+      <if test="lineid != null">
+        lineid,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="squareid != null">
+        squareid,
+      </if>
+      <if test="boxchangeid != null">
+        boxchangeid,
+      </if>
+      <if test="isstandard != null">
+        isstandard,
+      </if>
+      <if test="modelid != null">
+        modelId,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        #{squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="boxchangeid != null">
+        #{boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="isstandard != null">
+        #{isstandard,jdbcType=INTEGER},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.InverterExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from inverter
+    <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 inverter
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        projectid = #{record.projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lineid != null">
+        lineid = #{record.lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.squareid != null">
+        squareid = #{record.squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.boxchangeid != null">
+        boxchangeid = #{record.boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isstandard != null">
+        isstandard = #{record.isstandard,jdbcType=INTEGER},
+      </if>
+      <if test="record.modelid != null">
+        modelId = #{record.modelid,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 inverter
+    set id = #{record.id,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{record.projectid,jdbcType=VARCHAR},
+      lineid = #{record.lineid,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      squareid = #{record.squareid,jdbcType=VARCHAR},
+      boxchangeid = #{record.boxchangeid,jdbcType=VARCHAR},
+      isstandard = #{record.isstandard,jdbcType=INTEGER},
+      modelId = #{record.modelid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Inverter">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update inverter
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        projectid = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        lineid = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        squareid = #{squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="boxchangeid != null">
+        boxchangeid = #{boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="isstandard != null">
+        isstandard = #{isstandard,jdbcType=INTEGER},
+      </if>
+      <if test="modelid != null">
+        modelId = #{modelid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Inverter">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update inverter
+    set code = #{code,jdbcType=VARCHAR},
+      windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{projectid,jdbcType=VARCHAR},
+      lineid = #{lineid,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      squareid = #{squareid,jdbcType=VARCHAR},
+      boxchangeid = #{boxchangeid,jdbcType=VARCHAR},
+      isstandard = #{isstandard,jdbcType=INTEGER},
+      modelId = #{modelid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 232 - 0
web/monitor-hb/src/main/resources/mybatis/auto/InverterStandardPointMapper.xml

@@ -0,0 +1,232 @@
+<?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.InverterStandardPointMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.InverterStandardPoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="id" jdbcType="VARCHAR" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="uniformcode" jdbcType="VARCHAR" property="uniformcode" />
+    <result column="ordernum" jdbcType="VARCHAR" property="ordernum" />
+    <result column="types" jdbcType="VARCHAR" property="types" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, name, uniformcode, ordernum, types
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.InverterStandardPointExample" 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 inverterstandardpoint
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.InverterStandardPointExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from inverterstandardpoint
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.InverterStandardPoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into inverterstandardpoint (id, code, name, 
+      uniformcode, ordernum, types
+      )
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{uniformcode,jdbcType=VARCHAR}, #{ordernum,jdbcType=VARCHAR}, #{types,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.InverterStandardPoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into inverterstandardpoint
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="uniformcode != null">
+        uniformcode,
+      </if>
+      <if test="ordernum != null">
+        ordernum,
+      </if>
+      <if test="types != null">
+        types,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=VARCHAR},
+      </if>
+      <if test="types != null">
+        #{types,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.InverterStandardPointExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from inverterstandardpoint
+    <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 inverterstandardpoint
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uniformcode != null">
+        uniformcode = #{record.uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ordernum != null">
+        ordernum = #{record.ordernum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.types != null">
+        types = #{record.types,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 inverterstandardpoint
+    set id = #{record.id,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      uniformcode = #{record.uniformcode,jdbcType=VARCHAR},
+      ordernum = #{record.ordernum,jdbcType=VARCHAR},
+      types = #{record.types,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

+ 335 - 0
web/monitor-hb/src/main/resources/mybatis/auto/JunctionboxMapper.xml

@@ -0,0 +1,335 @@
+<?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.JunctionboxMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Junctionbox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="windpowerstationid" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="projectid" jdbcType="VARCHAR" property="projectid" />
+    <result column="lineid" jdbcType="VARCHAR" property="lineid" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="squareid" jdbcType="VARCHAR" property="squareid" />
+    <result column="boxchangeid" jdbcType="VARCHAR" property="boxchangeid" />
+    <result column="inverterid" jdbcType="VARCHAR" property="inverterid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, windpowerstationid, projectid, lineid, name, squareid, boxchangeid, inverterid
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.JunctionboxExample" 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 junctionbox
+    <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 junctionbox
+    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 junctionbox
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.JunctionboxExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from junctionbox
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Junctionbox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into junctionbox (id, code, windpowerstationid, 
+      projectid, lineid, name, 
+      squareid, boxchangeid, inverterid
+      )
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
+      #{projectid,jdbcType=VARCHAR}, #{lineid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{squareid,jdbcType=VARCHAR}, #{boxchangeid,jdbcType=VARCHAR}, #{inverterid,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Junctionbox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into junctionbox
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid,
+      </if>
+      <if test="projectid != null">
+        projectid,
+      </if>
+      <if test="lineid != null">
+        lineid,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="squareid != null">
+        squareid,
+      </if>
+      <if test="boxchangeid != null">
+        boxchangeid,
+      </if>
+      <if test="inverterid != null">
+        inverterid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        #{squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="boxchangeid != null">
+        #{boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="inverterid != null">
+        #{inverterid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.JunctionboxExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from junctionbox
+    <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 junctionbox
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        projectid = #{record.projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lineid != null">
+        lineid = #{record.lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.squareid != null">
+        squareid = #{record.squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.boxchangeid != null">
+        boxchangeid = #{record.boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inverterid != null">
+        inverterid = #{record.inverterid,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 junctionbox
+    set id = #{record.id,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{record.projectid,jdbcType=VARCHAR},
+      lineid = #{record.lineid,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      squareid = #{record.squareid,jdbcType=VARCHAR},
+      boxchangeid = #{record.boxchangeid,jdbcType=VARCHAR},
+      inverterid = #{record.inverterid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Junctionbox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update junctionbox
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        projectid = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        lineid = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        squareid = #{squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="boxchangeid != null">
+        boxchangeid = #{boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="inverterid != null">
+        inverterid = #{inverterid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Junctionbox">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update junctionbox
+    set code = #{code,jdbcType=VARCHAR},
+      windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{projectid,jdbcType=VARCHAR},
+      lineid = #{lineid,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      squareid = #{squareid,jdbcType=VARCHAR},
+      boxchangeid = #{boxchangeid,jdbcType=VARCHAR},
+      inverterid = #{inverterid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 219 - 0
web/monitor-hb/src/main/resources/mybatis/auto/PhotovoltaicStandardPointMapper.xml

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

+ 555 - 0
web/monitor-hb/src/main/resources/mybatis/auto/PhotovoltaicTestingPointNewMapper.xml

@@ -0,0 +1,555 @@
+<?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.PhotovoltaicTestingPointNewMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.PhotovoltaicTestingPointNew">
+    <!--
+      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="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="windturbineid" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="uniformcode" jdbcType="VARCHAR" property="uniformcode" />
+    <result column="shortid" jdbcType="VARCHAR" property="shortid" />
+    <result column="longid" jdbcType="VARCHAR" property="longid" />
+    <result column="windpowerstationid" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="realtimeid" jdbcType="VARCHAR" property="realtimeid" />
+    <result column="squareid" jdbcType="VARCHAR" property="squareid" />
+    <result column="boxchangeid" jdbcType="VARCHAR" property="boxchangeid" />
+    <result column="inverterid" jdbcType="VARCHAR" property="inverterid" />
+    <result column="junctionboxid" jdbcType="VARCHAR" property="junctionboxid" />
+    <result column="types" jdbcType="VARCHAR" property="types" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, name, model, valueunit, englishname, typeid, modelid, maxval, minval, reasonablemaxval, 
+    reasonableminval, windturbineid, uniformcode, shortid, longid, windpowerstationid, 
+    realtimeid, squareid, boxchangeid, inverterid, junctionboxid, types
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNewExample" 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 photovoltaictestingpointnew
+    <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 photovoltaictestingpointnew
+    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 photovoltaictestingpointnew
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from photovoltaictestingpointnew
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into photovoltaictestingpointnew (id, code, name, 
+      model, valueunit, englishname, 
+      typeid, modelid, maxval, 
+      minval, reasonablemaxval, reasonableminval, 
+      windturbineid, uniformcode, shortid, 
+      longid, windpowerstationid, realtimeid, 
+      squareid, boxchangeid, inverterid, 
+      junctionboxid, types)
+    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=NUMERIC}, 
+      #{minval,jdbcType=NUMERIC}, #{reasonablemaxval,jdbcType=NUMERIC}, #{reasonableminval,jdbcType=NUMERIC}, 
+      #{windturbineid,jdbcType=VARCHAR}, #{uniformcode,jdbcType=VARCHAR}, #{shortid,jdbcType=VARCHAR}, 
+      #{longid,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, #{realtimeid,jdbcType=VARCHAR}, 
+      #{squareid,jdbcType=VARCHAR}, #{boxchangeid,jdbcType=VARCHAR}, #{inverterid,jdbcType=VARCHAR}, 
+      #{junctionboxid,jdbcType=VARCHAR}, #{types,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into photovoltaictestingpointnew
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="model != null">
+        model,
+      </if>
+      <if test="valueunit != null">
+        valueunit,
+      </if>
+      <if test="englishname != null">
+        englishname,
+      </if>
+      <if test="typeid != null">
+        typeid,
+      </if>
+      <if test="modelid != null">
+        modelid,
+      </if>
+      <if test="maxval != null">
+        maxval,
+      </if>
+      <if test="minval != null">
+        minval,
+      </if>
+      <if test="reasonablemaxval != null">
+        reasonablemaxval,
+      </if>
+      <if test="reasonableminval != null">
+        reasonableminval,
+      </if>
+      <if test="windturbineid != null">
+        windturbineid,
+      </if>
+      <if test="uniformcode != null">
+        uniformcode,
+      </if>
+      <if test="shortid != null">
+        shortid,
+      </if>
+      <if test="longid != null">
+        longid,
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid,
+      </if>
+      <if test="realtimeid != null">
+        realtimeid,
+      </if>
+      <if test="squareid != null">
+        squareid,
+      </if>
+      <if test="boxchangeid != null">
+        boxchangeid,
+      </if>
+      <if test="inverterid != null">
+        inverterid,
+      </if>
+      <if test="junctionboxid != null">
+        junctionboxid,
+      </if>
+      <if test="types != null">
+        types,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="valueunit != null">
+        #{valueunit,jdbcType=VARCHAR},
+      </if>
+      <if test="englishname != null">
+        #{englishname,jdbcType=VARCHAR},
+      </if>
+      <if test="typeid != null">
+        #{typeid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="maxval != null">
+        #{maxval,jdbcType=NUMERIC},
+      </if>
+      <if test="minval != null">
+        #{minval,jdbcType=NUMERIC},
+      </if>
+      <if test="reasonablemaxval != null">
+        #{reasonablemaxval,jdbcType=NUMERIC},
+      </if>
+      <if test="reasonableminval != null">
+        #{reasonableminval,jdbcType=NUMERIC},
+      </if>
+      <if test="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="shortid != null">
+        #{shortid,jdbcType=VARCHAR},
+      </if>
+      <if test="longid != null">
+        #{longid,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="realtimeid != null">
+        #{realtimeid,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        #{squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="boxchangeid != null">
+        #{boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="inverterid != null">
+        #{inverterid,jdbcType=VARCHAR},
+      </if>
+      <if test="junctionboxid != null">
+        #{junctionboxid,jdbcType=VARCHAR},
+      </if>
+      <if test="types != null">
+        #{types,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from photovoltaictestingpointnew
+    <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 photovoltaictestingpointnew
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null">
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.valueunit != null">
+        valueunit = #{record.valueunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.englishname != null">
+        englishname = #{record.englishname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.typeid != null">
+        typeid = #{record.typeid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelid != null">
+        modelid = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.maxval != null">
+        maxval = #{record.maxval,jdbcType=NUMERIC},
+      </if>
+      <if test="record.minval != null">
+        minval = #{record.minval,jdbcType=NUMERIC},
+      </if>
+      <if test="record.reasonablemaxval != null">
+        reasonablemaxval = #{record.reasonablemaxval,jdbcType=NUMERIC},
+      </if>
+      <if test="record.reasonableminval != null">
+        reasonableminval = #{record.reasonableminval,jdbcType=NUMERIC},
+      </if>
+      <if test="record.windturbineid != null">
+        windturbineid = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uniformcode != null">
+        uniformcode = #{record.uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shortid != null">
+        shortid = #{record.shortid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.longid != null">
+        longid = #{record.longid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.realtimeid != null">
+        realtimeid = #{record.realtimeid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.squareid != null">
+        squareid = #{record.squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.boxchangeid != null">
+        boxchangeid = #{record.boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inverterid != null">
+        inverterid = #{record.inverterid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.junctionboxid != null">
+        junctionboxid = #{record.junctionboxid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.types != null">
+        types = #{record.types,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 photovoltaictestingpointnew
+    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},
+      windturbineid = #{record.windturbineid,jdbcType=VARCHAR},
+      uniformcode = #{record.uniformcode,jdbcType=VARCHAR},
+      shortid = #{record.shortid,jdbcType=VARCHAR},
+      longid = #{record.longid,jdbcType=VARCHAR},
+      windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      realtimeid = #{record.realtimeid,jdbcType=VARCHAR},
+      squareid = #{record.squareid,jdbcType=VARCHAR},
+      boxchangeid = #{record.boxchangeid,jdbcType=VARCHAR},
+      inverterid = #{record.inverterid,jdbcType=VARCHAR},
+      junctionboxid = #{record.junctionboxid,jdbcType=VARCHAR},
+      types = #{record.types,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update photovoltaictestingpointnew
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="valueunit != null">
+        valueunit = #{valueunit,jdbcType=VARCHAR},
+      </if>
+      <if test="englishname != null">
+        englishname = #{englishname,jdbcType=VARCHAR},
+      </if>
+      <if test="typeid != null">
+        typeid = #{typeid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        modelid = #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="maxval != null">
+        maxval = #{maxval,jdbcType=NUMERIC},
+      </if>
+      <if test="minval != null">
+        minval = #{minval,jdbcType=NUMERIC},
+      </if>
+      <if test="reasonablemaxval != null">
+        reasonablemaxval = #{reasonablemaxval,jdbcType=NUMERIC},
+      </if>
+      <if test="reasonableminval != null">
+        reasonableminval = #{reasonableminval,jdbcType=NUMERIC},
+      </if>
+      <if test="windturbineid != null">
+        windturbineid = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        uniformcode = #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="shortid != null">
+        shortid = #{shortid,jdbcType=VARCHAR},
+      </if>
+      <if test="longid != null">
+        longid = #{longid,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="realtimeid != null">
+        realtimeid = #{realtimeid,jdbcType=VARCHAR},
+      </if>
+      <if test="squareid != null">
+        squareid = #{squareid,jdbcType=VARCHAR},
+      </if>
+      <if test="boxchangeid != null">
+        boxchangeid = #{boxchangeid,jdbcType=VARCHAR},
+      </if>
+      <if test="inverterid != null">
+        inverterid = #{inverterid,jdbcType=VARCHAR},
+      </if>
+      <if test="junctionboxid != null">
+        junctionboxid = #{junctionboxid,jdbcType=VARCHAR},
+      </if>
+      <if test="types != null">
+        types = #{types,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.PhotovoltaicTestingPointNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update photovoltaictestingpointnew
+    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},
+      windturbineid = #{windturbineid,jdbcType=VARCHAR},
+      uniformcode = #{uniformcode,jdbcType=VARCHAR},
+      shortid = #{shortid,jdbcType=VARCHAR},
+      longid = #{longid,jdbcType=VARCHAR},
+      windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      realtimeid = #{realtimeid,jdbcType=VARCHAR},
+      squareid = #{squareid,jdbcType=VARCHAR},
+      boxchangeid = #{boxchangeid,jdbcType=VARCHAR},
+      inverterid = #{inverterid,jdbcType=VARCHAR},
+      junctionboxid = #{junctionboxid,jdbcType=VARCHAR},
+      types = #{types,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 303 - 0
web/monitor-hb/src/main/resources/mybatis/auto/SquareMapper.xml

@@ -0,0 +1,303 @@
+<?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.SquareMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Square">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="windpowerstationid" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="projectid" jdbcType="VARCHAR" property="projectid" />
+    <result column="lineid" jdbcType="VARCHAR" property="lineid" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="types" jdbcType="VARCHAR" property="types" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, code, windpowerstationid, projectid, lineid, name, types
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.SquareExample" 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 square
+    <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 square
+    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 square
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.SquareExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from square
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Square">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into square (id, code, windpowerstationid, 
+      projectid, lineid, name, 
+      types)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{windpowerstationid,jdbcType=VARCHAR}, 
+      #{projectid,jdbcType=VARCHAR}, #{lineid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{types,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Square">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into square
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid,
+      </if>
+      <if test="projectid != null">
+        projectid,
+      </if>
+      <if test="lineid != null">
+        lineid,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="types != null">
+        types,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="types != null">
+        #{types,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.SquareExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from square
+    <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 square
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windpowerstationid != null">
+        windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        projectid = #{record.projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lineid != null">
+        lineid = #{record.lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.types != null">
+        types = #{record.types,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 square
+    set id = #{record.id,jdbcType=VARCHAR},
+      code = #{record.code,jdbcType=VARCHAR},
+      windpowerstationid = #{record.windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{record.projectid,jdbcType=VARCHAR},
+      lineid = #{record.lineid,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      types = #{record.types,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Square">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update square
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="windpowerstationid != null">
+        windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        projectid = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        lineid = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="types != null">
+        types = #{types,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Square">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update square
+    set code = #{code,jdbcType=VARCHAR},
+      windpowerstationid = #{windpowerstationid,jdbcType=VARCHAR},
+      projectid = #{projectid,jdbcType=VARCHAR},
+      lineid = #{lineid,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      types = #{types,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>