后台管理修改

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

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

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

@@ -0,0 +1,310 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class WtTargetConfig implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.code
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.uniformCode
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.types
+     *
+     * @mbg.generated
+     */
+    private String types;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.modelId
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.unit
+     *
+     * @mbg.generated
+     */
+    private String unit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.rate
+     *
+     * @mbg.generated
+     */
+    private Double rate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column wttargetconfig.pointtype
+     *
+     * @mbg.generated
+     */
+    private String pointtype;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.id
+     *
+     * @return the value of wttargetconfig.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.id
+     *
+     * @param id the value for wttargetconfig.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.code
+     *
+     * @return the value of wttargetconfig.code
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.code
+     *
+     * @param code the value for wttargetconfig.code
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.name
+     *
+     * @return the value of wttargetconfig.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.name
+     *
+     * @param name the value for wttargetconfig.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.uniformCode
+     *
+     * @return the value of wttargetconfig.uniformCode
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.uniformCode
+     *
+     * @param uniformcode the value for wttargetconfig.uniformCode
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.types
+     *
+     * @return the value of wttargetconfig.types
+     *
+     * @mbg.generated
+     */
+    public String getTypes() {
+        return types;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.types
+     *
+     * @param types the value for wttargetconfig.types
+     *
+     * @mbg.generated
+     */
+    public void setTypes(String types) {
+        this.types = types == null ? null : types.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.modelId
+     *
+     * @return the value of wttargetconfig.modelId
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.modelId
+     *
+     * @param modelid the value for wttargetconfig.modelId
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.unit
+     *
+     * @return the value of wttargetconfig.unit
+     *
+     * @mbg.generated
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.unit
+     *
+     * @param unit the value for wttargetconfig.unit
+     *
+     * @mbg.generated
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.rate
+     *
+     * @return the value of wttargetconfig.rate
+     *
+     * @mbg.generated
+     */
+    public Double getRate() {
+        return rate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.rate
+     *
+     * @param rate the value for wttargetconfig.rate
+     *
+     * @mbg.generated
+     */
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column wttargetconfig.pointtype
+     *
+     * @return the value of wttargetconfig.pointtype
+     *
+     * @mbg.generated
+     */
+    public String getPointtype() {
+        return pointtype;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column wttargetconfig.pointtype
+     *
+     * @param pointtype the value for wttargetconfig.pointtype
+     *
+     * @mbg.generated
+     */
+    public void setPointtype(String pointtype) {
+        this.pointtype = pointtype == null ? null : pointtype.trim();
+    }
+}

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

@@ -0,0 +1,923 @@
+package com.gyee.frame.model.auto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WtTargetConfigExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public WtTargetConfigExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNull() {
+            addCriterion("uniformCode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNotNull() {
+            addCriterion("uniformCode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeEqualTo(String value) {
+            addCriterion("uniformCode =", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotEqualTo(String value) {
+            addCriterion("uniformCode <>", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThan(String value) {
+            addCriterion("uniformCode >", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("uniformCode >=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThan(String value) {
+            addCriterion("uniformCode <", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThanOrEqualTo(String value) {
+            addCriterion("uniformCode <=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLike(String value) {
+            addCriterion("uniformCode like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotLike(String value) {
+            addCriterion("uniformCode not like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIn(List<String> values) {
+            addCriterion("uniformCode in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotIn(List<String> values) {
+            addCriterion("uniformCode not in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeBetween(String value1, String value2) {
+            addCriterion("uniformCode between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotBetween(String value1, String value2) {
+            addCriterion("uniformCode not between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesIsNull() {
+            addCriterion("types is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesIsNotNull() {
+            addCriterion("types is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesEqualTo(String value) {
+            addCriterion("types =", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotEqualTo(String value) {
+            addCriterion("types <>", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesGreaterThan(String value) {
+            addCriterion("types >", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesGreaterThanOrEqualTo(String value) {
+            addCriterion("types >=", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesLessThan(String value) {
+            addCriterion("types <", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesLessThanOrEqualTo(String value) {
+            addCriterion("types <=", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesLike(String value) {
+            addCriterion("types like", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotLike(String value) {
+            addCriterion("types not like", value, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesIn(List<String> values) {
+            addCriterion("types in", values, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotIn(List<String> values) {
+            addCriterion("types not in", values, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesBetween(String value1, String value2) {
+            addCriterion("types between", value1, value2, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypesNotBetween(String value1, String value2) {
+            addCriterion("types not between", value1, value2, "types");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNull() {
+            addCriterion("modelId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNotNull() {
+            addCriterion("modelId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidEqualTo(String value) {
+            addCriterion("modelId =", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotEqualTo(String value) {
+            addCriterion("modelId <>", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThan(String value) {
+            addCriterion("modelId >", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThanOrEqualTo(String value) {
+            addCriterion("modelId >=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThan(String value) {
+            addCriterion("modelId <", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThanOrEqualTo(String value) {
+            addCriterion("modelId <=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLike(String value) {
+            addCriterion("modelId like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotLike(String value) {
+            addCriterion("modelId not like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIn(List<String> values) {
+            addCriterion("modelId in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotIn(List<String> values) {
+            addCriterion("modelId not in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidBetween(String value1, String value2) {
+            addCriterion("modelId between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotBetween(String value1, String value2) {
+            addCriterion("modelId not between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitIsNull() {
+            addCriterion("unit is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitIsNotNull() {
+            addCriterion("unit is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitEqualTo(String value) {
+            addCriterion("unit =", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotEqualTo(String value) {
+            addCriterion("unit <>", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitGreaterThan(String value) {
+            addCriterion("unit >", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitGreaterThanOrEqualTo(String value) {
+            addCriterion("unit >=", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitLessThan(String value) {
+            addCriterion("unit <", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitLessThanOrEqualTo(String value) {
+            addCriterion("unit <=", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitLike(String value) {
+            addCriterion("unit like", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotLike(String value) {
+            addCriterion("unit not like", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitIn(List<String> values) {
+            addCriterion("unit in", values, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotIn(List<String> values) {
+            addCriterion("unit not in", values, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitBetween(String value1, String value2) {
+            addCriterion("unit between", value1, value2, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotBetween(String value1, String value2) {
+            addCriterion("unit not between", value1, value2, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateIsNull() {
+            addCriterion("rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateIsNotNull() {
+            addCriterion("rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateEqualTo(BigDecimal value) {
+            addCriterion("rate =", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateNotEqualTo(BigDecimal value) {
+            addCriterion("rate <>", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateGreaterThan(BigDecimal value) {
+            addCriterion("rate >", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("rate >=", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateLessThan(BigDecimal value) {
+            addCriterion("rate <", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("rate <=", value, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateIn(List<BigDecimal> values) {
+            addCriterion("rate in", values, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateNotIn(List<BigDecimal> values) {
+            addCriterion("rate not in", values, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("rate between", value1, value2, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("rate not between", value1, value2, "rate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeIsNull() {
+            addCriterion("pointtype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeIsNotNull() {
+            addCriterion("pointtype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeEqualTo(String value) {
+            addCriterion("pointtype =", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeNotEqualTo(String value) {
+            addCriterion("pointtype <>", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeGreaterThan(String value) {
+            addCriterion("pointtype >", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeGreaterThanOrEqualTo(String value) {
+            addCriterion("pointtype >=", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeLessThan(String value) {
+            addCriterion("pointtype <", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeLessThanOrEqualTo(String value) {
+            addCriterion("pointtype <=", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeLike(String value) {
+            addCriterion("pointtype like", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeNotLike(String value) {
+            addCriterion("pointtype not like", value, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeIn(List<String> values) {
+            addCriterion("pointtype in", values, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeNotIn(List<String> values) {
+            addCriterion("pointtype not in", values, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeBetween(String value1, String value2) {
+            addCriterion("pointtype between", value1, value2, "pointtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointtypeNotBetween(String value1, String value2) {
+            addCriterion("pointtype not between", value1, value2, "pointtype");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table wttargetconfig
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,90 @@
+
+package com.gyee.frame.model.custom;
+
+/**
+ * 
+ * 
+ * 项目名称：nxfd 类名称：DataVo 类描述： 创建人：石林 创建时间：2014-3-4 下午2:34:22 修改人：shilinno1
+ * 修改时间：2014-3-4 下午2:34:22 修改备注：
+ * 
+ * @version
+ * 
+ */
+
+public class WtTargetConfigVo {
+
+
+
+    private String code;
+    private String name;
+    private String types;
+    private String modelid;
+    private String unit;
+    private String pointtype;
+    private Double value;
+    private Double rate;
+
+    public Double getRate() {
+        return rate;
+    }
+
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTypes() {
+        return types;
+    }
+
+    public void setTypes(String types) {
+        this.types = types;
+    }
+
+    public String getModelid() {
+        return modelid;
+    }
+
+    public void setModelid(String modelid) {
+        this.modelid = modelid;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getPointtype() {
+        return pointtype;
+    }
+
+    public void setPointtype(String pointtype) {
+        this.pointtype = pointtype;
+    }
+
+    public Double getValue() {
+        return value;
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
+    }
+}

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

@@ -0,0 +1,164 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WtTargetConfigMapper;
+import com.gyee.frame.model.auto.WtTargetConfig;
+import com.gyee.frame.model.auto.WtTargetConfigExample;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 线路 WtTargetConfigService
+ * @Title: WtTargetConfigService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WtTargetConfigService implements BaseService<WtTargetConfig, WtTargetConfigExample> {
+	@Resource
+	private WtTargetConfigMapper wtTargetConfigMapper;
+	
+      	   	      	      	      	      	      	      	      	      	      	
+	/**
+	 * 分页查询
+
+	 * @return
+	 */
+	 public PageInfo<WtTargetConfig> list(Tablepar tablepar, String name){
+	        WtTargetConfigExample testExample=new WtTargetConfigExample();
+	        testExample.setOrderByClause("id ASC");
+	        if(name!=null&&!"".equals(name)){
+	        	testExample.createCriteria().andCodeLike("%"+name+"%");
+	        }
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<WtTargetConfig> list= wtTargetConfigMapper.selectByExample(testExample);
+	        PageInfo<WtTargetConfig> pageInfo = new PageInfo<WtTargetConfig>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			WtTargetConfigExample example=new WtTargetConfigExample();
+			example.createCriteria().andIdIn(lista);
+			return wtTargetConfigMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public WtTargetConfig selectByPrimaryKey(String id) {
+				
+			return wtTargetConfigMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(WtTargetConfig record) {
+		return wtTargetConfigMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(WtTargetConfig record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return wtTargetConfigMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(WtTargetConfig record, WtTargetConfigExample example) {
+		
+		return wtTargetConfigMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(WtTargetConfig record, WtTargetConfigExample example) {
+		
+		return wtTargetConfigMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<WtTargetConfig> selectByExample(WtTargetConfigExample example) {
+		
+		return wtTargetConfigMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WtTargetConfigExample example) {
+		
+		return wtTargetConfigMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WtTargetConfigExample example) {
+		
+		return wtTargetConfigMapper.deleteByExample(example);
+	}
+	
+	/**
+	 * 检查name
+	 * @param modelid
+	 * @return
+	 */
+	public Map<String,List<WtTargetConfig>> findWtTargetConfigMap(String modelid){
+
+        Map<String,List<WtTargetConfig>> map=new HashMap<>();
+
+	    if(StringUtils.notEmp(modelid))
+        {
+            WtTargetConfigExample example=new WtTargetConfigExample();
+            example.createCriteria().andModelidEqualTo(modelid);
+            List<WtTargetConfig> list=wtTargetConfigMapper.selectByExample(example);
+
+            if(!list.isEmpty())
+            {
+                for(WtTargetConfig wtc:list)
+                {
+                    if(map.containsKey(wtc.getTypes()))
+                    {
+                        List<WtTargetConfig> ls=map.get(wtc.getTypes());
+                        ls.add(wtc);
+                        map.put(wtc.getTypes(),ls);
+                    }else
+                    {
+                        List<WtTargetConfig> ls=new ArrayList<>();
+                        ls.add(wtc);
+                        map.put(wtc.getTypes(),ls);
+                    }
+                }
+            }
+        }
+
+		return map;
+	}
+
+
+}

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

@@ -237,7 +237,11 @@ public class MatrixPushByWpService {
 ;
         } else if (wpId.endsWith("FDC") && InitialRunner.wp_wtmap.containsKey(wpId)) {
 
-
+            Map<String, Object> jczbmap = new HashMap<>();
+            List< List<MatrixVo>> fjvos=new ArrayList<>();
+            Windpowerstation wp= InitialRunner.wpmap.get(wpId);
+            jczbmap.put("name",wp.getName());
+            fczbmap.put("jczbmap",jczbmap);
             List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
 
             String[] strs = Constant.TPOINT_Wt_Matrix;
@@ -321,8 +325,9 @@ public class MatrixPushByWpService {
                 }
 
             }
-
-
+            fjvos.add(vos);
+            //风机指标MAP
+            map.put("fjmap", fjvos);
         }
         fczbmap.put("djts", djts);
         fczbmap.put("yxts", yxts);
@@ -333,6 +338,7 @@ public class MatrixPushByWpService {
         fczbmap.put("slts", slts);
         jrts = StringUtils.roundToInt(djts + yxts + gzts + lxts + whts + xdts + slts);
         fczbmap.put("jrts", jrts);
+
         map.put("fczbmap", fczbmap);
 
         return map;

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

@@ -11,6 +11,7 @@ import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.InverterVo;
 import com.gyee.frame.model.custom.JunctionboxVo;
 import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.model.custom.WtTargetConfigVo;
 import com.gyee.frame.service.*;
 import com.gyee.frame.service.photovolatic.JunctionboxService;
 import com.gyee.frame.service.photovolatic.PhotovoltaicTestingPointNewService;
@@ -41,6 +42,9 @@ public class WtInfoPushService {
     private AlarmsnapService alarmsnapService;
     @Resource
     private JunctionboxService junctionboxService;
+
+    @Resource
+    private WtTargetConfigService wtTargetConfigService;
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 
     String QS_FDC = "QS_FDC";
@@ -86,829 +90,64 @@ public class WtInfoPushService {
                 Line ln= InitialRunner.lnmap.get(wt.getLineid());
                 map.put("lnname", ln.getName());
 
-                Double sjgl = 0.0;
-                Double bzgl = 0.0;
-                Double yfgl = 0.0;
-
-                List<String> zbls = new ArrayList<>();
-
-                List<String> keyls = new ArrayList<>();
-
-                Map<String, Integer> bjnamemap = new HashMap<>();
-                Map<String, Integer> clxnamemap = new HashMap<>();
-                Map<String, Integer> fdjnamemap = new HashMap<>();
-                Map<String, Integer> phnamemap = new HashMap<>();
-                Map<String, Integer> yynamemap = new HashMap<>();
-                Map<String, Integer> jcnamemap = new HashMap<>();
-
-
-
-
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_FJKYL).getCode());// 可利用率
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_RFDL).getCode());// 日发电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_LLGL).getCode());// 风机理论功率
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_YFGL).getCode());// 风机应发功率
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_RFDLBZ).getCode());// 日理论发电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_RFDLZS).getCode());//  日应发电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.FJZT).getCode());// 风机状态
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RGZSSDL).getCode());// 风机日故障损失电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RJXSSDL).getCode());// 风机日检修损失电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RQFSSDL).getCode());// 风机日欠发损失电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RXDSSDL).getCode());// 风机日限电损失电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RLZSSDL).getCode());// 日场内受累检修
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RSZSSDL).getCode());// 日场内受累故障
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RQFSSDL).getCode());// 日场外受累电网
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RXDSSDL).getCode());// 日场外受累天气
 
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_FJSSFS).getCode());// 风速
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_FJGL).getCode());// 风机功率
-                if (wt.getWindpowerstationid().equals(QS_FDC)) {
-                    zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.QSTPOINT_WT_FDJZS).getCode());// 风机转数
-
-                }else
+                if(StringUtils.notEmp(wt.getModelid()))
                 {
-                    zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_FDJZS).getCode());// 风机转数
-                }
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.TPOINT_WT_JCWWD).getCode());//环境温度
-
-                keyls.add("FJKYL");// 可利用率
-                keyls.add("RFDL");// 日发电量
-                keyls.add("LLGL");// 风机理论功率
-                keyls.add("YFGL");// 风机应发功率
-                keyls.add("LLFDL");// 日理论发电量
-                keyls.add("YFDL");//  日应发电量
-                keyls.add("FJZT");// 风机状态
-                keyls.add("GZSS");// 风机日故障损失电量
-                keyls.add("JXSS");// 风机日检修损失电量
-                keyls.add("XNSS");// 风机日欠发损失电量
-                keyls.add("XDSS");// 风机日限电损失电量
-                keyls.add("SLSS");// 日场内受累检修
-                keyls.add("RJXSSDL");// 日场内受累故障
-                keyls.add("RQFSSDL");// 日场外受累电网
-                keyls.add("RXDSSDL");// 日场外受累天气
-                keyls.add("FS");// 风速
-                keyls.add("GL");// 平均风速功率
-                keyls.add("FDJZS");//风机转数
-                keyls.add("HJWD");////环境温度
-
-                namemap.put("FJKYL",new String[]{"可利用率","%","ai",null});
-                namemap.put("RFDL",new String[]{"日发电量","kwh","ai",null});
-                namemap.put("LLGL",new String[]{"风机理论功率","kw","ai",null});
-                namemap.put("YFGL",new String[]{"风机应发功率","kw","ai",null});
-                namemap.put("LLFDL",new String[]{"日理论发电量","kwh","ai",null});
-                namemap.put("YFDL",new String[]{"日应发电量","kwh","ai",null});
-                namemap.put("FJZT",new String[]{"风机状态","","ai",null});
-                namemap.put("GZSS",new String[]{"故障损失电量","kwh","ai",null});
-                namemap.put("JXSS",new String[]{"检修损失电量","kwh","ai",null});
-                namemap.put("XNSS",new String[]{"性能损失电量","kwh","ai",null});
-                namemap.put("XDSS",new String[]{"限电损失电量","kwh","ai",null});
-                namemap.put("SLSS",new String[]{"场内受累","kwh","ai",null});
-                namemap.put("RJXSSDL",new String[]{"日场内受累检修","kwh","ai",null});
-                namemap.put("RQFSSDL",new String[]{"场外受累电网","kwh","ai",null});
-                namemap.put("RXDSSDL",new String[]{"场外受累天气","kwh","ai",null});
-                namemap.put("FS",new String[]{"风速","m/s","ai",null});
-                namemap.put("GL",new String[]{"功率","kw","ai",null});
-                namemap.put("FDJZS",new String[]{"风机转数","rpm","ai",null});
-                namemap.put("HJWD",new String[]{"环境温度","°c","ai",null});
-
-/*********************************************************************变桨*********************************************************************************/
-
-                List<String> uids = new ArrayList<>();
-                List<String> msls = new ArrayList<>();
-
-                if (wt.getWindpowerstationid().equals(QS_FDC)) {
-
-                    uids.add(Constant.TPOINT_WT_RYBMQ1);
-                    uids.add(Constant.TPOINT_WT_RYBMQ2);
-                    uids.add(Constant.TPOINT_WT_RYBMQ3);
-                    uids.add(Constant.TPOINT_WT_BJSD1);
-                    uids.add(Constant.TPOINT_WT_BJSD2);
-                    uids.add(Constant.TPOINT_WT_BJSD3);
-                    uids.add(Constant.QSTPOINT_WT_U1YZDL);
-                    uids.add(Constant.QSTPOINT_WT_U2YZDL);
-                    uids.add(Constant.QSTPOINT_WT_U3YZDL);
-                    uids.add(Constant.QSTPOINT_WT_U1YZDY);
-                    uids.add(Constant.QSTPOINT_WT_U2YZDY);
-                    uids.add(Constant.QSTPOINT_WT_U3YZDY);
-
-                } else {
-
-                    uids.add(Constant.TPOINT_WT_RYBMQ1);
-                    uids.add(Constant.TPOINT_WT_RYBMQ2);
-                    uids.add(Constant.TPOINT_WT_RYBMQ3);
-                    uids.add(Constant.TPOINT_WT_BJSD1);
-                    uids.add(Constant.TPOINT_WT_BJSD2);
-                    uids.add(Constant.TPOINT_WT_BJSD3);
-                    uids.add(Constant.TPOINT_WT_U1YZDL);
-                    uids.add(Constant.TPOINT_WT_U2YZDL);
-                    uids.add(Constant.TPOINT_WT_U3YZDL);
-                    uids.add(Constant.TPOINT_WT_U1YZDY);
-                    uids.add(Constant.TPOINT_WT_U2YZDY);
-                    uids.add(Constant.TPOINT_WT_U3YZDY);
-
-                }
-
-
-
-                msls.add("RYBMQ1");
-                msls.add("RYBMQ2");
-                msls.add("RYBMQ3");
-                msls.add("BJSD1");
-                msls.add("BJSD2");
-                msls.add("BJSD3");
-                msls.add("U1YZDL");
-                msls.add("U2YZDL");
-                msls.add("U3YZDL");
-                msls.add("U1YZDY");
-                msls.add("U2YZDY");
-                msls.add("U3YZDY");
-
-
-
-                namemap.put("RYBMQ1",new String[]{"冗余编码器1","","ai",null});
-                namemap.put("RYBMQ2",new String[]{"冗余编码器2","","ai",null});
-                namemap.put("RYBMQ3",new String[]{"冗余编码器3","","ai",null});
-                namemap.put("BJSD1",new String[]{"变桨速度1","","ai",null});
-                namemap.put("BJSD2",new String[]{"变桨速度2","","ai",null});
-                namemap.put("BJSD3",new String[]{"变桨速度3","","ai",null});
-                namemap.put("U1YZDL",new String[]{"U1项绕组电流","A","ai",null});
-                namemap.put("U2YZDL",new String[]{"U2项绕组电流","A","ai",null});
-                namemap.put("U3YZDL",new String[]{"U3项绕组电流","A","ai",null});
-                namemap.put("U1YZDY",new String[]{"U1项绕组电压","V","ai",null});
-                namemap.put("U2YZDY",new String[]{"U2项绕组电压","V","ai",null});
-                namemap.put("U3YZDY",new String[]{"U3项绕组电压","V","ai",null});
-
-                namemap.put("YP1XW91",new String[]{"叶片1的91度限位","","di",null});
-                namemap.put("YP2XW91",new String[]{"叶片2的91度限位","","di",null});
-                namemap.put("YP3XW91",new String[]{"叶片3的91度限位","","di",null});
-                namemap.put("YP1XW95",new String[]{"叶片1的95度限位","","di",null});
-                namemap.put("YP2XW95",new String[]{"叶片2的95度限位","","di",null});
-                namemap.put("YP3XW95",new String[]{"叶片3的95度限位","","di",null});
-
-
-
-                initialpoint(id, zbls, keyls, bjnamemap,uids,msls);
-
-
-                List<String> unicodels = new ArrayList<>();
-
-                unicodels.add(Constant.TPOINT_WT_YP1XW91);
-                unicodels.add(Constant.TPOINT_WT_YP2XW91);
-                unicodels.add(Constant.TPOINT_WT_YP3XW91);
-                unicodels.add(Constant.TPOINT_WT_YP1XW95);
-                unicodels.add(Constant.TPOINT_WT_YP2XW95);
-                unicodels.add(Constant.TPOINT_WT_YP3XW95);
-
-                List<String> unmsls = new ArrayList<>();
-
-                unmsls.add("YP1XW91");
-                unmsls.add("YP2XW91");
-                unmsls.add("YP3XW91");
-                unmsls.add("YP1XW95");
-                unmsls.add("YP2XW95");
-                unmsls.add("YP3XW95");
-
-                InitalDiMap(id, zbls, keyls, bjnamemap, unicodels, unmsls);
-
-/**************************************************************************齿轮箱*****************************************************************************/
-
-                msls=new ArrayList<>();
-                uids=new ArrayList<>();
-                uids.add(Constant.TPOINT_WT_RHYLWRKYL);
-                uids.add(Constant.TPOINT_WT_RHYLWCKYL);
-                uids.add(Constant.TPOINT_WT_CLXSRZ1WD);
-                uids.add(Constant.TPOINT_WT_CLXRHYJRBH);
-                uids.add(Constant.TPOINT_WT_CLXRHYLWYC);
-                uids.add(Constant.TPOINT_WT_CLXRKYW);
-
-                msls.add("RHYLWRKYL");
-                msls.add("RHYLWCKYL");
-                msls.add("CLXSRZ1WD");
-                msls.add("CLXRHYJRBH");
-                msls.add("CLXRHYLWYC");
-                msls.add("CLXRKYW");
-
-                initialpoint(id, zbls, keyls, clxnamemap,uids,msls);
-
-                unicodels = new ArrayList<>();
-
-                unicodels.add(Constant.TPOINT_WT_CLXYW);
-                unicodels.add(Constant.TPOINT_WT_CLXRHYYL);
-                unicodels.add(Constant.TPOINT_WT_CLXRHBDJBH);
-                unicodels.add(Constant.TPOINT_WT_CLXRHYJRBH);
-                unicodels.add(Constant.TPOINT_WT_CLXRHYLWYC);
-                unicodels.add(Constant.TPOINT_WT_CLXYJRQBH);
-                unicodels.add(Constant.TPOINT_WT_QDCLXRHJRQ);
-                unicodels.add(Constant.TPOINT_WT_QDCLXRHGSBA);
-                unicodels.add(Constant.TPOINT_WT_QDCLXRHGSBB);
-                unicodels.add(Constant.TPOINT_WT_QDCLXYBJRQ);
-
-
-                unmsls = new ArrayList<>();
-
-                unmsls.add("CLXYW");
-                unmsls.add("CLXRHYYL");
-                unmsls.add("CLXRHBDJBH");
-                unmsls.add("CLXRHYJRBH");
-                unmsls.add("CLXRHYLWYC");
-                unmsls.add("CLXYJRQBH");
-                unmsls.add("QDCLXRHJRQ");
-                unmsls.add("QDCLXRHGSBA");
-                unmsls.add("QDCLXRHGSBB");
-                unmsls.add("QDCLXYBJRQ");
-
-                InitalDiMap(id, zbls, keyls, clxnamemap, unicodels, unmsls);
-
-
-                namemap.put("RHYLWRKYL",new String[]{"润滑油滤网入口压力","bar","ai",null});
-                namemap.put("RHYLWCKYL",new String[]{"润滑油滤网出口压力","bar","ai",null});
-                namemap.put("CLXSRZ1WD",new String[]{"齿轮箱输入轴1温度","°c","ai",null});
-                namemap.put("CLXRHYJRBH",new String[]{"齿轮箱输入轴2温度","°c","ai",null});
-                namemap.put("CLXRHYLWYC",new String[]{"齿轮箱油温","°c","ai",null});
-                namemap.put("CLXRKYW",new String[]{"齿轮箱入口油温","°c","ai",null});
-
-                namemap.put("CLXYW",new String[]{"齿轮箱油位ok","","di",null});
-                namemap.put("CLXRHYYL",new String[]{"齿轮箱润滑油压力ok","","di",null});
-                namemap.put("CLXRHBDJBH",new String[]{"齿轮箱润滑泵电机保护ok","","di",null});
-                namemap.put("CLXRHYJRBH",new String[]{"齿轮箱润滑油加热保护ok","","di",null});
-                namemap.put("CLXRHYLWYC",new String[]{"齿轮箱润滑油滤网压差ok","","di",null});
-                namemap.put("CLXYJRQBH",new String[]{"齿轮箱油加热器保护ok","","di",null});
-                namemap.put("QDCLXRHJRQ",new String[]{"启动齿轮箱润滑加热器","","di",null});
-                namemap.put("QDCLXRHGSBA",new String[]{"启动齿轮箱润滑高速泵a","","di",null});
-                namemap.put("QDCLXRHGSBB",new String[]{"启动齿轮箱润滑高速泵b","","di",null});
-                namemap.put("QDCLXYBJRQ",new String[]{"启动齿轮箱油泵加热器","","di",null});
-
-
-/***********************************************************************发电机********************************************************************************/
-
-                msls=new ArrayList<>();
-                uids=new ArrayList<>();
-                if (wt.getWindpowerstationid().equals(QS_FDC)) {
-
-                    uids.add(Constant.QSTPOINT_WT_U1YZWD);
-                    uids.add(Constant.QSTPOINT_WT_V1YZWD);
-                    uids.add(Constant.QSTPOINT_WT_W1YZWD);
-                    uids.add(Constant.TPOINT_WT_FDJZCAWD);
-                    uids.add(Constant.TPOINT_WT_FDJZCBWD);
-                    uids.add(Constant.TPOINT_WT_FDJLQFWD);
-                    uids.add(Constant.TPOINT_WT_FDJHHWD);
-
-
-                } else {
-
-                    uids.add(Constant.TPOINT_WT_U1YZWD);
-                    uids.add(Constant.TPOINT_WT_V1YZWD);
-                    uids.add(Constant.TPOINT_WT_W1YZWD);
-                    uids.add(Constant.TPOINT_WT_FDJZCAWD);
-                    uids.add(Constant.TPOINT_WT_FDJZCBWD);
-                    uids.add(Constant.TPOINT_WT_FDJLQFWD);
-                    uids.add(Constant.TPOINT_WT_FDJHHWD);
-
-                }
-
-                msls.add("U1YZWD");
-                msls.add("V1YZWD");
-                msls.add("W1YZWD");
-                msls.add("FDJZCAWD");
-                msls.add("FDJZCBWD");
-                msls.add("FDJLQFWD");
-                msls.add("FDJHHWD");
-
-                initialpoint(id, zbls, keyls, fdjnamemap,uids,msls);
-
-                unicodels = new ArrayList<>();
-
-                unicodels.add(Constant.TPOINT_WT_FDJJRQBHZC);
-                unicodels.add(Constant.TPOINT_WT_QDFDJJRQ);
-                unicodels.add(Constant.TPOINT_WT_FDJDSMS);
-                unicodels.add(Constant.TPOINT_WT_QDKLFS1);
-                unicodels.add(Constant.TPOINT_WT_QDKLFS2);
-                unicodels.add(Constant.TPOINT_WT_KLFSBH1);
-                unicodels.add(Constant.TPOINT_WT_KLFSBH2);
-                unicodels.add(Constant.TPOINT_WT_QDSLFS1);
-                unicodels.add(Constant.TPOINT_WT_QDSLFSBH1);
-                unicodels.add(Constant.TPOINT_WT_LQSYL);
-                unicodels.add(Constant.TPOINT_WT_FDJRHYBYW);
-                unicodels.add(Constant.TPOINT_WT_QDFDJRHYB);
-
-
-                unmsls = new ArrayList<>();
-
-                unmsls.add("FDJJRQBHZC");
-                unmsls.add("QDFDJJRQ");
-                unmsls.add("FDJDSMS");
-                unmsls.add("QDKLFS1");
-                unmsls.add("QDKLFS2");
-                unmsls.add("KLFSBH1");
-                unmsls.add("KLFSBH2");
-                unmsls.add("QDSLFS1");
-                unmsls.add("QDSLFSBH1");
-                unmsls.add("LQSYL");
-                unmsls.add("FDJRHYBYW");
-                unmsls.add("QDFDJRHYB");
-
-                InitalDiMap(id, zbls, keyls, fdjnamemap, unicodels, unmsls);
-
-
-
-                namemap.put("U1YZWD",new String[]{"U1绕组温度","°c","ai",null});
-                namemap.put("V1YZWD",new String[]{"V1绕组温度","°c","ai",null});
-                namemap.put("W1YZWD",new String[]{"W1绕组温度","°c","ai",null});
-                namemap.put("FDJZCAWD",new String[]{"发电机轴承A温度","°c","ai",null});
-                namemap.put("FDJZCBWD",new String[]{"发电机轴承B温度","°c","ai",null});
-                namemap.put("FDJLQFWD",new String[]{"发电机冷却风温度","°c","ai",null});
-                namemap.put("FDJHHWD",new String[]{"发电机滑环温度","°c","ai",null});
-
-
-                namemap.put("FDJJRQBHZC",new String[]{"发电机加热器保护正常","","di",null});
-                namemap.put("QDFDJJRQ",new String[]{"启动发电机加热器","","di",null});
-                namemap.put("FDJDSMS",new String[]{"发电机电刷磨损ok","","di",null});
-                namemap.put("QDKLFS1",new String[]{"启动空冷风扇1","","di",null});
-                namemap.put("QDKLFS2",new String[]{"启动空冷风扇2","","di",null});
-                namemap.put("KLFSBH1",new String[]{"空冷风扇保护1正常","","di",null});
-                namemap.put("KLFSBH2",new String[]{"空冷风扇保护2正常","","di",null});
-                namemap.put("QDSLFS1",new String[]{"启动水冷风扇1","","di",null});
-                namemap.put("QDSLFSBH1",new String[]{"水冷风扇保护1正常","","di",null});
-                namemap.put("LQSYL",new String[]{"冷却水压力ok","","di",null});
-                namemap.put("FDJRHYBYW",new String[]{"发电机润滑油泵液位ok","","di",null});
-                namemap.put("QDFDJRHYB",new String[]{"启动发电机润滑油泵","","di",null});
-
-/*********************************************************************偏航**********************************************************************************/
-
-
-                msls=new ArrayList<>();
-                uids=new ArrayList<>();
-                if (wt.getWindpowerstationid().equals(QS_FDC)) {
-
-                    uids.add(Constant.TPOINT_WT_DFJD);
-                    uids.add(Constant.QSTPOINT_WT_PHWZ);
-
-                } else {
-
-                    uids.add(Constant.TPOINT_WT_DFJD);
-                    uids.add(Constant.TPOINT_WT_PHWZ);
-
-                }
-
-                msls.add("DFJD");
-                msls.add("PHWZ");
-                initialpoint(id, zbls, keyls, phnamemap,uids,msls);
-
-                unicodels = new ArrayList<>();
-
-                unicodels.add(Constant.TPOINT_WT_PHZJX);
-                unicodels.add(Constant.TPOINT_WT_PHYJX);
-                unicodels.add(Constant.TPOINT_WT_PHRQDQZC);
-                unicodels.add(Constant.TPOINT_WT_ZPHDZ);
-                unicodels.add(Constant.TPOINT_WT_PHDSCDK);
-                unicodels.add(Constant.TPOINT_WT_YPHDZ);
-                unicodels.add(Constant.TPOINT_WT_PHRQDQDZ);
-                unicodels.add(Constant.TPOINT_WT_PHRQDQSN);
-                unicodels.add(Constant.TPOINT_WT_PHBMQZL);
-                unicodels.add(Constant.TPOINT_WT_JLDZ);
-                unicodels.add(Constant.TPOINT_WT_PHCGQMTOK);
-                unicodels.add(Constant.TPOINT_WT_PHCGQOK);
-                unicodels.add(Constant.TPOINT_WT_PHZCRHYW);
-                unicodels.add(Constant.TPOINT_WT_PHRHBZCBH);
-                unicodels.add(Constant.TPOINT_WT_PHDJ1BH);
-                unicodels.add(Constant.TPOINT_WT_PHDJ2BH);
-                unicodels.add(Constant.TPOINT_WT_PHDJ3BH);
-                unicodels.add(Constant.TPOINT_WT_PHDJ4BH);
-
-                unmsls = new ArrayList<>();
-
-                unmsls.add("PHZJX");
-                unmsls.add("PHYJX");
-                unmsls.add("PHRQDQZC");
-                unmsls.add("ZPHDZ");
-                unmsls.add("PHDSCDK");
-                unmsls.add("YPHDZ");
-                unmsls.add("PHRQDQDZ");
-                unmsls.add("PHRQDQSN");
-                unmsls.add("PHBMQZL");
-                unmsls.add("JLDZ");
-                unmsls.add("PHCGQMTOK");
-                unmsls.add("PHCGQOK");
-                unmsls.add("PHZCRHYW");
-                unmsls.add("PHRHBZCBH");
-                unmsls.add("PHDJ1BH");
-                unmsls.add("PHDJ2BH");
-                unmsls.add("PHDJ3BH");
-                unmsls.add("PHDJ4BH");
-
-                InitalDiMap(id, zbls, keyls, phnamemap, unicodels, unmsls);
-
-
-
-                namemap.put("DFJD",new String[]{"对风角度","","ai",null});
-                namemap.put("PHWZ",new String[]{"偏航位置","","ai",null});
-
-
-                namemap.put("PHZJX",new String[]{"偏航左极限位置","","di",null});
-                namemap.put("PHYJX",new String[]{"偏航右极限位置","","di",null});
-                namemap.put("PHRQDQZC",new String[]{"偏航软启动器正常","","di",null});
-                namemap.put("PHDSCDK",new String[]{"左偏航动作","","di",null});
-                namemap.put("YPHDZ",new String[]{"偏航电刹车打开","","di",null});
-                namemap.put("PHRQDQDZ",new String[]{"偏航软启动器动作","","di",null});
-                namemap.put("PHRQDQSN",new String[]{"偏航软启动器使能","","di",null});
-                namemap.put("PHBMQZL",new String[]{"偏航编码器置零","","di",null});
-                namemap.put("JLDZ",new String[]{"解缆动作","","di",null});
-                namemap.put("PHCGQMTOK",new String[]{"偏航传感器mtOK","","di",null});
-                namemap.put("PHCGQOK",new String[]{"偏航传感器OK","","di",null});
-                namemap.put("PHZCRHYW",new String[]{"偏航轴承润滑液位ok","","di",null});
-                namemap.put("PHRHBZCBH",new String[]{"偏航润滑泵轴承保护ok","","di",null});
-                namemap.put("PHDJ1BH",new String[]{"偏航电机1保护OK","","di",null});
-                namemap.put("PHDJ2BH",new String[]{"偏航电机2保护OK","","di",null});
-                namemap.put("PHDJ3BH",new String[]{"偏航电机3保护OK","","di",null});
-                namemap.put("PHDJ4BH",new String[]{"偏航电机4保护OK","","di",null});
-
-/****************************************************************液压***************************************************************************************/
-
-                msls=new ArrayList<>();
-                uids=new ArrayList<>();
-                uids.add(Constant.TPOINT_WT_YYXTYY);
-                uids.add(Constant.TPOINT_WT_ZZSCXTYY);
-                uids.add(Constant.TPOINT_WT_FDJLQSWD);
-                uids.add(Constant.TPOINT_WT_YYYW);
-
-                msls.add("YYXTYY");
-                msls.add("ZZSCXTYY");
-                msls.add("FDJLQSWD");
-                msls.add("YYYW");
-                initialpoint(id, zbls, keyls, yynamemap,uids,msls);
-
-                unicodels = new ArrayList<>();
-
-                unicodels.add(Constant.TPOINT_WT_YYYWDCX);
-                unicodels.add(Constant.TPOINT_WT_YYYYW);
-                unicodels.add(Constant.TPOINT_WT_YLSCYY);
-                unicodels.add(Constant.TPOINT_WT_YYBDJBH);
-                unicodels.add(Constant.TPOINT_WT_YYYJRQBH);
-
-
-                unmsls = new ArrayList<>();
-
-                unmsls.add("YYYWDCX");
-                unmsls.add("YYYYW");
-                unmsls.add("YLSCYY");
-                unmsls.add("YYBDJBH");
-                unmsls.add("YYYJRQBH");
-
-                InitalDiMap(id, zbls, keyls, yynamemap, unicodels, unmsls);
-
-
-                namemap.put("YYXTYY",new String[]{"液压系统油压","bar","ai",null});
-                namemap.put("ZZSCXTYY",new String[]{"转子刹车系统液压","bar","ai",null});
-                namemap.put("FDJLQSWD",new String[]{"液压油温","°c","ai",null});
-                namemap.put("YYYW",new String[]{"液压系统油压","bar","ai",null});
-
-                namemap.put("YYYWDCX",new String[]{"液压油温度超限","","di",null});
-                namemap.put("YYYYW",new String[]{"液压油液位ok","","di",null});
-                namemap.put("YLSCYY",new String[]{"叶轮刹车液压ok","","di",null});
-                namemap.put("YYBDJBH",new String[]{"液压泵电机保护","","di",null});
-                namemap.put("YYYJRQBH",new String[]{"液压油加热器保护","","di",null});
-
-/***********************************************************************机舱********************************************************************************/
-
-
-
-                msls=new ArrayList<>();
-                uids=new ArrayList<>();
-
-                if (wt.getWindpowerstationid().equals(QS_FDC)) {
-
-                    uids.add(Constant.TPOINT_WT_YPWZ1);
-                    uids.add(Constant.TPOINT_WT_YPWZ2);
-                    uids.add(Constant.TPOINT_WT_YPWZ3);
-                    uids.add(Constant.TPOINT_WT_FJSSFS);
-                    uids.add(Constant.TPOINT_WT_FJGL);
-                    uids.add(Constant.TPOINT_WT_GLYS);
-                    uids.add(Constant.QSTPOINT_WT_BJJD1);
-                    uids.add(Constant.TPOINT_WT_FJPL);
-                    uids.add(Constant.TPOINT_WT_WGGL);
-                    uids.add(Constant.TPOINT_WT_FJFX);
-                    uids.add(Constant.TPOINT_WT_YLZS);
-                    uids.add(Constant.QSTPOINT_WT_FDJZS);
-                    uids.add(Constant.TPOINT_WT_JCWWD);
-                    uids.add(Constant.TPOINT_WT_JCWD);
-                    uids.add(Constant.TPOINT_WT_TDGWD);
-                    uids.add(Constant.TPOINT_WT_JCGWD);
-
-
-                } else {
-
-                    uids.add(Constant.TPOINT_WT_YPWZ1);
-                    uids.add(Constant.TPOINT_WT_YPWZ2);
-                    uids.add(Constant.TPOINT_WT_YPWZ3);
-                    uids.add(Constant.TPOINT_WT_FJSSFS);
-                    uids.add(Constant.TPOINT_WT_FJGL);
-                    uids.add(Constant.TPOINT_WT_GLYS);
-                    uids.add(Constant.TPOINT_WT_BJJD1);
-                    uids.add(Constant.TPOINT_WT_FJPL);
-                    uids.add(Constant.TPOINT_WT_WGGL);
-                    uids.add(Constant.TPOINT_WT_FJFX);
-                    uids.add(Constant.TPOINT_WT_YLZS);
-                    uids.add(Constant.TPOINT_WT_FDJZS);
-                    uids.add(Constant.TPOINT_WT_JCWWD);
-                    uids.add(Constant.TPOINT_WT_JCWD);
-                    uids.add(Constant.TPOINT_WT_TDGWD);
-                    uids.add(Constant.TPOINT_WT_JCGWD);
-
-
-
-                }
-
-                msls.add("YPWZ1");
-                msls.add("YPWZ2");
-                msls.add("YPWZ3");
-                msls.add("FJSSFS");
-                msls.add("FJGL");
-                msls.add("GLYS");
-                msls.add("BJJD1");
-                msls.add("FJPL");
-                msls.add("WGGL");
-                msls.add("FJFX");
-                msls.add("YLZS");
-                msls.add("FDJZS");
-                msls.add("JCWWD");
-                msls.add("JCWD");
-                msls.add("TDGWD");
-                msls.add("JCGWD");
-
-                initialpoint(id, zbls, keyls, jcnamemap,uids,msls);
-
-                unicodels = new ArrayList<>();
-
-                unicodels.add(Constant.TPOINT_WT_YYYYW2);
-                unicodels.add(Constant.TPOINT_WT_YYYWDCX2);
-                unicodels.add(Constant.TPOINT_WT_YLSCYY2);
-                unicodels.add(Constant.TPOINT_WT_YYBDJBH2);
-                unicodels.add(Constant.TPOINT_WT_YYYJRQBH2);
-                unicodels.add(Constant.TPOINT_WT_CLXYW2);
-                unicodels.add(Constant.TPOINT_WT_CLXRHYYL2);
-                unicodels.add(Constant.TPOINT_WT_CLXRHYJRBH2);
-                unicodels.add(Constant.TPOINT_WT_FDJJRQBHZC2);
-                unicodels.add(Constant.TPOINT_WT_LQSYL2);
-
-
-                unmsls = new ArrayList<>();
-
-                unmsls.add("YYYYW2");
-                unmsls.add("YYYWDCX2");
-                unmsls.add("YLSCYY2");
-                unmsls.add("YYBDJBH2");
-                unmsls.add("YYYJRQBH2");
-                unmsls.add("CLXYW2");
-                unmsls.add("CLXRHYYL2");
-                unmsls.add("CLXRHYJRBH2");
-                unmsls.add("FDJJRQBHZC2");
-                unmsls.add("LQSYL2");
-
-                InitalDiMap(id, zbls, keyls, jcnamemap, unicodels, unmsls);
-
-
-                namemap.put("YPWZ1",new String[]{"叶片位置1","","ai",null});
-                namemap.put("YPWZ2",new String[]{"叶片位置2","","ai",null});
-                namemap.put("YPWZ3",new String[]{"叶片位置3","","ai",null});
-                namemap.put("FJSSFS",new String[]{"风机实时风速","m/s","ai",null});
-                namemap.put("FJGL",new String[]{"风机功率","kw","ai",null});
-                namemap.put("GLYS",new String[]{"功率因数","Kvar","ai",null});
-                namemap.put("BJJD1",new String[]{"变桨角度1","度","ai",null});
-                namemap.put("FJPL",new String[]{"风机频率","Hz","ai",null});
-                namemap.put("WGGL",new String[]{"无功功率","kw","ai",null});
-                namemap.put("FJFX",new String[]{"风机风向","度","ai",null});
-                namemap.put("YLZS",new String[]{"叶轮转速","rpm","ai",null});
-                namemap.put("FDJZS",new String[]{"发电机转速","rpm","ai",null});
-                namemap.put("JCWWD",new String[]{"机舱外温度","°c","ai",null});
-                namemap.put("JCWD",new String[]{"机舱温度","°c","ai",null});
-                namemap.put("TDGWD",new String[]{"塔底柜温度","°c","ai",null});
-                namemap.put("JCGWD",new String[]{"机舱柜温度","°c","ai",null});
-
-
-                namemap.put("YYYYW2",new String[]{"液压油液位ok","","di",null});
-                namemap.put("YYYWDCX2",new String[]{"液压油温度超限","","di",null});
-                namemap.put("YLSCYY2",new String[]{"叶轮刹车液压ok","","di",null});
-                namemap.put("YYBDJBH2",new String[]{"液压泵电机保护","","di",null});
-                namemap.put("YYYJRQBH2",new String[]{"液压油加热器保护","","di",null});
-                namemap.put("CLXYW2",new String[]{"齿轮箱油位ok","","di",null});
-                namemap.put("CLXRHYYL2",new String[]{"齿轮箱润滑油压力ok","","di",null});
-                namemap.put("CLXRHYJRBH2",new String[]{"齿轮箱润滑油泵保护开关故障","","di",null});
-                namemap.put("FDJJRQBHZC2",new String[]{"发电机加热器保护正常","","di",null});
-                namemap.put("LQSYL2",new String[]{"冷却水压力ok","","di",null});
-
-
-/*******************************************************************************************************************************************************/
-
-                  Map<String, Object> jczbmap = new HashMap<>();
-//                    Map<String, Object> bjmap = new HashMap<>();
-//                    Map<String, Object> clxmap = new HashMap<>();
-//                    Map<String, Object> fdjmap = new HashMap<>();
-//                    Map<String, Object> phmap = new HashMap<>();
-//                    Map<String, Object> yymap = new HashMap<>();
-//                    Map<String, Object> jcmap = new HashMap<>();
-
-                List<Object> bjls=new ArrayList<>();
-                List<Object> clxls=new ArrayList<>();
-                List<Object> fdjls=new ArrayList<>();
-                List<Object> phls=new ArrayList<>();
-                List<Object> yyls=new ArrayList<>();
-                List<Object> jcls=new ArrayList<>();
-                List<PointData> zblist = new ArrayList<>();
-                for(String str:zbls)
-                {
-                    PointData po=  realApiUtil.getRealData(str);
-                    zblist.add(po);
-                }
-//                List<PointData> zblist = realApiUtil.getRealData(zbls);
-
-
-                if (!zblist.isEmpty() && zblist.size() == zbls.size() && keyls.size() == zbls.size()) {
-/**************************************************************基础指标***********************************************************************************/
-                    jczbmap.put(keyls.get(0), MathUtil.twoBit(zblist.get(0).getPointValueInDouble()));// 可利用率
-                    double rfdl = MathUtil.twoBit(zblist.get(1).getPointValueInDouble());
-                    jczbmap.put(keyls.get(1), rfdl);// 日发电量
-                    jczbmap.put(keyls.get(2), MathUtil.twoBit(zblist.get(2).getPointValueInDouble()));// 风机理论功率
-                    jczbmap.put(keyls.get(3), MathUtil.twoBit(zblist.get(3).getPointValueInDouble()));// 风机应发功率
-                    jczbmap.put(keyls.get(4), MathUtil.twoBit(zblist.get(4).getPointValueInDouble()));// 日理论发电量
-                    jczbmap.put(keyls.get(5), MathUtil.twoBit(zblist.get(5).getPointValueInDouble()));// 日应发电量
-                    jczbmap.put(keyls.get(6), MathUtil.twoBit(zblist.get(6).getPointValueInDouble()));// 风机状态
-
-                    double rssdl = 0.0;
-                    double rgzss = MathUtil.twoBit(zblist.get(7).getPointValueInDouble());
-                    double rjxss = MathUtil.twoBit(zblist.get(8).getPointValueInDouble());
-                    double rxnss = MathUtil.twoBit(zblist.get(9).getPointValueInDouble());
-                    double rxdss = MathUtil.twoBit(zblist.get(10).getPointValueInDouble());
-
-                    double rlzssdl = MathUtil.twoBit(zblist.get(11).getPointValueInDouble()); // 日场内受累检修
-                    double rszssdl = MathUtil.twoBit(zblist.get(12).getPointValueInDouble()); // 日场内受累故障
-                    double rwzssdl = MathUtil.twoBit(zblist.get(13).getPointValueInDouble()); // 日场外受累电网
-                    double rtzssdl = MathUtil.twoBit(zblist.get(14).getPointValueInDouble()); // 日场外受累天气
-
-                    jczbmap.put(keyls.get(7), StringUtils.round(rgzss + rlzssdl, 2));// 日故障损失电量
-                    jczbmap.put(keyls.get(8), StringUtils.round(rjxss + rszssdl, 2));// 日维护损失电量
-                    jczbmap.put(keyls.get(9), rxnss);// 日欠发损失电量
-
-                    jczbmap.put(keyls.get(10), rxdss);// 日限电损失电量
-                    jczbmap.put(keyls.get(11), StringUtils.round(rwzssdl + rtzssdl, 2));// 日受累损失电量
-
-                    rssdl = rgzss + rjxss + rxnss + rxdss + rwzssdl + rtzssdl + rszssdl + rlzssdl;
-
-                    jczbmap.put("RSSDL", StringUtils.round(rssdl, 2));// 风机日损失电量
-
-                    jczbmap.put("RLLFDL", StringUtils.round(rssdl + rfdl, 2));// 风机日理论电量
-
-                    jczbmap.put(keyls.get(15), MathUtil.twoBit(zblist.get(15).getPointValueInDouble()));// 风速
-                    jczbmap.put(keyls.get(16), MathUtil.twoBit(zblist.get(16).getPointValueInDouble()));//功率
-                    jczbmap.put(keyls.get(17), MathUtil.twoBit(zblist.get(17).getPointValueInDouble()));//发电机转数
-                    jczbmap.put(keyls.get(18), MathUtil.twoBit(zblist.get(18).getPointValueInDouble()));//环境温度
-/**************************************************************基础指标***********************************************************************************/
-
-/**************************************************************变桨***********************************************************************************/
-
-
-                    for(int i=0;i<keyls.size();i++)
+                    Map<String,List<WtTargetConfig>> wtcmap=wtTargetConfigService.findWtTargetConfigMap(wt.getModelid());
+                    if(!wtcmap.isEmpty())
                     {
-                        if(bjnamemap.containsKey(keyls.get(i)))
-                        {
-                            int num=bjnamemap.get(keyls.get(i));
+                        List<WtTargetConfigVo> vos=new ArrayList<>();
+                        List<String> codels=new ArrayList<>();
+                        for (Map.Entry<String, List<WtTargetConfig>> entry : wtcmap.entrySet()) {
+                            List<WtTargetConfig> wtcls=entry.getValue();
 
-                            if(namemap.containsKey(keyls.get(i)))
+                            if(!wtcls.isEmpty())
                             {
-                                String[] temparr=namemap.get(keyls.get(i));
-                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-                               // bjmap.put(keyls.get(i),temparr);//
-                                bjls.add(temparr);
-                            }
-
-                        }
-
-                        if(clxnamemap.containsKey(keyls.get(i)))
-                        {
-                            int num=clxnamemap.get(keyls.get(i));
-
-                            if(namemap.containsKey(keyls.get(i)))
-                            {
-                                String[] temparr=namemap.get(keyls.get(i));
-                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-                               // clxmap.put(keyls.get(i),temparr);//
-                                clxls.add(temparr);
-                            }
-                        }
-
-                        if(fdjnamemap.containsKey(keyls.get(i)))
-                        {
-                            int num=fdjnamemap.get(keyls.get(i));
-
-                            if(namemap.containsKey(keyls.get(i)))
-                            {
-                                String[] temparr=namemap.get(keyls.get(i));
-                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-//                                fdjmap.put(keyls.get(i),temparr);//
-                                fdjls.add(temparr);
-                            }
-                        }
-
-                        if(phnamemap.containsKey(keyls.get(i)))
-                        {
-                            int num=phnamemap.get(keyls.get(i));
-
-                            if(namemap.containsKey(keyls.get(i)))
-                            {
-                                String[] temparr=namemap.get(keyls.get(i));
-                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-//                                phmap.put(keyls.get(i),temparr);//
-                                phls.add(temparr);
-                            }
-
-                        }
-
-                        if(yynamemap.containsKey(keyls.get(i)))
-                        {
-                            int num=yynamemap.get(keyls.get(i));
+                                for(WtTargetConfig wtc:wtcls)
+                                {
 
-                            if(namemap.containsKey(keyls.get(i)))
-                            {
-                                String[] temparr=namemap.get(keyls.get(i));
-                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-//                                yymap.put(keyls.get(i),temparr);//
-                                yyls.add(temparr);
-                            }
 
-                        }
+                                    if(StringUtils.notEmp(wtc.getUniformcode()))
+                                    {
+                                        codels.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, wtc.getUniformcode()).getCode());
+
+                                        WtTargetConfigVo vo=new WtTargetConfigVo();
+                                        vo.setCode(wtc.getCode());
+                                        vo.setModelid(wtc.getModelid());
+                                        vo.setName(wtc.getName());
+                                        vo.setPointtype(wtc.getPointtype());
+                                        vo.setTypes(wtc.getTypes());
+                                        vo.setUnit(wtc.getUnit());
+                                        vo.setRate(wtc.getRate());
+                                        vos.add(vo);
+                                    }
 
-                        if(jcnamemap.containsKey(keyls.get(i)))
-                        {
-                            int num=jcnamemap.get(keyls.get(i));
+                                }
 
-                            if(namemap.containsKey(keyls.get(i)))
-                            {
-                                String[] temparr=namemap.get(keyls.get(i));
-//                                if (keyls.get(i).equals("FDJZS")) {
-//                                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
-//                                    Double fdjzs = (zblist.get(num).getPointValueInDouble());
-//                                    if (model.getPowerproduction() == 2000) {
-//                                        temparr[3]=String.valueOf(StringUtils.round(fdjzs * 9.55, 2));
-//                                    } else {
-//                                        temparr[3]=String.valueOf(StringUtils.round(fdjzs, 2));
-//                                    }
-//                                }else{
-//                                    temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-//                                }
-                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
-//                                jcmap.put(keyls.get(i),temparr);//
-                                if(!jcls.contains(temparr))
+                                List<PointData> pols=  realApiUtil.getRealData(codels);
+                                if(!pols.isEmpty() && pols.size()==codels.size())
                                 {
-                                    jcls.add(temparr);
+                                    for( int i=0;i<vos.size();i++)
+                                    {
+                                        WtTargetConfigVo wtc=vos.get(i);
+                                        if(StringUtils.notEmp(wtc.getRate()))
+                                        {
+                                            PointData po=pols.get(i);
+                                            double rate=wtc.getRate();
+                                            double result=new BigDecimal(po.getPointValueInDouble()).multiply(new BigDecimal(rate)).doubleValue();
+                                            result= StringUtils.round(result,2);
+                                            wtc.setValue(result);
+                                        }
+
+                                    }
                                 }
 
                             }
-
-
+                            map.put(entry.getKey(), vos);
                         }
                     }
-
-/**************************************************************齿轮箱***********************************************************************************/
-
-
-
-/**************************************************************发电机***********************************************************************************/
-
-
-/**************************************************************偏航***********************************************************************************/
-
-/**************************************************************液压***********************************************************************************/
-
-
-
-
-/**************************************************************机舱***********************************************************************************/
-
-
-
-
- /**************************************************************基础指标***********************************************************************************/
-                }
-
-                if(InitialRunner.mlmap.containsKey(wt.getModelid()))
-                {
-                    Equipmentmodel model=InitialRunner.mlmap.get(wt.getModelid());
-                    jczbmap.put("zjrl",model.getPowerproduction());
-                  //  jczbmap.add(new String[]{"装机容量","","ai",String.valueOf(model.getPowerproduction())});
                 }
 
-                map.put("jczbmap", jczbmap);
-                map.put("bjmap", bjls);
-                map.put("clxmap", clxls);
-
-                map.put("fdjmap", fdjls);
-                map.put("phmap", phls);
-
-                map.put("yymap", yyls);
-                map.put("jcmap", jcls);
-
-/**********************************************************************************************************************************************************/
-
-
             }
 
 

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

@@ -125,7 +125,7 @@
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
 
-        <table tableName='t_sys_region' domainObjectName='SysRegion'/>
+        <table tableName='wttargetconfig' domainObjectName='WtTargetConfig'/>
 
 
     </context>

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

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