Browse Source

添加晋能首页新指标

shilin 2 years ago
parent
commit
1a3f7d02a4

+ 99 - 0
web/monitor-web-sxjn/src/main/java/com/gyee/frame/mapper/auto/CompanysPGMapper.java

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

+ 739 - 0
web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CompanysPG.java

@@ -0,0 +1,739 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class CompanysPG implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.aname
+     *
+     * @mbg.generated
+     */
+    private String aname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windcapacity
+     *
+     * @mbg.generated
+     */
+    private Double windcapacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windcapacityunit
+     *
+     * @mbg.generated
+     */
+    private String windcapacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windquantity
+     *
+     * @mbg.generated
+     */
+    private Integer windquantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.capacity
+     *
+     * @mbg.generated
+     */
+    private Double capacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.capacityunit
+     *
+     * @mbg.generated
+     */
+    private String capacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.quantityjz
+     *
+     * @mbg.generated
+     */
+    private Integer quantityjz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.quantityzc
+     *
+     * @mbg.generated
+     */
+    private Integer quantityzc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindcapacity
+     *
+     * @mbg.generated
+     */
+    private Double jrwindcapacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindcapacityunit
+     *
+     * @mbg.generated
+     */
+    private String jrwindcapacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindquantity
+     *
+     * @mbg.generated
+     */
+    private Integer jrwindquantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrcapacity
+     *
+     * @mbg.generated
+     */
+    private Double jrcapacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrcapacityunit
+     *
+     * @mbg.generated
+     */
+    private String jrcapacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrquantityjz
+     *
+     * @mbg.generated
+     */
+    private Integer jrquantityjz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrquantityzc
+     *
+     * @mbg.generated
+     */
+    private Integer jrquantityzc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.ordernum
+     *
+     * @mbg.generated
+     */
+    private Integer ordernum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windnumber
+     *
+     * @mbg.generated
+     */
+    private Integer windnumber;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.number
+     *
+     * @mbg.generated
+     */
+    private Integer number;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindnumber
+     *
+     * @mbg.generated
+     */
+    private Integer jrwindnumber;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrnumber
+     *
+     * @mbg.generated
+     */
+    private Integer jrnumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.id
+     *
+     * @return the value of companys.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.id
+     *
+     * @param id the value for companys.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 companys.name
+     *
+     * @return the value of companys.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.name
+     *
+     * @param name the value for companys.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 companys.aname
+     *
+     * @return the value of companys.aname
+     *
+     * @mbg.generated
+     */
+    public String getAname() {
+        return aname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.aname
+     *
+     * @param aname the value for companys.aname
+     *
+     * @mbg.generated
+     */
+    public void setAname(String aname) {
+        this.aname = aname == null ? null : aname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windcapacity
+     *
+     * @return the value of companys.windcapacity
+     *
+     * @mbg.generated
+     */
+    public Double getWindcapacity() {
+        return windcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windcapacity
+     *
+     * @param windcapacity the value for companys.windcapacity
+     *
+     * @mbg.generated
+     */
+    public void setWindcapacity(Double windcapacity) {
+        this.windcapacity = windcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windcapacityunit
+     *
+     * @return the value of companys.windcapacityunit
+     *
+     * @mbg.generated
+     */
+    public String getWindcapacityunit() {
+        return windcapacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windcapacityunit
+     *
+     * @param windcapacityunit the value for companys.windcapacityunit
+     *
+     * @mbg.generated
+     */
+    public void setWindcapacityunit(String windcapacityunit) {
+        this.windcapacityunit = windcapacityunit == null ? null : windcapacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windquantity
+     *
+     * @return the value of companys.windquantity
+     *
+     * @mbg.generated
+     */
+    public Integer getWindquantity() {
+        return windquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windquantity
+     *
+     * @param windquantity the value for companys.windquantity
+     *
+     * @mbg.generated
+     */
+    public void setWindquantity(Integer windquantity) {
+        this.windquantity = windquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.capacity
+     *
+     * @return the value of companys.capacity
+     *
+     * @mbg.generated
+     */
+    public Double getCapacity() {
+        return capacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.capacity
+     *
+     * @param capacity the value for companys.capacity
+     *
+     * @mbg.generated
+     */
+    public void setCapacity(Double capacity) {
+        this.capacity = capacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.capacityunit
+     *
+     * @return the value of companys.capacityunit
+     *
+     * @mbg.generated
+     */
+    public String getCapacityunit() {
+        return capacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.capacityunit
+     *
+     * @param capacityunit the value for companys.capacityunit
+     *
+     * @mbg.generated
+     */
+    public void setCapacityunit(String capacityunit) {
+        this.capacityunit = capacityunit == null ? null : capacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.quantityjz
+     *
+     * @return the value of companys.quantityjz
+     *
+     * @mbg.generated
+     */
+    public Integer getQuantityjz() {
+        return quantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.quantityjz
+     *
+     * @param quantityjz the value for companys.quantityjz
+     *
+     * @mbg.generated
+     */
+    public void setQuantityjz(Integer quantityjz) {
+        this.quantityjz = quantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.quantityzc
+     *
+     * @return the value of companys.quantityzc
+     *
+     * @mbg.generated
+     */
+    public Integer getQuantityzc() {
+        return quantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.quantityzc
+     *
+     * @param quantityzc the value for companys.quantityzc
+     *
+     * @mbg.generated
+     */
+    public void setQuantityzc(Integer quantityzc) {
+        this.quantityzc = quantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindcapacity
+     *
+     * @return the value of companys.jrwindcapacity
+     *
+     * @mbg.generated
+     */
+    public Double getJrwindcapacity() {
+        return jrwindcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindcapacity
+     *
+     * @param jrwindcapacity the value for companys.jrwindcapacity
+     *
+     * @mbg.generated
+     */
+    public void setJrwindcapacity(Double jrwindcapacity) {
+        this.jrwindcapacity = jrwindcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindcapacityunit
+     *
+     * @return the value of companys.jrwindcapacityunit
+     *
+     * @mbg.generated
+     */
+    public String getJrwindcapacityunit() {
+        return jrwindcapacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindcapacityunit
+     *
+     * @param jrwindcapacityunit the value for companys.jrwindcapacityunit
+     *
+     * @mbg.generated
+     */
+    public void setJrwindcapacityunit(String jrwindcapacityunit) {
+        this.jrwindcapacityunit = jrwindcapacityunit == null ? null : jrwindcapacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindquantity
+     *
+     * @return the value of companys.jrwindquantity
+     *
+     * @mbg.generated
+     */
+    public Integer getJrwindquantity() {
+        return jrwindquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindquantity
+     *
+     * @param jrwindquantity the value for companys.jrwindquantity
+     *
+     * @mbg.generated
+     */
+    public void setJrwindquantity(Integer jrwindquantity) {
+        this.jrwindquantity = jrwindquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrcapacity
+     *
+     * @return the value of companys.jrcapacity
+     *
+     * @mbg.generated
+     */
+    public Double getJrcapacity() {
+        return jrcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrcapacity
+     *
+     * @param jrcapacity the value for companys.jrcapacity
+     *
+     * @mbg.generated
+     */
+    public void setJrcapacity(Double jrcapacity) {
+        this.jrcapacity = jrcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrcapacityunit
+     *
+     * @return the value of companys.jrcapacityunit
+     *
+     * @mbg.generated
+     */
+    public String getJrcapacityunit() {
+        return jrcapacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrcapacityunit
+     *
+     * @param jrcapacityunit the value for companys.jrcapacityunit
+     *
+     * @mbg.generated
+     */
+    public void setJrcapacityunit(String jrcapacityunit) {
+        this.jrcapacityunit = jrcapacityunit == null ? null : jrcapacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrquantityjz
+     *
+     * @return the value of companys.jrquantityjz
+     *
+     * @mbg.generated
+     */
+    public Integer getJrquantityjz() {
+        return jrquantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrquantityjz
+     *
+     * @param jrquantityjz the value for companys.jrquantityjz
+     *
+     * @mbg.generated
+     */
+    public void setJrquantityjz(Integer jrquantityjz) {
+        this.jrquantityjz = jrquantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrquantityzc
+     *
+     * @return the value of companys.jrquantityzc
+     *
+     * @mbg.generated
+     */
+    public Integer getJrquantityzc() {
+        return jrquantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrquantityzc
+     *
+     * @param jrquantityzc the value for companys.jrquantityzc
+     *
+     * @mbg.generated
+     */
+    public void setJrquantityzc(Integer jrquantityzc) {
+        this.jrquantityzc = jrquantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.ordernum
+     *
+     * @return the value of companys.ordernum
+     *
+     * @mbg.generated
+     */
+    public Integer getOrdernum() {
+        return ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.ordernum
+     *
+     * @param ordernum the value for companys.ordernum
+     *
+     * @mbg.generated
+     */
+    public void setOrdernum(Integer ordernum) {
+        this.ordernum = ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windnumber
+     *
+     * @return the value of companys.windnumber
+     *
+     * @mbg.generated
+     */
+    public Integer getWindnumber() {
+        return windnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windnumber
+     *
+     * @param windnumber the value for companys.windnumber
+     *
+     * @mbg.generated
+     */
+    public void setWindnumber(Integer windnumber) {
+        this.windnumber = windnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.number
+     *
+     * @return the value of companys.number
+     *
+     * @mbg.generated
+     */
+    public Integer getNumber() {
+        return number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.number
+     *
+     * @param number the value for companys.number
+     *
+     * @mbg.generated
+     */
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindnumber
+     *
+     * @return the value of companys.jrwindnumber
+     *
+     * @mbg.generated
+     */
+    public Integer getJrwindnumber() {
+        return jrwindnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindnumber
+     *
+     * @param jrwindnumber the value for companys.jrwindnumber
+     *
+     * @mbg.generated
+     */
+    public void setJrwindnumber(Integer jrwindnumber) {
+        this.jrwindnumber = jrwindnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrnumber
+     *
+     * @return the value of companys.jrnumber
+     *
+     * @mbg.generated
+     */
+    public Integer getJrnumber() {
+        return jrnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrnumber
+     *
+     * @param jrnumber the value for companys.jrnumber
+     *
+     * @mbg.generated
+     */
+    public void setJrnumber(Integer jrnumber) {
+        this.jrnumber = jrnumber;
+    }
+}

File diff suppressed because it is too large
+ 1693 - 0
web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CompanysPGExample.java


+ 118 - 0
web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/CompanysPGService.java

@@ -0,0 +1,118 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.CompanysPGMapper;
+import com.gyee.frame.model.auto.CompanysPG;
+import com.gyee.frame.model.auto.CompanysPGExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 CompanysPGService
+ * @Title: CompanysPGService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class CompanysPGService implements BaseService<CompanysPG, CompanysPGExample> {
+	@Resource
+	private CompanysPGMapper companysPGMapper;
+	
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			CompanysPGExample example=new CompanysPGExample();
+			example.createCriteria().andIdIn(lista);
+			return companysPGMapper.deleteByExample(example);
+
+
+	}
+	
+	
+	@Override
+	public CompanysPG selectByPrimaryKey(String id) {
+				
+			return companysPGMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(CompanysPG record) {
+		return companysPGMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(CompanysPG record) {
+				
+
+				
+		return companysPGMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(CompanysPG record, CompanysPGExample example) {
+		
+		return companysPGMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(CompanysPG record, CompanysPGExample example) {
+		
+		return companysPGMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<CompanysPG> selectByExample(CompanysPGExample example) {
+		
+		return companysPGMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(CompanysPGExample example) {
+		
+		return companysPGMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(CompanysPGExample example) {
+		
+		return companysPGMapper.deleteByExample(example);
+	}
+	@DataSource(value = DataSourceType.SLAVE)
+	public List<CompanysPG> findCompanysPG() {
+
+		List<CompanysPG> list=new ArrayList<>();
+
+		CompanysPGExample example=new CompanysPGExample();
+		example.setOrderByClause(" id asc");
+
+		CompanysPGExample.Criteria criteria =example.createCriteria();
+		criteria.andIdEqualTo("QJNY");
+		list= companysPGMapper.selectByExample(example);
+		return list;
+
+	}
+
+
+
+}

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

@@ -1,7 +1,6 @@
 package com.gyee.frame.service.websocket;
 
 
-import com.gyee.frame.common.conf.AccessConfig;
 import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
@@ -51,6 +50,8 @@ public class GenreSetPushService {
     private PhotovoltaicTestingPointNewService photovoltaicTestingPointNewService;
     @Resource
     private RecommenmainService recommenmainService;
+    @Resource
+    private CompanysPGService companysPGService;
     private final String QY = "QY";
     private final String ZC = "ZC";
     private final String JZ = "JZ";
@@ -1748,6 +1749,10 @@ public class GenreSetPushService {
             Date beginDate = cal2.getTime();
             cal2.add(Calendar.DAY_OF_MONTH, 1);
             Date endDate = cal2.getTime();
+
+
+
+
 /*************************************************风场指标*************************************************************/
 
             Map<String, Object> fcmap = new HashMap<>();
@@ -1778,8 +1783,17 @@ public class GenreSetPushService {
                 }
 
 
-                double fd_zjrl=0;
-                double gf_zjrl=0;
+                double qjny_fd_zjrl=0;
+                double qjny_gf_zjrl=0;
+                double jr_fd_zjrl=0;
+                double jr_gf_zjrl=0;
+
+                double qjny_fcts=0;
+                double qjny_gfts=0;
+
+                double jr_fcts=0;
+                double jr_gfts=0;
+
                 double qjny_fj_ts=0;
                 double qjny_gf_zcts=0;
                 double qjny_gf_jzts=0;
@@ -1793,11 +1807,50 @@ public class GenreSetPushService {
                 double gf_r_ycdl=0;
                 double gf_y_ycdl=0;
 
-
+                double fd_r_fdl=0;
+                double fd_y_fdl=0;
+                double gf_r_fdl=0;
+                double gf_y_fdl=0;
+
+
+                List<CompanysPG> compgls= companysPGService.findCompanysPG();
+                if(!compgls.isEmpty())
+                {
+                    CompanysPG pg=compgls.get(0);
+
+                    //清洁能源风电装机容量
+                     qjny_fd_zjrl=null!=pg.getWindcapacity()?pg.getWindcapacity():0.0;
+                    //清洁能源光伏装机容量
+                     qjny_gf_zjrl=null!=pg.getCapacity()?pg.getCapacity():0.0;
+                    //接入风电装机容量
+                     jr_fd_zjrl=null!=pg.getJrwindcapacity()?pg.getJrwindcapacity():0.0;
+                    //接入光伏装机容量
+                     jr_gf_zjrl=null!=pg.getJrcapacity()?pg.getJrcapacity():0.0;
+                    //清洁能源风场数量
+                     qjny_fcts=null!=pg.getWindnumber()?pg.getWindnumber():0.0;
+                    //清洁能源光伏电站数量
+                     qjny_gfts=null!=pg.getNumber()?pg.getNumber():0.0;
+                    //接入风场数量
+                     jr_fcts=null!=pg.getJrwindnumber()?pg.getJrwindnumber():0.0;
+                    //接入光伏电站数量
+                     jr_gfts=null!=pg.getJrnumber()?pg.getJrnumber():0.0;
+                    //清洁能源风机数量
+                     qjny_fj_ts=null!=pg.getWindquantity()?pg.getWindquantity():0.0;
+                    //清洁能源光伏组串数量
+                     qjny_gf_zcts=null!=pg.getQuantityzc()?pg.getQuantityzc():0.0;
+                    //清洁能源光伏集中数量
+                     qjny_gf_jzts=null!=pg.getQuantityjz()?pg.getQuantityjz():0.0;
+                    //接入风机数量
+                     jr_fj_ts=null!=pg.getJrwindquantity()?pg.getJrwindquantity():0.0;
+                    //接入光伏组串数量
+                     jr_gf_zcts=null!=pg.getJrquantityzc()?pg.getJrquantityzc():0.0;
+                    //接入光伏集中数量
+                     jr_gf_jzts=null!=pg.getJrquantityjz()?pg.getJrquantityjz():0.0;
+                }
 
                 Calendar c = Calendar.getInstance();
 
-               c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+                c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
                 int daynum = c.get(Calendar.DAY_OF_MONTH);
 
                 Map<String, Double> sftjmap = new HashMap<>();//省份装机容量和台数统计
@@ -1810,23 +1863,25 @@ public class GenreSetPushService {
                     PointData rfdldata = realApiUtil.getRealData(rfdlpoint);
                     PointData yfdldata = realApiUtil.getRealData(yfdlpoint);
 
-                    double rfdl=MathUtil.twoBit(rfdldata.getPointValueInDouble()/1000);
-                    double yfdl=MathUtil.twoBit(yfdldata.getPointValueInDouble()/1000);
+                    double rfdl=MathUtil.twoBit(rfdldata.getPointValueInDouble()/10000);
+                    double yfdl=MathUtil.twoBit(yfdldata.getPointValueInDouble()/10000);
 
                     if(wp.getId().endsWith("FDC"))
                     {
                         fd_r_ycdl =fd_r_ycdl+(rfdl * YCFDLXS) ;
-
+                        fd_r_fdl =fd_r_fdl+rfdl;
                         c = Calendar.getInstance();
                         double yycfdl = (yfdl + fd_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
                         fd_y_ycdl=fd_y_ycdl+yycfdl;
+                        fd_y_fdl=fd_y_fdl+yfdl;
                     }else
                     {
                         gf_r_ycdl =gf_r_ycdl+(rfdl * YCFDLXS) ;
-
+                        gf_r_fdl =gf_r_fdl+rfdl ;
                         c = Calendar.getInstance();
                         double yycfdl = (yfdl + gf_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
                         gf_y_ycdl=gf_y_ycdl+yycfdl;
+                        gf_y_fdl=gf_y_fdl+yfdl;
                     }
 
 
@@ -1843,8 +1898,15 @@ public class GenreSetPushService {
 
                     if(wp.getId().endsWith("GDC") && InitialRunner.gp_sqmap.containsKey(wp.getId()))
                     {
+//                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                        {
+//                            jr_gf_zjrl=jr_gf_zjrl+wp.getCapacity();
+//                            jr_gfts=jr_gfts++;
+//                        }
+//
+//                        qjny_gf_zjrl=qjny_gf_zjrl+wp.getCapacity();
+//                        qjny_gfts=qjny_gfts++;
 
-                        gf_zjrl=gf_zjrl+wp.getCapacity();
                         List<Square> sqls=InitialRunner.gp_sqmap.get(wp.getId());
                         for(Square sq:sqls)
                         {
@@ -1858,11 +1920,14 @@ public class GenreSetPushService {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
 
-                                        qjny_gf_zcts=qjny_gf_zcts + nbqls.size();
-                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
-                                        {
-                                            jr_gf_zcts=jr_gf_zcts + nbqls.size();
-                                        }
+//                                        qjny_gf_zcts=qjny_gf_zcts + nbqls.size();
+//
+//
+//                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                                        {
+//                                            jr_gf_zcts=jr_gf_zcts + nbqls.size();
+//
+//                                         }
                                     }
 
                                     sftjmap.put(wp.getPhoto() + "_zc_zjts", temp);
@@ -1882,11 +1947,11 @@ public class GenreSetPushService {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
 
-                                        qjny_gf_jzts=qjny_gf_jzts + nbqls.size();
-                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
-                                        {
-                                            jr_gf_jzts=jr_gf_jzts + nbqls.size();
-                                        }
+//                                        qjny_gf_jzts=qjny_gf_jzts + nbqls.size();
+//                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                                        {
+//                                            jr_gf_jzts=jr_gf_jzts + nbqls.size();
+//                                        }
                                     }
                                     sftjmap.put(wp.getPhoto() + "_jz_zjts", temp);
                                 } else {
@@ -1911,12 +1976,19 @@ public class GenreSetPushService {
                             sftjmap.put(wp.getPhoto() + "_zjts", temp);
                         }
 
-                        fd_zjrl=fd_zjrl+wp.getCapacity();
-                        qjny_fj_ts=qjny_fj_ts + wp.getQuantity();
-                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
-                        {
-                            jr_fj_ts=jr_fj_ts + wp.getQuantity();
-                        }
+//                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                        {
+//                            jr_fd_zjrl=jr_fd_zjrl+wp.getCapacity();
+//                            jr_fjts=jr_fjts++;
+//                        }
+//                        qjny_fjts=qjny_fjts++;
+//                        qjny_fd_zjrl=qjny_fd_zjrl+wp.getCapacity();
+//
+//                        qjny_fj_ts=qjny_fj_ts + wp.getQuantity();
+//                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                        {
+//                            jr_fj_ts=jr_fj_ts + wp.getQuantity();
+//                        }
                     }
 
                 }
@@ -1925,8 +1997,17 @@ public class GenreSetPushService {
 
                 Map<String,Double> newpointmap=new HashMap<>();
 
-                newpointmap.put("fd_zjrl",StringUtils.round(fd_zjrl,2));
-                newpointmap.put("gf_zjrl",StringUtils.round(gf_zjrl,2));
+                newpointmap.put("jr_fd_zjrl",StringUtils.round(jr_fd_zjrl,2));
+                newpointmap.put("jr_fcts",StringUtils.round(jr_fcts,2));
+                newpointmap.put("qjny_fcts",StringUtils.round(qjny_fcts,2));
+                newpointmap.put("qjny_fd_zjrl",StringUtils.round(qjny_fd_zjrl,2));
+
+                newpointmap.put("jr_gf_zjrl",StringUtils.round(jr_gf_zjrl,2));
+                newpointmap.put("jr_gfts",StringUtils.round(jr_gfts,2));
+                newpointmap.put("qjny_gfts",StringUtils.round(qjny_gfts,2));
+                newpointmap.put("qjny_gf_zjrl",StringUtils.round(qjny_gf_zjrl,2));
+
+
                 newpointmap.put("qjny_fj_ts",StringUtils.round(qjny_fj_ts,2));
                 newpointmap.put("qjny_gf_zcts",StringUtils.round(qjny_gf_zcts,2));
                 newpointmap.put("qjny_gf_jzts",StringUtils.round(qjny_gf_jzts,2));
@@ -1937,6 +2018,13 @@ public class GenreSetPushService {
                 newpointmap.put("fd_y_ycdl",StringUtils.round(fd_y_ycdl,2));
                 newpointmap.put("gf_r_ycdl",StringUtils.round(gf_r_ycdl,2));
                 newpointmap.put("gf_y_ycdl",StringUtils.round(gf_y_ycdl,2));
+
+
+                newpointmap.put("fd_r_fdl",StringUtils.round(fd_r_fdl,2));
+                newpointmap.put("fd_y_fdl",StringUtils.round(fd_y_fdl,2));
+                newpointmap.put("gf_r_fdl",StringUtils.round(gf_r_fdl,2));
+                newpointmap.put("gf_y_fdl",StringUtils.round(gf_y_fdl,2));
+
                 map.put("newpointmap",newpointmap);
 //                for (Windpowerstation wp : wplist) {
 //

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

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

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

@@ -60,9 +60,9 @@
 
             <jdbcConnection
                     driverClass="org.postgresql.Driver"
-                    connectionURL="jdbc:postgresql://10.81.3.151:5432/wisdom"
-                    userId="gdprod"
-                    password="gd123">
+                    connectionURL="jdbc:postgresql://192.168.11.248:5432/postgres"
+                    userId="postgres"
+                    password="postgres">
             </jdbcConnection>
 
 <!--        <jdbcConnection-->
@@ -125,7 +125,7 @@
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
 
-        <table tableName='wttargetconfig' domainObjectName='WtTargetConfig'/>
+        <table tableName='companys' domainObjectName='CompanysPG'/>
 
 
     </context>

+ 551 - 0
web/monitor-web-sxjn/src/main/resources/mybatis/auto/CompanysPGMapper.xml

@@ -0,0 +1,551 @@
+<?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.CompanysPGMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="aname" jdbcType="VARCHAR" property="aname" />
+    <result column="windcapacity" jdbcType="NUMERIC" property="windcapacity" />
+    <result column="windcapacityunit" jdbcType="VARCHAR" property="windcapacityunit" />
+    <result column="windquantity" jdbcType="INTEGER" property="windquantity" />
+    <result column="capacity" jdbcType="NUMERIC" property="capacity" />
+    <result column="capacityunit" jdbcType="VARCHAR" property="capacityunit" />
+    <result column="quantityjz" jdbcType="INTEGER" property="quantityjz" />
+    <result column="quantityzc" jdbcType="INTEGER" property="quantityzc" />
+    <result column="jrwindcapacity" jdbcType="NUMERIC" property="jrwindcapacity" />
+    <result column="jrwindcapacityunit" jdbcType="VARCHAR" property="jrwindcapacityunit" />
+    <result column="jrwindquantity" jdbcType="INTEGER" property="jrwindquantity" />
+    <result column="jrcapacity" jdbcType="NUMERIC" property="jrcapacity" />
+    <result column="jrcapacityunit" jdbcType="VARCHAR" property="jrcapacityunit" />
+    <result column="jrquantityjz" jdbcType="INTEGER" property="jrquantityjz" />
+    <result column="jrquantityzc" jdbcType="INTEGER" property="jrquantityzc" />
+    <result column="ordernum" jdbcType="INTEGER" property="ordernum" />
+    <result column="windnumber" jdbcType="INTEGER" property="windnumber" />
+    <result column="number" jdbcType="INTEGER" property="number" />
+    <result column="jrwindnumber" jdbcType="INTEGER" property="jrwindnumber" />
+    <result column="jrnumber" jdbcType="INTEGER" property="jrnumber" />
+  </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, name, aname, windcapacity, windcapacityunit, windquantity, capacity, capacityunit, 
+    quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, 
+    jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, windnumber, number, jrwindnumber, 
+    jrnumber
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.CompanysPGExample" 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 companys
+    <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 companys
+    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 companys
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.CompanysPGExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from companys
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into companys (id, name, aname, 
+      windcapacity, windcapacityunit, windquantity, 
+      capacity, capacityunit, quantityjz, 
+      quantityzc, jrwindcapacity, jrwindcapacityunit, 
+      jrwindquantity, jrcapacity, jrcapacityunit, 
+      jrquantityjz, jrquantityzc, ordernum, 
+      windnumber, number, jrwindnumber, 
+      jrnumber)
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR}, 
+      #{windcapacity,jdbcType=NUMERIC}, #{windcapacityunit,jdbcType=VARCHAR}, #{windquantity,jdbcType=INTEGER}, 
+      #{capacity,jdbcType=NUMERIC}, #{capacityunit,jdbcType=VARCHAR}, #{quantityjz,jdbcType=INTEGER}, 
+      #{quantityzc,jdbcType=INTEGER}, #{jrwindcapacity,jdbcType=NUMERIC}, #{jrwindcapacityunit,jdbcType=VARCHAR}, 
+      #{jrwindquantity,jdbcType=INTEGER}, #{jrcapacity,jdbcType=NUMERIC}, #{jrcapacityunit,jdbcType=VARCHAR}, 
+      #{jrquantityjz,jdbcType=INTEGER}, #{jrquantityzc,jdbcType=INTEGER}, #{ordernum,jdbcType=INTEGER}, 
+      #{windnumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{jrwindnumber,jdbcType=INTEGER}, 
+      #{jrnumber,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into companys
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="aname != null">
+        aname,
+      </if>
+      <if test="windcapacity != null">
+        windcapacity,
+      </if>
+      <if test="windcapacityunit != null">
+        windcapacityunit,
+      </if>
+      <if test="windquantity != null">
+        windquantity,
+      </if>
+      <if test="capacity != null">
+        capacity,
+      </if>
+      <if test="capacityunit != null">
+        capacityunit,
+      </if>
+      <if test="quantityjz != null">
+        quantityjz,
+      </if>
+      <if test="quantityzc != null">
+        quantityzc,
+      </if>
+      <if test="jrwindcapacity != null">
+        jrwindcapacity,
+      </if>
+      <if test="jrwindcapacityunit != null">
+        jrwindcapacityunit,
+      </if>
+      <if test="jrwindquantity != null">
+        jrwindquantity,
+      </if>
+      <if test="jrcapacity != null">
+        jrcapacity,
+      </if>
+      <if test="jrcapacityunit != null">
+        jrcapacityunit,
+      </if>
+      <if test="jrquantityjz != null">
+        jrquantityjz,
+      </if>
+      <if test="jrquantityzc != null">
+        jrquantityzc,
+      </if>
+      <if test="ordernum != null">
+        ordernum,
+      </if>
+      <if test="windnumber != null">
+        windnumber,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="jrwindnumber != null">
+        jrwindnumber,
+      </if>
+      <if test="jrnumber != null">
+        jrnumber,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        #{aname,jdbcType=VARCHAR},
+      </if>
+      <if test="windcapacity != null">
+        #{windcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="windcapacityunit != null">
+        #{windcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="windquantity != null">
+        #{windquantity,jdbcType=INTEGER},
+      </if>
+      <if test="capacity != null">
+        #{capacity,jdbcType=NUMERIC},
+      </if>
+      <if test="capacityunit != null">
+        #{capacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="quantityjz != null">
+        #{quantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="quantityzc != null">
+        #{quantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindcapacity != null">
+        #{jrwindcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrwindcapacityunit != null">
+        #{jrwindcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrwindquantity != null">
+        #{jrwindquantity,jdbcType=INTEGER},
+      </if>
+      <if test="jrcapacity != null">
+        #{jrcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrcapacityunit != null">
+        #{jrcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrquantityjz != null">
+        #{jrquantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="jrquantityzc != null">
+        #{jrquantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=INTEGER},
+      </if>
+      <if test="windnumber != null">
+        #{windnumber,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindnumber != null">
+        #{jrwindnumber,jdbcType=INTEGER},
+      </if>
+      <if test="jrnumber != null">
+        #{jrnumber,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.CompanysPGExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from companys
+    <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 companys
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aname != null">
+        aname = #{record.aname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windcapacity != null">
+        windcapacity = #{record.windcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.windcapacityunit != null">
+        windcapacityunit = #{record.windcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windquantity != null">
+        windquantity = #{record.windquantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.capacity != null">
+        capacity = #{record.capacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.capacityunit != null">
+        capacityunit = #{record.capacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.quantityjz != null">
+        quantityjz = #{record.quantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="record.quantityzc != null">
+        quantityzc = #{record.quantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrwindcapacity != null">
+        jrwindcapacity = #{record.jrwindcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.jrwindcapacityunit != null">
+        jrwindcapacityunit = #{record.jrwindcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jrwindquantity != null">
+        jrwindquantity = #{record.jrwindquantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrcapacity != null">
+        jrcapacity = #{record.jrcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.jrcapacityunit != null">
+        jrcapacityunit = #{record.jrcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jrquantityjz != null">
+        jrquantityjz = #{record.jrquantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrquantityzc != null">
+        jrquantityzc = #{record.jrquantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="record.ordernum != null">
+        ordernum = #{record.ordernum,jdbcType=INTEGER},
+      </if>
+      <if test="record.windnumber != null">
+        windnumber = #{record.windnumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null">
+        number = #{record.number,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrwindnumber != null">
+        jrwindnumber = #{record.jrwindnumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrnumber != null">
+        jrnumber = #{record.jrnumber,jdbcType=INTEGER},
+      </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 companys
+    set id = #{record.id,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      aname = #{record.aname,jdbcType=VARCHAR},
+      windcapacity = #{record.windcapacity,jdbcType=NUMERIC},
+      windcapacityunit = #{record.windcapacityunit,jdbcType=VARCHAR},
+      windquantity = #{record.windquantity,jdbcType=INTEGER},
+      capacity = #{record.capacity,jdbcType=NUMERIC},
+      capacityunit = #{record.capacityunit,jdbcType=VARCHAR},
+      quantityjz = #{record.quantityjz,jdbcType=INTEGER},
+      quantityzc = #{record.quantityzc,jdbcType=INTEGER},
+      jrwindcapacity = #{record.jrwindcapacity,jdbcType=NUMERIC},
+      jrwindcapacityunit = #{record.jrwindcapacityunit,jdbcType=VARCHAR},
+      jrwindquantity = #{record.jrwindquantity,jdbcType=INTEGER},
+      jrcapacity = #{record.jrcapacity,jdbcType=NUMERIC},
+      jrcapacityunit = #{record.jrcapacityunit,jdbcType=VARCHAR},
+      jrquantityjz = #{record.jrquantityjz,jdbcType=INTEGER},
+      jrquantityzc = #{record.jrquantityzc,jdbcType=INTEGER},
+      ordernum = #{record.ordernum,jdbcType=INTEGER},
+      windnumber = #{record.windnumber,jdbcType=INTEGER},
+      number = #{record.number,jdbcType=INTEGER},
+      jrwindnumber = #{record.jrwindnumber,jdbcType=INTEGER},
+      jrnumber = #{record.jrnumber,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update companys
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        aname = #{aname,jdbcType=VARCHAR},
+      </if>
+      <if test="windcapacity != null">
+        windcapacity = #{windcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="windcapacityunit != null">
+        windcapacityunit = #{windcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="windquantity != null">
+        windquantity = #{windquantity,jdbcType=INTEGER},
+      </if>
+      <if test="capacity != null">
+        capacity = #{capacity,jdbcType=NUMERIC},
+      </if>
+      <if test="capacityunit != null">
+        capacityunit = #{capacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="quantityjz != null">
+        quantityjz = #{quantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="quantityzc != null">
+        quantityzc = #{quantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindcapacity != null">
+        jrwindcapacity = #{jrwindcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrwindcapacityunit != null">
+        jrwindcapacityunit = #{jrwindcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrwindquantity != null">
+        jrwindquantity = #{jrwindquantity,jdbcType=INTEGER},
+      </if>
+      <if test="jrcapacity != null">
+        jrcapacity = #{jrcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrcapacityunit != null">
+        jrcapacityunit = #{jrcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrquantityjz != null">
+        jrquantityjz = #{jrquantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="jrquantityzc != null">
+        jrquantityzc = #{jrquantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="ordernum != null">
+        ordernum = #{ordernum,jdbcType=INTEGER},
+      </if>
+      <if test="windnumber != null">
+        windnumber = #{windnumber,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindnumber != null">
+        jrwindnumber = #{jrwindnumber,jdbcType=INTEGER},
+      </if>
+      <if test="jrnumber != null">
+        jrnumber = #{jrnumber,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update companys
+    set name = #{name,jdbcType=VARCHAR},
+      aname = #{aname,jdbcType=VARCHAR},
+      windcapacity = #{windcapacity,jdbcType=NUMERIC},
+      windcapacityunit = #{windcapacityunit,jdbcType=VARCHAR},
+      windquantity = #{windquantity,jdbcType=INTEGER},
+      capacity = #{capacity,jdbcType=NUMERIC},
+      capacityunit = #{capacityunit,jdbcType=VARCHAR},
+      quantityjz = #{quantityjz,jdbcType=INTEGER},
+      quantityzc = #{quantityzc,jdbcType=INTEGER},
+      jrwindcapacity = #{jrwindcapacity,jdbcType=NUMERIC},
+      jrwindcapacityunit = #{jrwindcapacityunit,jdbcType=VARCHAR},
+      jrwindquantity = #{jrwindquantity,jdbcType=INTEGER},
+      jrcapacity = #{jrcapacity,jdbcType=NUMERIC},
+      jrcapacityunit = #{jrcapacityunit,jdbcType=VARCHAR},
+      jrquantityjz = #{jrquantityjz,jdbcType=INTEGER},
+      jrquantityzc = #{jrquantityzc,jdbcType=INTEGER},
+      ordernum = #{ordernum,jdbcType=INTEGER},
+      windnumber = #{windnumber,jdbcType=INTEGER},
+      number = #{number,jdbcType=INTEGER},
+      jrwindnumber = #{jrwindnumber,jdbcType=INTEGER},
+      jrnumber = #{jrnumber,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+
+
+  <select id="getCompanysPG"  resultType="com.gyee.frame.model.auto.CompanysPG">
+    select
+
+    <include refid="Base_Column_List" />
+    from companys  order by id
+
+  </select>
+
+</mapper>