Browse Source

修改导出的表头和连接的数据库

littleblue55 3 weeks ago
parent
commit
170c580cc4

+ 50 - 50
enteprise-admin/src/main/java/com/enteprise/industry_run/domain/EnterpriseBaseDataTotal.java

@@ -7,7 +7,7 @@ import com.enteprise.common.core.domain.BaseEntity;
 
 /**
  * industry_run对象 enterprise_base_data_total
- * 
+ *
  * @author ruoyi
  * @date 2024-11-13
  */
@@ -40,18 +40,18 @@ public class EnterpriseBaseDataTotal extends BaseEntity
     private Double landArea;
 
     /** 工业总产值 */
-    @Excel(name = "工业总产值")
+    @Excel(name = "工业总产值/万元")
     private Double totalIndustrialValue;
 
     /** 工业增加值 */
     private Double gdp;
 
     /** 应税收入 */
-    @Excel(name = "应税收入")
+    @Excel(name = "应税收入/万元")
     private Double taxableIncome;
 
     /** 实缴税金 */
-    @Excel(name = "实缴税金")
+    @Excel(name = "实缴税金/万元")
     private Double paidTax;
 
     /** 主营业务收入 */
@@ -67,111 +67,111 @@ public class EnterpriseBaseDataTotal extends BaseEntity
     private Double ownerEquity;
 
     /** 研发经费 */
-    @Excel(name = "研发经费")
+    @Excel(name = "研发经费/万元")
     private Double funding;
 
     /** 能源消费量 */
-    @Excel(name = "能源消费量")
+    @Excel(name = "能源消耗/万m³")
     private Double energyConsume;
 
     /** 用电量 */
-    @Excel(name = "用电量")
+    @Excel(name = "电力消耗/万KW·h")
     private Double powerConsume;
 
     /** 年份 */
-    @Excel(name = "年")
+    @Excel(name = "年")
     private String year;
 
     /** 季节 */
-    @Excel(name = "季")
+    @Excel(name = "季")
     private String season;
 
     /** 月份 */
     @Excel(name = "月份")
     private String month;
 
-    public void setId(Double id) 
+    public void setId(Double id)
     {
         this.id = id;
     }
 
-    public Double getId() 
+    public Double getId()
     {
         return id;
     }
-    public void setEnterpriseName(String enterpriseName) 
+    public void setEnterpriseName(String enterpriseName)
     {
         this.enterpriseName = enterpriseName;
     }
 
-    public String getEnterpriseName() 
+    public String getEnterpriseName()
     {
         return enterpriseName;
     }
-    public void setLocation(String location) 
+    public void setLocation(String location)
     {
         this.location = location;
     }
 
-    public String getLocation() 
+    public String getLocation()
     {
         return location;
     }
-    public void setIndustryName(String industryName) 
+    public void setIndustryName(String industryName)
     {
         this.industryName = industryName;
     }
 
-    public String getIndustryName() 
+    public String getIndustryName()
     {
         return industryName;
     }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
-    public void setMainBusiness(String mainBusiness) 
+    public void setMainBusiness(String mainBusiness)
     {
         this.mainBusiness = mainBusiness;
     }
 
-    public String getMainBusiness() 
+    public String getMainBusiness()
     {
         return mainBusiness;
     }
-    public void setLandArea(Double landArea) 
+    public void setLandArea(Double landArea)
     {
         this.landArea = landArea;
     }
 
-    public Double getLandArea() 
+    public Double getLandArea()
     {
         return landArea;
     }
-    public void setTotalIndustrialValue(Double totalIndustrialValue) 
+    public void setTotalIndustrialValue(Double totalIndustrialValue)
     {
         this.totalIndustrialValue = totalIndustrialValue;
     }
 
-    public Double getTotalIndustrialValue() 
+    public Double getTotalIndustrialValue()
     {
         return totalIndustrialValue;
     }
-    public void setGdp(Double gdp) 
+    public void setGdp(Double gdp)
     {
         this.gdp = gdp;
     }
 
-    public Double getGdp() 
+    public Double getGdp()
     {
         return gdp;
     }
-    public void setTaxableIncome(Double taxableIncome) 
+    public void setTaxableIncome(Double taxableIncome)
     {
         this.taxableIncome = taxableIncome;
     }
@@ -180,102 +180,102 @@ public class EnterpriseBaseDataTotal extends BaseEntity
     {
         return taxableIncome;
     }
-    public void setPaidTax(Double paidTax) 
+    public void setPaidTax(Double paidTax)
     {
         this.paidTax = paidTax;
     }
 
-    public Double getPaidTax() 
+    public Double getPaidTax()
     {
         return paidTax;
     }
-    public void setMainBusinessIncome(Double mainBusinessIncome) 
+    public void setMainBusinessIncome(Double mainBusinessIncome)
     {
         this.mainBusinessIncome = mainBusinessIncome;
     }
 
-    public Double getMainBusinessIncome() 
+    public Double getMainBusinessIncome()
     {
         return mainBusinessIncome;
     }
-    public void setEmployeeNumber(Double employeeNumber) 
+    public void setEmployeeNumber(Double employeeNumber)
     {
         this.employeeNumber = employeeNumber;
     }
 
-    public Double getEmployeeNumber() 
+    public Double getEmployeeNumber()
     {
         return employeeNumber;
     }
-    public void setProfit(Double profit) 
+    public void setProfit(Double profit)
     {
         this.profit = profit;
     }
 
-    public Double getProfit() 
+    public Double getProfit()
     {
         return profit;
     }
-    public void setOwnerEquity(Double ownerEquity) 
+    public void setOwnerEquity(Double ownerEquity)
     {
         this.ownerEquity = ownerEquity;
     }
 
-    public Double getOwnerEquity() 
+    public Double getOwnerEquity()
     {
         return ownerEquity;
     }
-    public void setFunding(Double funding) 
+    public void setFunding(Double funding)
     {
         this.funding = funding;
     }
 
-    public Double getFunding() 
+    public Double getFunding()
     {
         return funding;
     }
-    public void setEnergyConsume(Double energyConsume) 
+    public void setEnergyConsume(Double energyConsume)
     {
         this.energyConsume = energyConsume;
     }
 
-    public Double getEnergyConsume() 
+    public Double getEnergyConsume()
     {
         return energyConsume;
     }
-    public void setPowerConsume(Double powerConsume) 
+    public void setPowerConsume(Double powerConsume)
     {
         this.powerConsume = powerConsume;
     }
 
-    public Double getPowerConsume() 
+    public Double getPowerConsume()
     {
         return powerConsume;
     }
-    public void setYear(String year) 
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public String getYear() 
+    public String getYear()
     {
         return year;
     }
-    public void setSeason(String season) 
+    public void setSeason(String season)
     {
         this.season = season;
     }
 
-    public String getSeason() 
+    public String getSeason()
     {
         return season;
     }
-    public void setMonth(String month) 
+    public void setMonth(String month)
     {
         this.month = month;
     }
 
-    public String getMonth() 
+    public String getMonth()
     {
         return month;
     }

+ 2 - 2
enteprise-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/enterprise?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://139.9.50.163:3306/enterprise?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: ydl@123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭