后台监视系统功能修正

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

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 
 /**
@@ -11,6 +12,7 @@ import org.springframework.cache.annotation.EnableCaching;
  * @author gyee
  *
  */
+@EnableDiscoveryClient //开启服务注册与发现功能： classpath: META-INF/spring.factories文件
 @EnableCaching
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
 public class SpringbootStart {

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

@@ -86,12 +86,12 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Windturbine> wtmap = new HashMap<String, Windturbine>();//风机（包含光电电）
 
     public static Map<String, Stoptype> stoptypemap = new HashMap<String, Stoptype>();//停机类型
-    public static List<Warning> warnls = new ArrayList<Warning>(); // 报警LIST集合
-    public static Map<String, Warning> warningmap = new HashMap<String, Warning>();// 报警MAP集合
+    public static List<Warning2> warnls = new ArrayList<Warning2>(); // 报警LIST集合
+    public static Map<String, Warning2> warningmap = new HashMap<String, Warning2>();// 报警MAP集合
     public static List<Windturbineparts> windturbinepartsls = new ArrayList<Windturbineparts>();
     public static Map<String, Windturbineparts> windturbinepartsmap = new HashMap<String, Windturbineparts>();
-    public static Map<String, Map<String, List<Warning>>> warnmodelmap = new HashMap<>();
-    public static Map<String, List<Warning>> warnmap = new HashMap<>();// 按照型号划分报警MAP集合 <型号，报警集合>
+    public static Map<String, Map<String, List<Warning2>>> warnmodelmap = new HashMap<>();
+    public static Map<String, List<Warning2>> warnmap = new HashMap<>();// 按照型号划分报警MAP集合 <型号，报警集合>
     public static List<WarningClassify> warningClassls = new ArrayList<WarningClassify>(); //报警类型列表
     public static Map<String, WarningClassify> warningClassifymap = new HashMap<String, WarningClassify>();
     public static Map<String, Manufacturer> manufacturermap = new HashMap<String, Manufacturer>();
@@ -315,46 +315,46 @@ public class InitialRunner implements CommandLineRunner {
 //            }
 //        }
 
-        WarningExample warningExample = new WarningExample();
+        Warning2Example warningExample = new Warning2Example();
         warningExample.setOrderByClause("id ASC");
 
-        WarningExample.Criteria criteria = warningExample.createCriteria();
+        Warning2Example.Criteria criteria = warningExample.createCriteria();
         criteria.andEdnavalueNotEqualTo(0);
         criteria.andWarningclassifyidIsNotNull();
         warnls = warningService.selectByExample(warningExample);
 
         if (warnls != null && !warnls.isEmpty()) {
             for (int i = 0; i < warnls.size(); i++) {
-                Warning warning = warnls.get(i);
+                Warning2 warning = warnls.get(i);
 
                 if (warnmodelmap.containsKey(warning.getModelid())) {
-                    Map<String, List<Warning>> map = warnmodelmap.get(warning.getModelid());
+                    Map<String, List<Warning2>> map = warnmodelmap.get(warning.getModelid());
                     if(map.containsKey(warning.getWarningclassifyid()))
                     {
-                        List<Warning> ls =map.get(warning.getWarningclassifyid());
+                        List<Warning2> ls =map.get(warning.getWarningclassifyid());
                         ls.add(warning);
                         map.put(warning.getWarningclassifyid(), ls);
                     }else
                     {
-                        List<Warning> ls = new ArrayList<>();
+                        List<Warning2> ls = new ArrayList<>();
                         ls.add(warning);
                         map.put(warning.getWarningclassifyid(), ls);
                     }
                     warnmodelmap.put(warning.getModelid(),map);
                 } else {
-                    Map<String, List<Warning>> map = new HashMap<>();
-                    List<Warning> ls = new ArrayList<>();
+                    Map<String, List<Warning2>> map = new HashMap<>();
+                    List<Warning2> ls = new ArrayList<>();
                     ls.add(warning);
                     map.put(warning.getWarningclassifyid(), ls);
                     warnmodelmap.put(warning.getModelid(),map);
                 }
 
                 if (warnmap.containsKey(warning.getModelid())) {
-                    List<Warning> ls =warnmap.get(warning.getModelid());
+                    List<Warning2> ls =warnmap.get(warning.getModelid());
                     ls.add(warning);
                     warnmap.put(warning.getModelid(),ls);
                 } else {
-                    List<Warning> ls =new ArrayList<>();
+                    List<Warning2> ls =new ArrayList<>();
                     ls.add(warning);
                     warnmap.put(warning.getModelid(),ls);
                 }

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/Warning2Mapper.java

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

web/monitor-web-hb/src/main/java/com/gyee/frame/mapper/auto/WarningMapper.java

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

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Warning.java

@@ -1,13 +1,12 @@
 package com.gyee.frame.model.auto;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
-public class Warning implements Serializable {
+public class Warning2 implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.id
+     * This field corresponds to the database column WARNING2.ID
      *
      * @mbg.generated
      */
@@ -16,7 +15,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.levelId
+     * This field corresponds to the database column WARNING2.LEVELID
      *
      * @mbg.generated
      */
@@ -25,7 +24,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.manufacturerCode
+     * This field corresponds to the database column WARNING2.MANUFACTURERCODE
      *
      * @mbg.generated
      */
@@ -34,7 +33,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.englishText
+     * This field corresponds to the database column WARNING2.ENGLISHTEXT
      *
      * @mbg.generated
      */
@@ -43,7 +42,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.chineseText
+     * This field corresponds to the database column WARNING2.CHINESETEXT
      *
      * @mbg.generated
      */
@@ -52,7 +51,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.parentId
+     * This field corresponds to the database column WARNING2.PARENTID
      *
      * @mbg.generated
      */
@@ -61,16 +60,16 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.isLeaf
+     * This field corresponds to the database column WARNING2.ISLEAF
      *
      * @mbg.generated
      */
-    private Short isleaf;
+    private Integer isleaf;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.sequenceNumber
+     * This field corresponds to the database column WARNING2.SEQUENCENUMBER
      *
      * @mbg.generated
      */
@@ -79,7 +78,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.characteristic
+     * This field corresponds to the database column WARNING2.CHARACTERISTIC
      *
      * @mbg.generated
      */
@@ -88,7 +87,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.modelId
+     * This field corresponds to the database column WARNING2.MODELID
      *
      * @mbg.generated
      */
@@ -97,7 +96,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.codeName
+     * This field corresponds to the database column WARNING2.CODENAME
      *
      * @mbg.generated
      */
@@ -106,7 +105,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.ednaValue
+     * This field corresponds to the database column WARNING2.EDNAVALUE
      *
      * @mbg.generated
      */
@@ -115,7 +114,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.display
+     * This field corresponds to the database column WARNING2.DISPLAY
      *
      * @mbg.generated
      */
@@ -124,7 +123,7 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.warningClassifyId
+     * This field corresponds to the database column WARNING2.WARNINGCLASSIFYID
      *
      * @mbg.generated
      */
@@ -133,25 +132,52 @@ public class Warning implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.isreset
+     * This field corresponds to the database column WARNING2.STANDARDTIME
      *
      * @mbg.generated
      */
-    private BigDecimal isreset;
+    private Integer standardtime;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.standardTime
+     * This field corresponds to the database column WARNING2.ISRESET
      *
      * @mbg.generated
      */
-    private BigDecimal standardtime;
+    private Integer isreset;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column warning2.warningtypeid
+     * This field corresponds to the database column WARNING2.CLASSIFICATION
+     *
+     * @mbg.generated
+     */
+    private String classification;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WARNING2.FAULTCODE
+     *
+     * @mbg.generated
+     */
+    private String faultcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WARNING2.RELATEDPARTS
+     *
+     * @mbg.generated
+     */
+    private String relatedparts;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WARNING2.WARNINGTYPEID
      *
      * @mbg.generated
      */
@@ -159,7 +185,7 @@ public class Warning implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table warning2
+     * This field corresponds to the database table WARNING2
      *
      * @mbg.generated
      */
@@ -167,9 +193,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.id
+     * This method returns the value of the database column WARNING2.ID
      *
-     * @return the value of warning2.id
+     * @return the value of WARNING2.ID
      *
      * @mbg.generated
      */
@@ -179,9 +205,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.id
+     * This method sets the value of the database column WARNING2.ID
      *
-     * @param id the value for warning2.id
+     * @param id the value for WARNING2.ID
      *
      * @mbg.generated
      */
@@ -191,9 +217,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.levelId
+     * This method returns the value of the database column WARNING2.LEVELID
      *
-     * @return the value of warning2.levelId
+     * @return the value of WARNING2.LEVELID
      *
      * @mbg.generated
      */
@@ -203,9 +229,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.levelId
+     * This method sets the value of the database column WARNING2.LEVELID
      *
-     * @param levelid the value for warning2.levelId
+     * @param levelid the value for WARNING2.LEVELID
      *
      * @mbg.generated
      */
@@ -215,9 +241,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.manufacturerCode
+     * This method returns the value of the database column WARNING2.MANUFACTURERCODE
      *
-     * @return the value of warning2.manufacturerCode
+     * @return the value of WARNING2.MANUFACTURERCODE
      *
      * @mbg.generated
      */
@@ -227,9 +253,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.manufacturerCode
+     * This method sets the value of the database column WARNING2.MANUFACTURERCODE
      *
-     * @param manufacturercode the value for warning2.manufacturerCode
+     * @param manufacturercode the value for WARNING2.MANUFACTURERCODE
      *
      * @mbg.generated
      */
@@ -239,9 +265,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.englishText
+     * This method returns the value of the database column WARNING2.ENGLISHTEXT
      *
-     * @return the value of warning2.englishText
+     * @return the value of WARNING2.ENGLISHTEXT
      *
      * @mbg.generated
      */
@@ -251,9 +277,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.englishText
+     * This method sets the value of the database column WARNING2.ENGLISHTEXT
      *
-     * @param englishtext the value for warning2.englishText
+     * @param englishtext the value for WARNING2.ENGLISHTEXT
      *
      * @mbg.generated
      */
@@ -263,9 +289,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.chineseText
+     * This method returns the value of the database column WARNING2.CHINESETEXT
      *
-     * @return the value of warning2.chineseText
+     * @return the value of WARNING2.CHINESETEXT
      *
      * @mbg.generated
      */
@@ -275,9 +301,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.chineseText
+     * This method sets the value of the database column WARNING2.CHINESETEXT
      *
-     * @param chinesetext the value for warning2.chineseText
+     * @param chinesetext the value for WARNING2.CHINESETEXT
      *
      * @mbg.generated
      */
@@ -287,9 +313,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.parentId
+     * This method returns the value of the database column WARNING2.PARENTID
      *
-     * @return the value of warning2.parentId
+     * @return the value of WARNING2.PARENTID
      *
      * @mbg.generated
      */
@@ -299,9 +325,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.parentId
+     * This method sets the value of the database column WARNING2.PARENTID
      *
-     * @param parentid the value for warning2.parentId
+     * @param parentid the value for WARNING2.PARENTID
      *
      * @mbg.generated
      */
@@ -311,33 +337,33 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.isLeaf
+     * This method returns the value of the database column WARNING2.ISLEAF
      *
-     * @return the value of warning2.isLeaf
+     * @return the value of WARNING2.ISLEAF
      *
      * @mbg.generated
      */
-    public Short getIsleaf() {
+    public Integer getIsleaf() {
         return isleaf;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.isLeaf
+     * This method sets the value of the database column WARNING2.ISLEAF
      *
-     * @param isleaf the value for warning2.isLeaf
+     * @param isleaf the value for WARNING2.ISLEAF
      *
      * @mbg.generated
      */
-    public void setIsleaf(Short isleaf) {
+    public void setIsleaf(Integer isleaf) {
         this.isleaf = isleaf;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.sequenceNumber
+     * This method returns the value of the database column WARNING2.SEQUENCENUMBER
      *
-     * @return the value of warning2.sequenceNumber
+     * @return the value of WARNING2.SEQUENCENUMBER
      *
      * @mbg.generated
      */
@@ -347,9 +373,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.sequenceNumber
+     * This method sets the value of the database column WARNING2.SEQUENCENUMBER
      *
-     * @param sequencenumber the value for warning2.sequenceNumber
+     * @param sequencenumber the value for WARNING2.SEQUENCENUMBER
      *
      * @mbg.generated
      */
@@ -359,9 +385,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.characteristic
+     * This method returns the value of the database column WARNING2.CHARACTERISTIC
      *
-     * @return the value of warning2.characteristic
+     * @return the value of WARNING2.CHARACTERISTIC
      *
      * @mbg.generated
      */
@@ -371,9 +397,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.characteristic
+     * This method sets the value of the database column WARNING2.CHARACTERISTIC
      *
-     * @param characteristic the value for warning2.characteristic
+     * @param characteristic the value for WARNING2.CHARACTERISTIC
      *
      * @mbg.generated
      */
@@ -383,9 +409,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.modelId
+     * This method returns the value of the database column WARNING2.MODELID
      *
-     * @return the value of warning2.modelId
+     * @return the value of WARNING2.MODELID
      *
      * @mbg.generated
      */
@@ -395,9 +421,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.modelId
+     * This method sets the value of the database column WARNING2.MODELID
      *
-     * @param modelid the value for warning2.modelId
+     * @param modelid the value for WARNING2.MODELID
      *
      * @mbg.generated
      */
@@ -407,9 +433,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.codeName
+     * This method returns the value of the database column WARNING2.CODENAME
      *
-     * @return the value of warning2.codeName
+     * @return the value of WARNING2.CODENAME
      *
      * @mbg.generated
      */
@@ -419,9 +445,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.codeName
+     * This method sets the value of the database column WARNING2.CODENAME
      *
-     * @param codename the value for warning2.codeName
+     * @param codename the value for WARNING2.CODENAME
      *
      * @mbg.generated
      */
@@ -431,9 +457,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.ednaValue
+     * This method returns the value of the database column WARNING2.EDNAVALUE
      *
-     * @return the value of warning2.ednaValue
+     * @return the value of WARNING2.EDNAVALUE
      *
      * @mbg.generated
      */
@@ -443,9 +469,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.ednaValue
+     * This method sets the value of the database column WARNING2.EDNAVALUE
      *
-     * @param ednavalue the value for warning2.ednaValue
+     * @param ednavalue the value for WARNING2.EDNAVALUE
      *
      * @mbg.generated
      */
@@ -455,9 +481,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.display
+     * This method returns the value of the database column WARNING2.DISPLAY
      *
-     * @return the value of warning2.display
+     * @return the value of WARNING2.DISPLAY
      *
      * @mbg.generated
      */
@@ -467,9 +493,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.display
+     * This method sets the value of the database column WARNING2.DISPLAY
      *
-     * @param display the value for warning2.display
+     * @param display the value for WARNING2.DISPLAY
      *
      * @mbg.generated
      */
@@ -479,9 +505,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.warningClassifyId
+     * This method returns the value of the database column WARNING2.WARNINGCLASSIFYID
      *
-     * @return the value of warning2.warningClassifyId
+     * @return the value of WARNING2.WARNINGCLASSIFYID
      *
      * @mbg.generated
      */
@@ -491,9 +517,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.warningClassifyId
+     * This method sets the value of the database column WARNING2.WARNINGCLASSIFYID
      *
-     * @param warningclassifyid the value for warning2.warningClassifyId
+     * @param warningclassifyid the value for WARNING2.WARNINGCLASSIFYID
      *
      * @mbg.generated
      */
@@ -503,57 +529,129 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.isreset
+     * This method returns the value of the database column WARNING2.STANDARDTIME
+     *
+     * @return the value of WARNING2.STANDARDTIME
+     *
+     * @mbg.generated
+     */
+    public Integer getStandardtime() {
+        return standardtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WARNING2.STANDARDTIME
      *
-     * @return the value of warning2.isreset
+     * @param standardtime the value for WARNING2.STANDARDTIME
      *
      * @mbg.generated
      */
-    public BigDecimal getIsreset() {
+    public void setStandardtime(Integer standardtime) {
+        this.standardtime = standardtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WARNING2.ISRESET
+     *
+     * @return the value of WARNING2.ISRESET
+     *
+     * @mbg.generated
+     */
+    public Integer getIsreset() {
         return isreset;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.isreset
+     * This method sets the value of the database column WARNING2.ISRESET
      *
-     * @param isreset the value for warning2.isreset
+     * @param isreset the value for WARNING2.ISRESET
      *
      * @mbg.generated
      */
-    public void setIsreset(BigDecimal isreset) {
+    public void setIsreset(Integer isreset) {
         this.isreset = isreset;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.standardTime
+     * This method returns the value of the database column WARNING2.CLASSIFICATION
      *
-     * @return the value of warning2.standardTime
+     * @return the value of WARNING2.CLASSIFICATION
      *
      * @mbg.generated
      */
-    public BigDecimal getStandardtime() {
-        return standardtime;
+    public String getClassification() {
+        return classification;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.standardTime
+     * This method sets the value of the database column WARNING2.CLASSIFICATION
      *
-     * @param standardtime the value for warning2.standardTime
+     * @param classification the value for WARNING2.CLASSIFICATION
      *
      * @mbg.generated
      */
-    public void setStandardtime(BigDecimal standardtime) {
-        this.standardtime = standardtime;
+    public void setClassification(String classification) {
+        this.classification = classification == null ? null : classification.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WARNING2.FAULTCODE
+     *
+     * @return the value of WARNING2.FAULTCODE
+     *
+     * @mbg.generated
+     */
+    public String getFaultcode() {
+        return faultcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WARNING2.FAULTCODE
+     *
+     * @param faultcode the value for WARNING2.FAULTCODE
+     *
+     * @mbg.generated
+     */
+    public void setFaultcode(String faultcode) {
+        this.faultcode = faultcode == null ? null : faultcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WARNING2.RELATEDPARTS
+     *
+     * @return the value of WARNING2.RELATEDPARTS
+     *
+     * @mbg.generated
+     */
+    public String getRelatedparts() {
+        return relatedparts;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WARNING2.RELATEDPARTS
+     *
+     * @param relatedparts the value for WARNING2.RELATEDPARTS
+     *
+     * @mbg.generated
+     */
+    public void setRelatedparts(String relatedparts) {
+        this.relatedparts = relatedparts == null ? null : relatedparts.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column warning2.warningtypeid
+     * This method returns the value of the database column WARNING2.WARNINGTYPEID
      *
-     * @return the value of warning2.warningtypeid
+     * @return the value of WARNING2.WARNINGTYPEID
      *
      * @mbg.generated
      */
@@ -563,9 +661,9 @@ public class Warning implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column warning2.warningtypeid
+     * This method sets the value of the database column WARNING2.WARNINGTYPEID
      *
-     * @param warningtypeid the value for warning2.warningtypeid
+     * @param warningtypeid the value for WARNING2.WARNINGTYPEID
      *
      * @mbg.generated
      */

web/monitor-web-hb/src/main/java/com/gyee/frame/service/Shutdownevent2Service.java

@@ -11,9 +11,9 @@ import com.gyee.frame.model.custom.ShutdowneventVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -150,7 +150,7 @@ public class Shutdownevent2Service implements BaseService<Shutdownevent2, Shutdo
 				event.setWarningId(wr.getWarningid());
 				if(StringUtils.notEmp(wr.getWarningid()) && InitialRunner.warningmap.containsKey(wr.getWarningid()))
 				{
-					Warning warning2=InitialRunner.warningmap.get(wr.getWarningid());
+					Warning2 warning2=InitialRunner.warningmap.get(wr.getWarningid());
 					event.setWarnDesc(warning2.getChinesetext());
 				}
 				event.setStartTime(wr.getStarttime());

web/monitor-web-hb/src/main/java/com/gyee/frame/service/Warning2Service.java

@@ -2,9 +2,9 @@ package com.gyee.frame.service;
 
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.Convert;
-import com.gyee.frame.mapper.auto.WarningMapper;
-import com.gyee.frame.model.auto.Warning;
-import com.gyee.frame.model.auto.WarningExample;
+import com.gyee.frame.mapper.auto.Warning2Mapper;
+import com.gyee.frame.model.auto.Warning2;
+import com.gyee.frame.model.auto.Warning2Example;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import org.springframework.stereotype.Service;
 
@@ -13,16 +13,16 @@ import java.util.List;
 
 
 @Service
-public class Warning2Service implements BaseService<Warning, WarningExample> {
+public class Warning2Service implements BaseService<Warning2, Warning2Example> {
 	@Resource
-	private WarningMapper warning2Mapper;
+	private Warning2Mapper warning2Mapper;
 	
 
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			WarningExample example=new WarningExample();
+			Warning2Example example=new Warning2Example();
 			example.createCriteria().andIdIn(lista);
 			return warning2Mapper.deleteByExample(example);
 			
@@ -31,7 +31,7 @@ public class Warning2Service implements BaseService<Warning, WarningExample> {
 	
 	
 	@Override
-	public Warning selectByPrimaryKey(String id) {
+	public Warning2 selectByPrimaryKey(String id) {
 				
 			return warning2Mapper.selectByPrimaryKey(id);
 				
@@ -39,7 +39,7 @@ public class Warning2Service implements BaseService<Warning, WarningExample> {
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(Warning record) {
+	public int updateByPrimaryKeySelective(Warning2 record) {
 		return warning2Mapper.updateByPrimaryKeySelective(record);
 	}
 	
@@ -48,7 +48,7 @@ public class Warning2Service implements BaseService<Warning, WarningExample> {
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(Warning record) {
+	public int insertSelective(Warning2 record) {
 				
 		//添加雪花主键id
 		record.setId(SnowflakeIdWorker.getUUID());
@@ -59,34 +59,34 @@ public class Warning2Service implements BaseService<Warning, WarningExample> {
 	
 	
 	@Override
-	public int updateByExampleSelective(Warning record, WarningExample example) {
+	public int updateByExampleSelective(Warning2 record, Warning2Example example) {
 		
 		return warning2Mapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(Warning record, WarningExample example) {
+	public int updateByExample(Warning2 record, Warning2Example example) {
 		
 		return warning2Mapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<Warning> selectByExample(WarningExample example) {
+	public List<Warning2> selectByExample(Warning2Example example) {
 		
 		return warning2Mapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(WarningExample example) {
+	public long countByExample(Warning2Example example) {
 		
 		return warning2Mapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(WarningExample example) {
+	public int deleteByExample(Warning2Example example) {
 		
 		return warning2Mapper.deleteByExample(example);
 	}

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WarningInfoDayService.java

@@ -321,7 +321,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 				List<WarningInfoDay> ls=entry.getValue();
 
-				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
 
 				SawVo item = new SawVo();
 				item.setNum(i++);
@@ -394,7 +394,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
 			for(WarningInfoDay ap:wils)
 			{
-				Warning warning=null;
+				Warning2 warning=null;
 				if(InitialRunner.warningmap.containsKey(ap.getWarningid()))
 				{
 					warning=InitialRunner.warningmap.get(ap.getWarningid());
@@ -434,7 +434,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 				List<WarningInfoDay> ls=entry.getValue();
 
-				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
 
 				SawVo item = new SawVo();
 				item.setNum(i++);
@@ -542,7 +542,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 				List<WarningInfoDay> ls=entry.getValue();
 
-				Warning warning= InitialRunner.warningmap.get(entry.getKey());
+				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
 
 				SawVo item = new SawVo();
 				item.setNum(i++);

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WarningRecordsService.java

@@ -135,7 +135,7 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 			{
 				if(StringUtils.notEmp(wr.getWarningid()) && InitialRunner.warningmap.containsKey(wr.getWarningid()))
 				{
-					Warning warning2=InitialRunner.warningmap.get(wr.getWarningid());
+					Warning2 warning2=InitialRunner.warningmap.get(wr.getWarningid());
 					wr.setWarnDesc(warning2.getChinesetext());
 				}
 			}
@@ -192,13 +192,13 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 
 				List<WarningRecords> ls=entry.getValue();
 
-				Warning warning= InitialRunner.warningmap.get(entry.getKey());
-				if(null == warning){
+				Warning2 warning2= InitialRunner.warningmap.get(entry.getKey());
+				if(null == warning2){
 					continue;
 				}
 				SawVo item = new SawVo();
 				item.setNum(i++);
-				item.setName(warning.getChinesetext());
+				item.setName(warning2.getChinesetext());
 				item.setFrequency(ls.size());
 
 				templist.add(item);

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WarningService.java

@@ -2,9 +2,9 @@ package com.gyee.frame.service;
 
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.Convert;
-import com.gyee.frame.mapper.auto.WarningMapper;
-import com.gyee.frame.model.auto.Warning;
-import com.gyee.frame.model.auto.WarningExample;
+import com.gyee.frame.mapper.auto.Warning2Mapper;
+import com.gyee.frame.model.auto.Warning2;
+import com.gyee.frame.model.auto.Warning2Example;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import org.springframework.stereotype.Service;
 
@@ -13,34 +13,34 @@ import java.util.List;
 
 
 @Service
-public class WarningService implements BaseService<Warning, WarningExample> {
+public class WarningService implements BaseService<Warning2, Warning2Example> {
 	@Resource
-	private WarningMapper warningMapper;
+	private Warning2Mapper warning2Mapper;
 	
 
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			WarningExample example=new WarningExample();
+			Warning2Example example=new Warning2Example();
 			example.createCriteria().andIdIn(lista);
-			return warningMapper.deleteByExample(example);
+			return warning2Mapper.deleteByExample(example);
 			
 				
 	}
 	
 	
 	@Override
-	public Warning selectByPrimaryKey(String id) {
+	public Warning2 selectByPrimaryKey(String id) {
 				
-			return warningMapper.selectByPrimaryKey(id);
+			return warning2Mapper.selectByPrimaryKey(id);
 				
 	}
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(Warning record) {
-		return warningMapper.updateByPrimaryKeySelective(record);
+	public int updateByPrimaryKeySelective(Warning2 record) {
+		return warning2Mapper.updateByPrimaryKeySelective(record);
 	}
 	
 	
@@ -48,47 +48,47 @@ public class WarningService implements BaseService<Warning, WarningExample> {
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(Warning record) {
+	public int insertSelective(Warning2 record) {
 				
 		//添加雪花主键id
 		record.setId(SnowflakeIdWorker.getUUID());
 			
 				
-		return warningMapper.insertSelective(record);
+		return warning2Mapper.insertSelective(record);
 	}
 	
 	
 	@Override
-	public int updateByExampleSelective(Warning record, WarningExample example) {
+	public int updateByExampleSelective(Warning2 record, Warning2Example example) {
 		
-		return warningMapper.updateByExampleSelective(record, example);
+		return warning2Mapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(Warning record, WarningExample example) {
+	public int updateByExample(Warning2 record, Warning2Example example) {
 		
-		return warningMapper.updateByExample(record, example);
+		return warning2Mapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<Warning> selectByExample(WarningExample example) {
+	public List<Warning2> selectByExample(Warning2Example example) {
 		
-		return warningMapper.selectByExample(example);
+		return warning2Mapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(WarningExample example) {
+	public long countByExample(Warning2Example example) {
 		
-		return warningMapper.countByExample(example);
+		return warning2Mapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(WarningExample example) {
+	public int deleteByExample(Warning2Example example) {
 		
-		return warningMapper.deleteByExample(example);
+		return warning2Mapper.deleteByExample(example);
 	}
 	
 

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

@@ -42,9 +42,7 @@ public class AgcService {
         Map<String, Object> linemap=getAgcLine();
 
         for (Windpowerstation wp : InitialRunner.wpallls) {
-            if (wp.getId().equals("MCH_GDC")) {
-                continue;
-            }
+
 
             Map<String, Object> map=new HashMap<>();
 
@@ -59,36 +57,36 @@ public class AgcService {
             }
 
             vos.add(map);
-            if(wp.getId().equals("QS_FDC"))
-            {
-
-                Map<String, Object> tempmap=new HashMap<>();
-                if(objmap.containsKey("QS_FDC02"))
-                {
-                    tempmap.put("jcxx",objmap.get("QS_FDC02"));
-                }
-
-                if(linemap.containsKey("QS_FDC02"))
-                {
-                    tempmap.put("tb",linemap.get("QS_FDC02"));
-                }
-
-                vos.add(tempmap);
-            }else if(wp.getId().equals("SBQ_FDC"))
-            {
-                Map<String, Object> tempmap=new HashMap<>();
-                if(objmap.containsKey("SBQ_FDC02"))
-                {
-                    tempmap.put("jcxx",objmap.get("SBQ_FDC02"));
-                }
-
-                if(linemap.containsKey("SBQ_FDC02"))
-                {
-                    tempmap.put("tb",linemap.get("SBQ_FDC02"));
-                }
-
-                vos.add(tempmap);
-            }
+//            if(wp.getId().equals("QS_FDC"))
+//            {
+//
+//                Map<String, Object> tempmap=new HashMap<>();
+//                if(objmap.containsKey("QS_FDC02"))
+//                {
+//                    tempmap.put("jcxx",objmap.get("QS_FDC02"));
+//                }
+//
+//                if(linemap.containsKey("QS_FDC02"))
+//                {
+//                    tempmap.put("tb",linemap.get("QS_FDC02"));
+//                }
+//
+//                vos.add(tempmap);
+//            }else if(wp.getId().equals("SBQ_FDC"))
+//            {
+//                Map<String, Object> tempmap=new HashMap<>();
+//                if(objmap.containsKey("SBQ_FDC02"))
+//                {
+//                    tempmap.put("jcxx",objmap.get("SBQ_FDC02"));
+//                }
+//
+//                if(linemap.containsKey("SBQ_FDC02"))
+//                {
+//                    tempmap.put("tb",linemap.get("SBQ_FDC02"));
+//                }
+//
+//                vos.add(tempmap);
+//            }
 
         }
         return vos;
@@ -105,9 +103,7 @@ public class AgcService {
 
         List<Windpowerstation> wpList = InitialRunner.wpallls;
         for (Windpowerstation wp : wpList) {
-            if (wp.getId().equals("MCH_GDC")) {
-                continue;
-            }
+
             Map<String, Object> resultmap = new HashMap<String, Object>();
             String[] agcPoints = Constant.TPOINT_WP_AGC;
 
@@ -124,44 +120,18 @@ public class AgcService {
                             if (data != null) {
 
                                 if(i==0) {
-                                    if (wp.getId().equals("MHS_FDC") || wp.getId().equals("NSS_FDC") || wp.getId().equals("XS_FDC")){
-                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP).doubleValue();
-                                        resultmap.put( agcPoints[i],llgl);
-                                    }else{
-                                        resultmap.put( agcPoints[i],
-                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                    }
+                                    resultmap.put( agcPoints[i],
+                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
                                 }else if(i==2){
-                                    if (wp.getId().equals("SBQ_FDC")){
-                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP).doubleValue();
-                                        resultmap.put( agcPoints[i],llgl);
-                                    }else{
-                                        resultmap.put( agcPoints[i],
-                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                    }
+                                    resultmap.put( agcPoints[i],
+                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
                                 }else if(i==4){
-                                    if (wp.getId().equals("MHS_FDC")){
-                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(10), 2, RoundingMode.HALF_UP).doubleValue();
-                                        resultmap.put( agcPoints[i],llgl);
-                                    }else if(wp.getId().equals("NSS_FDC")){
-                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).doubleValue();
-                                        resultmap.put( agcPoints[i],llgl);
-                                    }else{
-                                        resultmap.put( agcPoints[i],
-                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                    }
+                                    resultmap.put( agcPoints[i],
+                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
                                 }
                                 else if(i==5){
-                                    if (wp.getId().equals("MHS_FDC")){
-                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).doubleValue();
-                                        resultmap.put( agcPoints[i],llgl);
-                                    }else if(wp.getId().equals("NSS_FDC")){
-                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(10), 2, RoundingMode.HALF_UP).doubleValue();
-                                        resultmap.put( agcPoints[i],llgl);
-                                    }else{
-                                        resultmap.put( agcPoints[i],
-                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
-                                    }
+                                    resultmap.put( agcPoints[i],
+                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
                                 }
                                 else {
                                     resultmap.put( agcPoints[i],
@@ -212,117 +182,7 @@ public class AgcService {
             }
 
             objmap.put(wp.getId(),resultmap);
-            if (wp.getId().equals("SBQ_FDC")){
-
-                Map<String, Object> tempmap = new HashMap<String, Object>();
-                /*牛五*/
-                double nwllgl = ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P2_XXX_XXX_CI0192").getPointValueInDouble()
-                        +ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P3_XXX_XXX_CI0192").getPointValueInDouble()
-                        +ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P4_XXX_XXX_CI0192").getPointValueInDouble();
-                double nwcxgl = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0817").getPointValueInDouble();
-                double nwxdzl = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0818").getPointValueInDouble();
-                double nwygsx = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0819").getPointValueInDouble();
-                double nwygxx = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0820").getPointValueInDouble();
-                double nwyf =  ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3832").getPointValueInDouble();
-                double nwtt =  ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3831").getPointValueInDouble();
-                double nwjbs =ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3834").getPointValueInDouble();
-                double nwzbs = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3833").getPointValueInDouble();
-                double nwzzttzt = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2253").getPointValueInDouble();
-                double xlllgl = ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P1_XXX_XXX_CI0192").getPointValueInDouble();
-
-                double sjgl = ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P4_XXX_XXX_CI0134").getPointValueInDouble();
-                Map<String, Object> tempmap2=(Map<String, Object>)objmap.get(wp.getId());
-                tempmap2.put("ZZSGL", MathUtil.decimal(xlllgl/1000,2));
-
-                tempmap.put("SSZGL", MathUtil.decimal(sjgl,2));
-                tempmap.put("ZZSGL", MathUtil.decimal(nwllgl/1000,2));
-                tempmap.put("AGC001", MathUtil.decimal(nwcxgl,2));
-                tempmap.put("AGC002", MathUtil.decimal(nwxdzl,2));
-                tempmap.put("AGC003", MathUtil.decimal(nwygsx,2));
-                tempmap.put("AGC004", MathUtil.decimal(nwygxx,2));
-                tempmap.put("AGC005", MathUtil.decimal(nwyf,2));
-                tempmap.put("AGC006", MathUtil.decimal(nwtt,2));
-                tempmap.put("AGC007", MathUtil.decimal(nwjbs,2));
-                tempmap.put("AGC008", MathUtil.decimal(nwzbs,2));
-                tempmap.put("AVC005", MathUtil.decimal(nwzzttzt,2));
-
-                tempmap.put("ycgl",0.0);
-                tempmap.put("name",wp.getName());
-                tempmap.put("ddmc","牛首山第五风电场");
-
-                data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2("SBQ04_GC", Constant.FJZT));
-                zt=data.getPointValueInDouble();
-                if(zt==5)
-                {
-                    tempmap.put("zt",0);
-                }else
-                {
-                    tempmap.put("zt",1);
-                }
-                objmap.put("SBQ_FDC02",tempmap);
-            }else if(wp.getId().equals("QS_FDC")){
-                /*宋六*/
-                Map<String, Object> tempmap = new HashMap<String, Object>();
-                double slllgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0192").getPointValueInDouble();
-                double slcxgl = ednaApiUtil.getRealData("SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013").getPointValueInDouble()/1000;
-                double slxdzl = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0052").getPointValueInDouble();
-                double slygsx = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0053").getPointValueInDouble();
-                double slygxx = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0054").getPointValueInDouble();
-                double slyf =  ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0143").getPointValueInDouble();
-                double sltt =  ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0142").getPointValueInDouble();
-                double sljbs =ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0163").getPointValueInDouble();
-                double slzbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0162").getPointValueInDouble();
-
-//                double mxdysj = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0025").getPointValueInDouble();
-//                double mxdytk = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0026").getPointValueInDouble();
-//                double mxkjwg = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0022").getPointValueInDouble();
-                double qsllgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P1_XXX_XXX_CI0192").getPointValueInDouble()
-                        + ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P2_XXX_XXX_CI0192").getPointValueInDouble();
-//                double mxkzwg = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0021").getPointValueInDouble();
-//                double zztt = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0170").getPointValueInDouble();
-//                double zzyx = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0171") .getPointValueInDouble();
-//                double jwgbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0133").getPointValueInDouble();
-//                double zwgbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0114").getPointValueInDouble();
-
-                Map<String, Object> tempmap2=(Map<String, Object>)objmap.get(wp.getId());
-                tempmap2.put("ZZSGL", MathUtil.decimal(qsllgl / 1000, 2));
-
-                double sjgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0134").getPointValueInDouble();
-                tempmap.put("SSZGL", MathUtil.decimal(sjgl,2));
-
-                tempmap.put("ZZSGL", MathUtil.decimal(slllgl/1000, 2));
-                tempmap.put("AGC001", MathUtil.decimal(slcxgl, 2));
-                tempmap.put("AGC002", MathUtil.decimal(slxdzl, 2));
-                tempmap.put("AGC003", MathUtil.decimal(slygsx, 2));
-                tempmap.put("AGC004", MathUtil.decimal(slygxx, 2));
-                tempmap.put("AGC005", MathUtil.decimal(slyf, 2));
-                tempmap.put("AGC006", MathUtil.decimal(sltt, 2));
-                tempmap.put("AGC007", MathUtil.decimal(sljbs, 2));
-                tempmap.put("AGC008", MathUtil.decimal(slzbs, 2));
-
-//                tempmap.put("QS_FDC02_AVC001", MathUtil.decimal(mxdysj, 2));
-//                tempmap.put("QS_FDC02_AVC002", MathUtil.decimal(mxdytk, 2));
-//                tempmap.put("QS_FDC02_AVC003", MathUtil.decimal(mxkjwg, 2));
-//                tempmap.put("QS_FDC02_AVC004", MathUtil.decimal(mxkzwg, 2));
-//                tempmap.put("QS_FDC02_AVC005", MathUtil.decimal(zztt, 2));
-//                tempmap.put("QS_FDC02_AVC006", MathUtil.decimal(zzyx, 2));
-//                tempmap.put("QS_FDC02_AVC007", MathUtil.decimal(jwgbs, 2));
-//                tempmap.put("QS_FDC02_AVC008", MathUtil.decimal(zwgbs, 2));
-                tempmap.put("ycgl",0.0);
-                tempmap.put("name",wp.getName());
-                tempmap.put("ddmc","宋堡第六风电场");
-                data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2("QS03_GC", Constant.FJZT));
-                zt=data.getPointValueInDouble();
-                if(zt==5)
-                {
-                    tempmap.put("zt",0);
-                }else
-                {
-                    tempmap.put("zt",1);
-                }
-                objmap.put("QS_FDC02",tempmap);
 
-            }
         }
         return objmap;
     }
@@ -383,17 +243,7 @@ public class AgcService {
                             temp1 = sjglls.get(i).getPointValueInDouble();
                             temp1 = new BigDecimal(temp1).divide(new BigDecimal(1), 4, RoundingMode.HALF_EVEN)
                                     .doubleValue();
-                            if ("MHS_FDC".equals(wp.getId())) {
-                                vos.get(i).setSjgl(
-                                        StringUtils.round(temp1, 2));
-                            }else if("SBQ_FDC".equals(wp.getId())){
-                                vos.get(i).setSjgl(StringUtils.round(temp1/1000, 2));
-                            } else if ("DWK_GDC".equals(wp.getId())) {
-                                vos.get(i).setSjgl(
-                                        StringUtils.round(temp1 / 100, 2));
-                            }else{
-                                vos.get(i).setSjgl(StringUtils.round(temp1, 2));// 实际功率
-                            }
+                            vos.get(i).setSjgl(StringUtils.round(temp1, 2));// 实际功率
                         } else {
                             vos.get(i).setSjgl(0d);// 实际功率
                         }
@@ -405,23 +255,8 @@ public class AgcService {
             WindPowerStationTestingPoint llgl = map.get(Constant.TPOINT_WP_ZZSGL);
             if (null != llgl) {
                 List<PointData> llglls;
-                if (wp.getId().equals("SBQ_FDC")) {
-                    llglls= ednaApiUtil.getHistoryDatasSnap("SBQFCJSFW.NX_GD_SBQF_FJ_P1_XXX_XXX_CI0192", beginDate.getTime() / 1000,
-                            endDate.getTime() / 1000, (long) length, 1800L);
-                } else if (wp.getId().equals("QS_FDC")) {
-                    llglls = ednaApiUtil.getHistoryDatasSnap(
-                            "QSFCJSFW.NX_GD_QSF_FJ_P1_XXX_XXX_CI0192",
-                            beginDate.getTime() / 1000,
-                            endDate.getTime() / 1000, (long) length, 1800L);
-                    llglls = ednaApiUtil.getHistoryDatasSnap(
-                            "QSFCJSFW.NX_GD_QSF_FJ_P2_XXX_XXX_CI0192",
-                            beginDate.getTime() / 1000,
-                            endDate.getTime() / 1000, (long) length, 1800L);
-
-                } else {
-                    llglls= ednaApiUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000,
-                            endDate.getTime() / 1000, (long) length, 1800L);
-                }
+                llglls= ednaApiUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000,
+                        endDate.getTime() / 1000, (long) length, 1800L);
                 int count = 0;
                 double temp1 = 0;
                 for (int i = 0; i < vos.size(); i++) {
@@ -448,13 +283,8 @@ public class AgcService {
                     if (i < xdglls.size() && StringUtils.notEmp(xdglls.get(i).getPointTime())) {
 
                         if (vos.get(i).getTime() <= new Date().getTime()) {
-                            if (wp.getId().equals("SBQ_FDC")){
-                                temp1 = xdglls.get(i).getPointValueInDouble()/1000;
-                                vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
-                            }else {
-                                temp1 = xdglls.get(i).getPointValueInDouble();
-                                vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
-                            }
+                            temp1 = xdglls.get(i).getPointValueInDouble();
+                            vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
 
                         } else {
                             vos.get(i).setXdzl(0d);// 限电功率
@@ -463,50 +293,9 @@ public class AgcService {
                 }
 
             }
-            if (wp.getId().equals("SBQ_FDC")) {
-                if (map.containsKey(ycPointsSB[0])) {
-                    if ("CL_FDC".equals(wp.getId())) {
 
-                    } else {
-                        WindPowerStationTestingPoint ycgl1 = map.get(ycPoints[0]);
-                        if (num > 0) {
-                            List<PointData> datas = new ArrayList<PointData>();
-                            datas = ednaApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000,
-                                    endDate.getTime() / 1000, num, 1800L);
-                            for (int j = 0; j < datas.size(); j++) {
-                                vos.get(j).setYcgl(StringUtils.round(datas.get(j).getPointValueInDouble(), 2));
-                            }
-                            int subresult = 0;
-                            int total = 0;
-                            if (length > datas.size()) {
-                                subresult = length - datas.size();
-                                if (subresult >= 8) {
-                                    subresult = 8;
-                                }
-                                for (int i = 0; i < subresult; i++) {
-                                    WindPowerStationTestingPoint ycgl = map.get(ycPoints2SB[i]);
-                                    double value = 0.0;
-                                    value = ednaApiUtil.getRealData(ycgl).getPointValueInDouble();
-                                    vos.get(datas.size() + i).setYcgl(StringUtils.round(value, 2));
-                                }
-                                total = datas.size() + subresult;
-                                subresult = length - (total);
-                                if (subresult > 0) {
-                                    for (int i = 0; i < subresult; i++) {
-                                        cal.add(Calendar.MINUTE, 30);
-                                        vos.get(total + i).setYcgl(null);
-                                    }
-                                }
-
-                            }
-                        }
-                    } // else结束
-                }
-            }else{
                 if (map.containsKey(ycPoints[0])) {
-                    if ("CL_FDC".equals(wp.getId())) {
 
-                    } else {
                         WindPowerStationTestingPoint ycgl1 = map.get(ycPoints[0]);
                         if (num > 0) {
                             List<PointData> datas = new ArrayList<PointData>();
@@ -554,215 +343,12 @@ public class AgcService {
 
                             }
                         }
-                    } // else结束
-                }
-            }
-
+                    }
 
             resultmap.put(wp.getId(), vos);
         }
 
-        // 牛五
-        Calendar cal2 = Calendar.getInstance();
-        cal2.setTime(beginDate);
-        List<AgcVo> vos = new ArrayList<>();
-        for (int i = 0; i < length; i++) {
-            AgcVo vo = new AgcVo();
-//            vo.setValue1(0.0);
-//            vo.setValue2(0.0);
-//            vo.setValue3(0.0);
-            vo.setTime(cal2.getTime().getTime());
-            cal2.add(Calendar.MINUTE, 30);
-            vos.add(vo);
-        }
-        List<PointData> nwsjglls = ednaApiUtil.getHistoryDatasSnap("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0817",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
-        double temp1 = 0;
-        for (int i = 0; i < vos.size(); i++) {
-            if (i < nwsjglls.size() && StringUtils.notEmp(nwsjglls.get(i).getPointTime())) {
-                if (vos.get(i).getTime() <= new Date().getTime()) {
-                    temp1 = nwsjglls.get(i).getPointValueInDouble();
-                    temp1 = new BigDecimal(temp1).divide(new BigDecimal(1), 4, RoundingMode.HALF_EVEN).doubleValue();
-
-                    vos.get(i).setSjgl(StringUtils.round(temp1, 2));// 实际功率
-                } else {
-                    vos.get(i).setSjgl(0d);// 实际功率
-                }
-            }
-
-        }
-
-        List<PointData> nwllglly = ednaApiUtil.getHistoryDatasSnap("SBQFCJSFW.NX_GD_SBQF_FJ_P2_XXX_XXX_CI0192",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
-        List<PointData> nwllglle = ednaApiUtil.getHistoryDatasSnap("SBQFCJSFW.NX_GD_SBQF_FJ_P3_XXX_XXX_CI0192",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
-        List<PointData> nwllglls = ednaApiUtil.getHistoryDatasSnap("SBQFCJSFW.NX_GD_SBQF_FJ_P4_XXX_XXX_CI0192",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
-
-        for (int i = 0; i < vos.size(); i++) {
-
-            if (i < nwllglls.size() && StringUtils.notEmp(nwllglls.get(i).getPointTime())) {
-
-                if (vos.get(i).getTime() <= new Date().getTime()) {
-                    temp1 = (nwllglly.get(i).getPointValueInDouble()+nwllglle.get(i).getPointValueInDouble()+nwllglls.get(i).getPointValueInDouble()) / 1000;
-                    vos.get(i).setLlgl(StringUtils.round(temp1, 2));// 理论功率
-                } else {
-                    vos.get(i).setLlgl(0d);// 理论功率
-                }
-            }
-        }
-
-        List<PointData> nwxdglls = ednaApiUtil.getHistoryDatasSnap("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0818",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 1800L);
-        for (int i = 0; i < vos.size(); i++) {
-
-            if (i < nwxdglls.size() && StringUtils.notEmp(nwxdglls.get(i).getPointTime())) {
-
-                if (vos.get(i).getTime() <= new Date().getTime()) {
-                    temp1 = nwxdglls.get(i).getPointValueInDouble();
-                    vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
-                } else {
-                    vos.get(i).setXdzl(0d);// 限电功率
-                }
-            }
-        }
-
-        List<PointData> datas = new ArrayList<PointData>();
-        datas = ednaApiUtil.getHistoryDatasSnap("SBQFGL.NX_GD_SBQF_YC_P1_L1_002_DQ0001", beginDate.getTime() / 1000,
-                endDate.getTime() / 1000, num, 1800L);
-        for (int j = 0; j < datas.size(); j++) {
-            vos.get(j).setYcgl(StringUtils.round(datas.get(j).getPointValueInDouble(), 2));
-        }
-        int subresult = 0;
-        int total = 0;
-        if (length > datas.size()) {
-            subresult = length - datas.size();
-            if (subresult >= 8) {
-                subresult = 8;
-            }
-            for (int i = 0; i < subresult; i++) {
-
-                double value = 0.0;
-                value = ednaApiUtil.getRealData("SBQFGL.NX_GD_SBQF_YC_P1_L1_002_DQ0001").getPointValueInDouble();
-                vos.get(datas.size() + i).setYcgl(StringUtils.round(value, 2));
-            }
-            total = datas.size() + subresult;
-            subresult = length - (total);
-            if (subresult > 0) {
-                for (int i = 0; i < subresult; i++) {
-                    cal.add(Calendar.MINUTE, 30);
-                    vos.get(total + i).setYcgl(null);
-                }
-            }
-
-        }
-        resultmap.put("SBQ_FDC02", vos);
-
-        // 宋六
-        Calendar cal3 = Calendar.getInstance();
-        cal3.setTime(beginDate);
-        List<AgcVo> slvos = new ArrayList<>();
-        for (int i = 0; i < length; i++) {
-            AgcVo vo = new AgcVo();
-//            vo.setValue1(0.0);
-//            vo.setValue2(0.0);
-//            vo.setValue3(0.0);
-            vo.setTime(cal3.getTime().getTime());
-            cal3.add(Calendar.MINUTE, 30);
-            slvos.add(vo);
-        }
-
-        List<PointData> slsjglls = ednaApiUtil.getHistoryDatasSnap(
-                "QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0134",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000,
-                (long) length, 1800L);
-        // double temp2 = 0;
-        for (int i = 0; i < slvos.size(); i++) {
-            if (i < slsjglls.size()
-                    && StringUtils.notEmp(slsjglls.get(i).getPointTime())) {
-                if (slvos.get(i).getTime() <= new Date().getTime()) {
-                    temp1 = slsjglls.get(i).getPointValueInDouble();
-                    temp1 = new BigDecimal(temp1).divide(new BigDecimal(1), 4,
-                            RoundingMode.HALF_EVEN).doubleValue();
-
-                    slvos.get(i).setSjgl(StringUtils.round(temp1, 2));// 实际功率
-                } else {
-                    slvos.get(i).setSjgl(0d);// 实际功率
-                }
-            }
-
-        }
-        List<PointData> slllglly = ednaApiUtil.getHistoryDatasSnap(
-                "QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0192",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000,
-                (long) length, 1800L);
 
-        for (int i = 0; i < slvos.size(); i++) {
-
-            if (i < slllglly.size()
-                    && StringUtils.notEmp(slllglly.get(i).getPointTime())) {
-
-                if (slvos.get(i).getTime() <= new Date().getTime()) {
-                    temp1 = slllglly.get(i).getPointValueInDouble() / 1000;
-                    slvos.get(i).setLlgl(StringUtils.round(temp1, 2));// 理论功率
-                } else {
-                    slvos.get(i).setLlgl(0d);// 理论功率
-                }
-            }
-        }
-        List<PointData> slxdglls = ednaApiUtil.getHistoryDatasSnap(
-                "SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0052",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000,
-                (long) length, 1800L);
-        for (int i = 0; i < slvos.size(); i++) {
-
-            if (i < slxdglls.size()
-                    && StringUtils.notEmp(slxdglls.get(i).getPointTime())) {
-
-                if (slvos.get(i).getTime() <= new Date().getTime()) {
-                    temp1 = slxdglls.get(i).getPointValueInDouble();
-                    slvos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
-                } else {
-                    slvos.get(i).setXdzl(0d);// 限电功率
-                }
-            }
-        }
-        List<PointData> datas1 = ednaApiUtil.getHistoryDatasSnap(
-                "SLFGL.NX_GD_QSF_YC_P1_L1_001_DQ0001",
-                beginDate.getTime() / 1000, endDate.getTime() / 1000, num,
-                1800L);
-        for (int j = 0; j < datas1.size(); j++) {
-            slvos.get(j)
-                    .setYcgl(
-                            StringUtils.round(datas1.get(j)
-                                    .getPointValueInDouble(), 2));
-        }
-        int subresult1 = 0;
-        int total1 = 0;
-        if (length > datas1.size()) {
-            subresult1 = length - datas1.size();
-            if (subresult1 >= 8) {
-                subresult1 = 8;
-            }
-            for (int i = 0; i < subresult1; i++) {
-
-                double value = 0.0;
-                value = ednaApiUtil.getRealData(
-                        "SLFGL.NX_GD_QSF_YC_P1_L1_001_DQ0001")
-                        .getPointValueInDouble();
-                slvos.get(datas1.size() + i).setYcgl(
-                        StringUtils.round(value, 2));
-            }
-            total1 = datas1.size() + subresult1;
-            subresult1 = length - (total1);
-            if (subresult1 > 0) {
-                for (int i = 0; i < subresult1; i++) {
-                    cal.add(Calendar.MINUTE, 30);
-                    slvos.get(total1 + i).setYcgl(null);
-                }
-            }
-        }
-        resultmap.put("QS_FDC02", slvos);
         return resultmap;
     }
 

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

@@ -930,7 +930,7 @@ public class WtInfoPushService {
 
             if(null !=warningRecords && null !=warningRecords.getWarningid() && InitialRunner.warningmap.containsKey(warningRecords.getWarningid()))
             {
-                Warning warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
+                Warning2 warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
                 gxkmap.put("bjmc", warning2.getChinesetext());
                 gxkmap.put("bjsj", DateUtils.formatDateTime(warningRecords.getWarningtime()));
             }

web/monitor-web-hb/src/main/java/com/gyee/frame/service/websocket/WtWarnPushService.java

@@ -2,7 +2,7 @@ package com.gyee.frame.service.websocket;
 
 
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.Warning;
+import com.gyee.frame.model.auto.Warning2;
 import com.gyee.frame.model.auto.WarningClassify;
 import com.gyee.frame.model.auto.WindTurbineTestingPointDi;
 import com.gyee.frame.model.auto.Windturbine;
@@ -47,15 +47,15 @@ public class WtWarnPushService {
 
                 Windturbine wt = InitialRunner.wtmap.get(id);
 
-                List<Warning> warnls=InitialRunner.warnmap.get(wt.getModelid());
+                List<Warning2> warnls=InitialRunner.warnmap.get(wt.getModelid());
 
                 if (!warnls.isEmpty()) {
 
                         if(!warnls.isEmpty())
                         {
                             List<String> unicodels = new ArrayList<>();
-                            Map<String, Warning> wmap=new HashMap<>();
-                            for(Warning wr :warnls)
+                            Map<String, Warning2> wmap=new HashMap<>();
+                            for(Warning2 wr :warnls)
                             {
                                 StringBuilder sb = new StringBuilder();
                                 sb.setLength(0);
@@ -87,7 +87,7 @@ public class WtWarnPushService {
                                         vo.setName(di.getName());
                                         if(wmap.containsKey(di.getUniformcode()))
                                         {
-                                            Warning wr=wmap.get(di.getUniformcode());
+                                            Warning2 wr=wmap.get(di.getUniformcode());
                                             vo.setTypeId(wr.getWarningclassifyid());
                                             vo.setName(wr.getChinesetext());
                                             vo.setValue(wr.getEnglishtext());

web/monitor-web-hb/src/main/java/com/gyee/frame/util/RealTimeDataBaseFactory.java

@@ -14,7 +14,7 @@ public class RealTimeDataBaseFactory {
 //        return new EdosUtil();
         switch (V2Config.getRealtimedataBase()) {
             case "mongodb":
-                return new MongoEdosUtil();
+                return new EdosUtil();
             case "golden":
                 return new EdosUtil();
             case "hwy":

web/monitor-web-hb/src/main/resources/application-dev.yml

@@ -13,6 +13,7 @@ spring:
 
         #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
         url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+        #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
         username: gdprod
         password: gd123
         driver-class-name: oracle.jdbc.driver.OracleDriver
@@ -25,10 +26,11 @@ spring:
         #两票数据源
       ticket:
         #url: jdbc:sqlserver://192.168.2.200:1433;DatabaseName=fdeam
-        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeamnew
+        #url: jdbc:sqlserver://10.83.68.98:1433;DatabaseName=fdeam
+        url: jdbc:sqlserver://10.0.118.71:1433;DatabaseName=fdeamnew
         username: sa
         #password: ibs
-        password: Gyee@321#!
+        password: Gd!123456
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
         #配置初始化连接数大小
       initial-size: 10

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

@@ -27,14 +27,18 @@ gyee:
   rollVerification: true
   #实时数据库Url
   baseurl: http://10.0.118.73:8011/ts
-  #baseurl: http://10.155.32.4:8011/ts
+  #baseurl: http://10.83.68.205:8011/ts
+  #baseurl: http://192.168.2.205:8011/ts
+
   #API访问ip
   #swaggerip: 49.4.50.80:8082
   swaggerip: 10.155.32.4:8082
   #默认小数位数
   digit: 2
-  realtimedataBase: mongodb #数据查询模式 golden、hwy
+  realtimedataBase: golden #数据查询模式 golden、hwy
   weatherurl: http://123.60.213.70:7011
+  #weatherurl: http://192.168.2.216:7011
+  #weatherurl: http://10.83.68.97:7011
   weatherqygs: nx_qygs
 #tomcat config
 server :
@@ -57,17 +61,18 @@ spring :
   profiles :
     active : dev
   application:
-    name: monitor-web-hb-provider
-    cloud:
-      nacos:
-        discovery:
-          server-addr: 192.168.56.1:8848
-          #server-addr: 192.168.2.216:8848
-          #指定yaml格式的配置
-          file-extension: yaml
-          cluster-name: master
-        username: nacos
-        password: nacos
+#    name: monitor-web-hb-provider
+#    cloud:
+#      nacos:
+#        discovery:
+#          server-addr: 192.168.56.1:8848
+#          #server-addr: 192.168.2.216:8848
+#          #server-addr: 10.83.68.97:8848
+#          #指定yaml格式的配置
+#          file-extension: yaml
+#          cluster-name: master
+#        username: nacos
+#        password: nacos
     #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
     #include: ftpHX,ftpCloud
   servlet:
@@ -106,6 +111,7 @@ spring :
   redis:
     database: 1
     #host: 192.168.2.202
+    #host: 10.83.68.97
     host: 10.0.118.73
     password:
     pool:

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

@@ -109,7 +109,7 @@
 <!--        <table tableName='StopAnalysis' domainObjectName='StopAnalysis'/>-->
 <!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
-        <table tableName='T_VUE_USER' domainObjectName='TvueUser'/>
+        <table tableName='WARNING2' domainObjectName='Warning2'/>
 
 
 

web/monitor-web-hb/src/main/resources/mybatis/auto/WarningMapper.xml

@@ -1,28 +1,31 @@
 <?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.WarningMapper">
-  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Warning">
+<mapper namespace="com.gyee.frame.mapper.auto.Warning2Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Warning2">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="levelId" jdbcType="VARCHAR" property="levelid" />
-    <result column="manufacturerCode" jdbcType="VARCHAR" property="manufacturercode" />
-    <result column="englishText" jdbcType="VARCHAR" property="englishtext" />
-    <result column="chineseText" jdbcType="VARCHAR" property="chinesetext" />
-    <result column="parentId" jdbcType="VARCHAR" property="parentid" />
-    <result column="isLeaf" jdbcType="SMALLINT" property="isleaf" />
-    <result column="sequenceNumber" jdbcType="INTEGER" property="sequencenumber" />
-    <result column="characteristic" jdbcType="VARCHAR" property="characteristic" />
-    <result column="modelId" jdbcType="VARCHAR" property="modelid" />
-    <result column="codeName" jdbcType="VARCHAR" property="codename" />
-    <result column="ednaValue" jdbcType="INTEGER" property="ednavalue" />
-    <result column="display" jdbcType="INTEGER" property="display" />
-    <result column="warningClassifyId" jdbcType="VARCHAR" property="warningclassifyid" />
-    <result column="isreset" jdbcType="DECIMAL" property="isreset" />
-    <result column="standardTime" jdbcType="DECIMAL" property="standardtime" />
-    <result column="warningtypeid" jdbcType="VARCHAR" property="warningtypeid" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="LEVELID" jdbcType="VARCHAR" property="levelid" />
+    <result column="MANUFACTURERCODE" jdbcType="VARCHAR" property="manufacturercode" />
+    <result column="ENGLISHTEXT" jdbcType="VARCHAR" property="englishtext" />
+    <result column="CHINESETEXT" jdbcType="VARCHAR" property="chinesetext" />
+    <result column="PARENTID" jdbcType="VARCHAR" property="parentid" />
+    <result column="ISLEAF" jdbcType="DECIMAL" property="isleaf" />
+    <result column="SEQUENCENUMBER" jdbcType="DECIMAL" property="sequencenumber" />
+    <result column="CHARACTERISTIC" jdbcType="VARCHAR" property="characteristic" />
+    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
+    <result column="CODENAME" jdbcType="VARCHAR" property="codename" />
+    <result column="EDNAVALUE" jdbcType="DECIMAL" property="ednavalue" />
+    <result column="DISPLAY" jdbcType="DECIMAL" property="display" />
+    <result column="WARNINGCLASSIFYID" jdbcType="VARCHAR" property="warningclassifyid" />
+    <result column="STANDARDTIME" jdbcType="DECIMAL" property="standardtime" />
+    <result column="ISRESET" jdbcType="DECIMAL" property="isreset" />
+    <result column="CLASSIFICATION" jdbcType="VARCHAR" property="classification" />
+    <result column="FAULTCODE" jdbcType="VARCHAR" property="faultcode" />
+    <result column="RELATEDPARTS" jdbcType="VARCHAR" property="relatedparts" />
+    <result column="WARNINGTYPEID" jdbcType="VARCHAR" property="warningtypeid" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -95,11 +98,11 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, levelId, manufacturerCode, englishText, chineseText, parentId, isLeaf, sequenceNumber, 
-    characteristic, modelId, codeName, ednaValue, display, warningClassifyId, isreset, 
-    standardTime, warningtypeid
+    ID, LEVELID, MANUFACTURERCODE, ENGLISHTEXT, CHINESETEXT, PARENTID, ISLEAF, SEQUENCENUMBER, 
+    CHARACTERISTIC, MODELID, CODENAME, EDNAVALUE, DISPLAY, WARNINGCLASSIFYID, STANDARDTIME, 
+    ISRESET, CLASSIFICATION, FAULTCODE, RELATEDPARTS, WARNINGTYPEID
   </sql>
-  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WarningExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Warning2Example" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -109,7 +112,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from warning2
+    from WARNING2
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -124,102 +127,113 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from warning2
-    where id = #{id,jdbcType=VARCHAR}
+    from WARNING2
+    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 warning2
-    where id = #{id,jdbcType=VARCHAR}
+    delete from WARNING2
+    where ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WarningExample">
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Warning2Example">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from warning2
+    delete from WARNING2
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.gyee.frame.model.auto.Warning">
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Warning2">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into warning2 (id, levelId, manufacturerCode, 
-      englishText, chineseText, parentId, 
-      isLeaf, sequenceNumber, characteristic, 
-      modelId, codeName, ednaValue, 
-      display, warningClassifyId, isreset, 
-      standardTime, warningtypeid)
+    insert into WARNING2 (ID, LEVELID, MANUFACTURERCODE, 
+      ENGLISHTEXT, CHINESETEXT, PARENTID, 
+      ISLEAF, SEQUENCENUMBER, CHARACTERISTIC, 
+      MODELID, CODENAME, EDNAVALUE, 
+      DISPLAY, WARNINGCLASSIFYID, STANDARDTIME, 
+      ISRESET, CLASSIFICATION, FAULTCODE, 
+      RELATEDPARTS, WARNINGTYPEID)
     values (#{id,jdbcType=VARCHAR}, #{levelid,jdbcType=VARCHAR}, #{manufacturercode,jdbcType=VARCHAR}, 
       #{englishtext,jdbcType=VARCHAR}, #{chinesetext,jdbcType=VARCHAR}, #{parentid,jdbcType=VARCHAR}, 
-      #{isleaf,jdbcType=SMALLINT}, #{sequencenumber,jdbcType=INTEGER}, #{characteristic,jdbcType=VARCHAR}, 
-      #{modelid,jdbcType=VARCHAR}, #{codename,jdbcType=VARCHAR}, #{ednavalue,jdbcType=INTEGER}, 
-      #{display,jdbcType=INTEGER}, #{warningclassifyid,jdbcType=VARCHAR}, #{isreset,jdbcType=DECIMAL}, 
-      #{standardtime,jdbcType=DECIMAL}, #{warningtypeid,jdbcType=VARCHAR})
+      #{isleaf,jdbcType=DECIMAL}, #{sequencenumber,jdbcType=DECIMAL}, #{characteristic,jdbcType=VARCHAR}, 
+      #{modelid,jdbcType=VARCHAR}, #{codename,jdbcType=VARCHAR}, #{ednavalue,jdbcType=DECIMAL}, 
+      #{display,jdbcType=DECIMAL}, #{warningclassifyid,jdbcType=VARCHAR}, #{standardtime,jdbcType=DECIMAL}, 
+      #{isreset,jdbcType=DECIMAL}, #{classification,jdbcType=VARCHAR}, #{faultcode,jdbcType=VARCHAR}, 
+      #{relatedparts,jdbcType=VARCHAR}, #{warningtypeid,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Warning">
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Warning2">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into warning2
+    insert into WARNING2
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
-        id,
+        ID,
       </if>
       <if test="levelid != null">
-        levelId,
+        LEVELID,
       </if>
       <if test="manufacturercode != null">
-        manufacturerCode,
+        MANUFACTURERCODE,
       </if>
       <if test="englishtext != null">
-        englishText,
+        ENGLISHTEXT,
       </if>
       <if test="chinesetext != null">
-        chineseText,
+        CHINESETEXT,
       </if>
       <if test="parentid != null">
-        parentId,
+        PARENTID,
       </if>
       <if test="isleaf != null">
-        isLeaf,
+        ISLEAF,
       </if>
       <if test="sequencenumber != null">
-        sequenceNumber,
+        SEQUENCENUMBER,
       </if>
       <if test="characteristic != null">
-        characteristic,
+        CHARACTERISTIC,
       </if>
       <if test="modelid != null">
-        modelId,
+        MODELID,
       </if>
       <if test="codename != null">
-        codeName,
+        CODENAME,
       </if>
       <if test="ednavalue != null">
-        ednaValue,
+        EDNAVALUE,
       </if>
       <if test="display != null">
-        display,
+        DISPLAY,
       </if>
       <if test="warningclassifyid != null">
-        warningClassifyId,
+        WARNINGCLASSIFYID,
+      </if>
+      <if test="standardtime != null">
+        STANDARDTIME,
       </if>
       <if test="isreset != null">
-        isreset,
+        ISRESET,
       </if>
-      <if test="standardtime != null">
-        standardTime,
+      <if test="classification != null">
+        CLASSIFICATION,
+      </if>
+      <if test="faultcode != null">
+        FAULTCODE,
+      </if>
+      <if test="relatedparts != null">
+        RELATEDPARTS,
       </if>
       <if test="warningtypeid != null">
-        warningtypeid,
+        WARNINGTYPEID,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -242,10 +256,10 @@
         #{parentid,jdbcType=VARCHAR},
       </if>
       <if test="isleaf != null">
-        #{isleaf,jdbcType=SMALLINT},
+        #{isleaf,jdbcType=DECIMAL},
       </if>
       <if test="sequencenumber != null">
-        #{sequencenumber,jdbcType=INTEGER},
+        #{sequencenumber,jdbcType=DECIMAL},
       </if>
       <if test="characteristic != null">
         #{characteristic,jdbcType=VARCHAR},
@@ -257,31 +271,40 @@
         #{codename,jdbcType=VARCHAR},
       </if>
       <if test="ednavalue != null">
-        #{ednavalue,jdbcType=INTEGER},
+        #{ednavalue,jdbcType=DECIMAL},
       </if>
       <if test="display != null">
-        #{display,jdbcType=INTEGER},
+        #{display,jdbcType=DECIMAL},
       </if>
       <if test="warningclassifyid != null">
         #{warningclassifyid,jdbcType=VARCHAR},
       </if>
+      <if test="standardtime != null">
+        #{standardtime,jdbcType=DECIMAL},
+      </if>
       <if test="isreset != null">
         #{isreset,jdbcType=DECIMAL},
       </if>
-      <if test="standardtime != null">
-        #{standardtime,jdbcType=DECIMAL},
+      <if test="classification != null">
+        #{classification,jdbcType=VARCHAR},
+      </if>
+      <if test="faultcode != null">
+        #{faultcode,jdbcType=VARCHAR},
+      </if>
+      <if test="relatedparts != null">
+        #{relatedparts,jdbcType=VARCHAR},
       </if>
       <if test="warningtypeid != null">
         #{warningtypeid,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WarningExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Warning2Example" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from warning2
+    select count(*) from WARNING2
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -291,58 +314,67 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning2
+    update WARNING2
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
+        ID = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.levelid != null">
-        levelId = #{record.levelid,jdbcType=VARCHAR},
+        LEVELID = #{record.levelid,jdbcType=VARCHAR},
       </if>
       <if test="record.manufacturercode != null">
-        manufacturerCode = #{record.manufacturercode,jdbcType=VARCHAR},
+        MANUFACTURERCODE = #{record.manufacturercode,jdbcType=VARCHAR},
       </if>
       <if test="record.englishtext != null">
-        englishText = #{record.englishtext,jdbcType=VARCHAR},
+        ENGLISHTEXT = #{record.englishtext,jdbcType=VARCHAR},
       </if>
       <if test="record.chinesetext != null">
-        chineseText = #{record.chinesetext,jdbcType=VARCHAR},
+        CHINESETEXT = #{record.chinesetext,jdbcType=VARCHAR},
       </if>
       <if test="record.parentid != null">
-        parentId = #{record.parentid,jdbcType=VARCHAR},
+        PARENTID = #{record.parentid,jdbcType=VARCHAR},
       </if>
       <if test="record.isleaf != null">
-        isLeaf = #{record.isleaf,jdbcType=SMALLINT},
+        ISLEAF = #{record.isleaf,jdbcType=DECIMAL},
       </if>
       <if test="record.sequencenumber != null">
-        sequenceNumber = #{record.sequencenumber,jdbcType=INTEGER},
+        SEQUENCENUMBER = #{record.sequencenumber,jdbcType=DECIMAL},
       </if>
       <if test="record.characteristic != null">
-        characteristic = #{record.characteristic,jdbcType=VARCHAR},
+        CHARACTERISTIC = #{record.characteristic,jdbcType=VARCHAR},
       </if>
       <if test="record.modelid != null">
-        modelId = #{record.modelid,jdbcType=VARCHAR},
+        MODELID = #{record.modelid,jdbcType=VARCHAR},
       </if>
       <if test="record.codename != null">
-        codeName = #{record.codename,jdbcType=VARCHAR},
+        CODENAME = #{record.codename,jdbcType=VARCHAR},
       </if>
       <if test="record.ednavalue != null">
-        ednaValue = #{record.ednavalue,jdbcType=INTEGER},
+        EDNAVALUE = #{record.ednavalue,jdbcType=DECIMAL},
       </if>
       <if test="record.display != null">
-        display = #{record.display,jdbcType=INTEGER},
+        DISPLAY = #{record.display,jdbcType=DECIMAL},
       </if>
       <if test="record.warningclassifyid != null">
-        warningClassifyId = #{record.warningclassifyid,jdbcType=VARCHAR},
+        WARNINGCLASSIFYID = #{record.warningclassifyid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.standardtime != null">
+        STANDARDTIME = #{record.standardtime,jdbcType=DECIMAL},
       </if>
       <if test="record.isreset != null">
-        isreset = #{record.isreset,jdbcType=DECIMAL},
+        ISRESET = #{record.isreset,jdbcType=DECIMAL},
       </if>
-      <if test="record.standardtime != null">
-        standardTime = #{record.standardtime,jdbcType=DECIMAL},
+      <if test="record.classification != null">
+        CLASSIFICATION = #{record.classification,jdbcType=VARCHAR},
+      </if>
+      <if test="record.faultcode != null">
+        FAULTCODE = #{record.faultcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.relatedparts != null">
+        RELATEDPARTS = #{record.relatedparts,jdbcType=VARCHAR},
       </if>
       <if test="record.warningtypeid != null">
-        warningtypeid = #{record.warningtypeid,jdbcType=VARCHAR},
+        WARNINGTYPEID = #{record.warningtypeid,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -354,108 +386,123 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning2
-    set id = #{record.id,jdbcType=VARCHAR},
-      levelId = #{record.levelid,jdbcType=VARCHAR},
-      manufacturerCode = #{record.manufacturercode,jdbcType=VARCHAR},
-      englishText = #{record.englishtext,jdbcType=VARCHAR},
-      chineseText = #{record.chinesetext,jdbcType=VARCHAR},
-      parentId = #{record.parentid,jdbcType=VARCHAR},
-      isLeaf = #{record.isleaf,jdbcType=SMALLINT},
-      sequenceNumber = #{record.sequencenumber,jdbcType=INTEGER},
-      characteristic = #{record.characteristic,jdbcType=VARCHAR},
-      modelId = #{record.modelid,jdbcType=VARCHAR},
-      codeName = #{record.codename,jdbcType=VARCHAR},
-      ednaValue = #{record.ednavalue,jdbcType=INTEGER},
-      display = #{record.display,jdbcType=INTEGER},
-      warningClassifyId = #{record.warningclassifyid,jdbcType=VARCHAR},
-      isreset = #{record.isreset,jdbcType=DECIMAL},
-      standardTime = #{record.standardtime,jdbcType=DECIMAL},
-      warningtypeid = #{record.warningtypeid,jdbcType=VARCHAR}
+    update WARNING2
+    set ID = #{record.id,jdbcType=VARCHAR},
+      LEVELID = #{record.levelid,jdbcType=VARCHAR},
+      MANUFACTURERCODE = #{record.manufacturercode,jdbcType=VARCHAR},
+      ENGLISHTEXT = #{record.englishtext,jdbcType=VARCHAR},
+      CHINESETEXT = #{record.chinesetext,jdbcType=VARCHAR},
+      PARENTID = #{record.parentid,jdbcType=VARCHAR},
+      ISLEAF = #{record.isleaf,jdbcType=DECIMAL},
+      SEQUENCENUMBER = #{record.sequencenumber,jdbcType=DECIMAL},
+      CHARACTERISTIC = #{record.characteristic,jdbcType=VARCHAR},
+      MODELID = #{record.modelid,jdbcType=VARCHAR},
+      CODENAME = #{record.codename,jdbcType=VARCHAR},
+      EDNAVALUE = #{record.ednavalue,jdbcType=DECIMAL},
+      DISPLAY = #{record.display,jdbcType=DECIMAL},
+      WARNINGCLASSIFYID = #{record.warningclassifyid,jdbcType=VARCHAR},
+      STANDARDTIME = #{record.standardtime,jdbcType=DECIMAL},
+      ISRESET = #{record.isreset,jdbcType=DECIMAL},
+      CLASSIFICATION = #{record.classification,jdbcType=VARCHAR},
+      FAULTCODE = #{record.faultcode,jdbcType=VARCHAR},
+      RELATEDPARTS = #{record.relatedparts,jdbcType=VARCHAR},
+      WARNINGTYPEID = #{record.warningtypeid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Warning">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Warning2">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning2
+    update WARNING2
     <set>
       <if test="levelid != null">
-        levelId = #{levelid,jdbcType=VARCHAR},
+        LEVELID = #{levelid,jdbcType=VARCHAR},
       </if>
       <if test="manufacturercode != null">
-        manufacturerCode = #{manufacturercode,jdbcType=VARCHAR},
+        MANUFACTURERCODE = #{manufacturercode,jdbcType=VARCHAR},
       </if>
       <if test="englishtext != null">
-        englishText = #{englishtext,jdbcType=VARCHAR},
+        ENGLISHTEXT = #{englishtext,jdbcType=VARCHAR},
       </if>
       <if test="chinesetext != null">
-        chineseText = #{chinesetext,jdbcType=VARCHAR},
+        CHINESETEXT = #{chinesetext,jdbcType=VARCHAR},
       </if>
       <if test="parentid != null">
-        parentId = #{parentid,jdbcType=VARCHAR},
+        PARENTID = #{parentid,jdbcType=VARCHAR},
       </if>
       <if test="isleaf != null">
-        isLeaf = #{isleaf,jdbcType=SMALLINT},
+        ISLEAF = #{isleaf,jdbcType=DECIMAL},
       </if>
       <if test="sequencenumber != null">
-        sequenceNumber = #{sequencenumber,jdbcType=INTEGER},
+        SEQUENCENUMBER = #{sequencenumber,jdbcType=DECIMAL},
       </if>
       <if test="characteristic != null">
-        characteristic = #{characteristic,jdbcType=VARCHAR},
+        CHARACTERISTIC = #{characteristic,jdbcType=VARCHAR},
       </if>
       <if test="modelid != null">
-        modelId = #{modelid,jdbcType=VARCHAR},
+        MODELID = #{modelid,jdbcType=VARCHAR},
       </if>
       <if test="codename != null">
-        codeName = #{codename,jdbcType=VARCHAR},
+        CODENAME = #{codename,jdbcType=VARCHAR},
       </if>
       <if test="ednavalue != null">
-        ednaValue = #{ednavalue,jdbcType=INTEGER},
+        EDNAVALUE = #{ednavalue,jdbcType=DECIMAL},
       </if>
       <if test="display != null">
-        display = #{display,jdbcType=INTEGER},
+        DISPLAY = #{display,jdbcType=DECIMAL},
       </if>
       <if test="warningclassifyid != null">
-        warningClassifyId = #{warningclassifyid,jdbcType=VARCHAR},
+        WARNINGCLASSIFYID = #{warningclassifyid,jdbcType=VARCHAR},
+      </if>
+      <if test="standardtime != null">
+        STANDARDTIME = #{standardtime,jdbcType=DECIMAL},
       </if>
       <if test="isreset != null">
-        isreset = #{isreset,jdbcType=DECIMAL},
+        ISRESET = #{isreset,jdbcType=DECIMAL},
       </if>
-      <if test="standardtime != null">
-        standardTime = #{standardtime,jdbcType=DECIMAL},
+      <if test="classification != null">
+        CLASSIFICATION = #{classification,jdbcType=VARCHAR},
+      </if>
+      <if test="faultcode != null">
+        FAULTCODE = #{faultcode,jdbcType=VARCHAR},
+      </if>
+      <if test="relatedparts != null">
+        RELATEDPARTS = #{relatedparts,jdbcType=VARCHAR},
       </if>
       <if test="warningtypeid != null">
-        warningtypeid = #{warningtypeid,jdbcType=VARCHAR},
+        WARNINGTYPEID = #{warningtypeid,jdbcType=VARCHAR},
       </if>
     </set>
-    where id = #{id,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Warning">
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Warning2">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update warning2
-    set levelId = #{levelid,jdbcType=VARCHAR},
-      manufacturerCode = #{manufacturercode,jdbcType=VARCHAR},
-      englishText = #{englishtext,jdbcType=VARCHAR},
-      chineseText = #{chinesetext,jdbcType=VARCHAR},
-      parentId = #{parentid,jdbcType=VARCHAR},
-      isLeaf = #{isleaf,jdbcType=SMALLINT},
-      sequenceNumber = #{sequencenumber,jdbcType=INTEGER},
-      characteristic = #{characteristic,jdbcType=VARCHAR},
-      modelId = #{modelid,jdbcType=VARCHAR},
-      codeName = #{codename,jdbcType=VARCHAR},
-      ednaValue = #{ednavalue,jdbcType=INTEGER},
-      display = #{display,jdbcType=INTEGER},
-      warningClassifyId = #{warningclassifyid,jdbcType=VARCHAR},
-      isreset = #{isreset,jdbcType=DECIMAL},
-      standardTime = #{standardtime,jdbcType=DECIMAL},
-      warningtypeid = #{warningtypeid,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
+    update WARNING2
+    set LEVELID = #{levelid,jdbcType=VARCHAR},
+      MANUFACTURERCODE = #{manufacturercode,jdbcType=VARCHAR},
+      ENGLISHTEXT = #{englishtext,jdbcType=VARCHAR},
+      CHINESETEXT = #{chinesetext,jdbcType=VARCHAR},
+      PARENTID = #{parentid,jdbcType=VARCHAR},
+      ISLEAF = #{isleaf,jdbcType=DECIMAL},
+      SEQUENCENUMBER = #{sequencenumber,jdbcType=DECIMAL},
+      CHARACTERISTIC = #{characteristic,jdbcType=VARCHAR},
+      MODELID = #{modelid,jdbcType=VARCHAR},
+      CODENAME = #{codename,jdbcType=VARCHAR},
+      EDNAVALUE = #{ednavalue,jdbcType=DECIMAL},
+      DISPLAY = #{display,jdbcType=DECIMAL},
+      WARNINGCLASSIFYID = #{warningclassifyid,jdbcType=VARCHAR},
+      STANDARDTIME = #{standardtime,jdbcType=DECIMAL},
+      ISRESET = #{isreset,jdbcType=DECIMAL},
+      CLASSIFICATION = #{classification,jdbcType=VARCHAR},
+      FAULTCODE = #{faultcode,jdbcType=VARCHAR},
+      RELATEDPARTS = #{relatedparts,jdbcType=VARCHAR},
+      WARNINGTYPEID = #{warningtypeid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>