机组报价

xxgl-admin/src/main/java/com/miaxis/pc/controller/TestController.java

@@ -0,0 +1,16 @@
+package com.miaxis.pc.controller;
+
+import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import facebook4j.FacebookFactory;
+import facebook4j.auth.AccessToken;
+
+public class TestController {
+
+    public static void main(String[] args) throws FacebookException {
+        Facebook facebook = new FacebookFactory().getInstance();
+        facebook.setOAuthAppId("651919230037245", "6d7eee4c7639eeab60f9229639a4bcd8");
+        AccessToken accessToken = facebook.getOAuthAppAccessToken();
+        System.out.println(accessToken.getToken());
+    }
+}

xxgl-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -1,6 +1,10 @@
 package com.miaxis.test;
 
 import com.miaxis.XxglApplication;
+import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import facebook4j.FacebookFactory;
+import facebook4j.auth.AccessToken;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,6 +19,8 @@ public class NormalTest {
     @Test
     public void test1() throws Exception {
 
+
+
     }
 
 
@@ -30,4 +36,6 @@ public class NormalTest {
 
 
 
+
+
 }

xxgl-common/pom.xml

@@ -152,6 +152,19 @@
             <version>5.6.38</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.facebook4j</groupId>
+            <artifactId>facebook4j-core</artifactId>
+            <version>[2.4,)</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>8.3.3</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <!--腾讯云sdk依赖,排除log4j依赖，解决与框架中logback的冲突-->
         <dependency>
             <groupId>com.qcloud</groupId>

xxgl-service/src/main/java/com/miaxis/price/domain/PriceInfo.java

@@ -45,200 +45,183 @@ public class PriceInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "机组功率(kva)")
     private BigDecimal unitPowerKva;
 
+    /** 机组功率(kw) */
+    @Excel(name = "机组备用功率(kw)", sort=4)
+    @TableField("unit_power_kw_spare")
+    @ApiModelProperty(value = "机组备用功率(kw)")
+    private BigDecimal unitPowerKwSpare;
+
+    /** 机组功率(kva) */
+    @Excel(name = "机组备用功率(kva)", sort=5)
+    @TableField("unit_power_kva_spare")
+    @ApiModelProperty(value = "机组备用功率(kva)")
+    private BigDecimal unitPowerKvaSpare;
+
+
     /** 频率(Hz) */
-    @Excel(name = "频率(Hz)", sort=4)
+    @Excel(name = "频率(Hz)", sort=6)
     @TableField("rate")
     @ApiModelProperty(value = "频率(Hz)")
     private Integer rate;
 
     /** 动力品牌 */
-    @Excel(name = "动力品牌", sort=5)
+    @Excel(name = "动力品牌", sort=7)
     @TableField("brand")
     @ApiModelProperty(value = "动力品牌")
     private String brand;
 
     /** 柴油机型号 */
-    @Excel(name = "柴油机型号", sort=6)
+    @Excel(name = "柴油机型号", sort=8)
     @TableField("diesel_engine_model")
     @ApiModelProperty(value = "柴油机型号")
     private String dieselEngineModel;
 
     /** 转速 */
-    @Excel(name = "转速", sort=7)
+    @Excel(name = "转速", sort=9)
     @TableField("speed")
     @ApiModelProperty(value = "转速")
     private Integer speed;
 
     /** 动力价格 */
-    @Excel(name = "动力价格", sort=8)
+    @Excel(name = "动力价格", sort=10)
     @TableField("power_price")
     @ApiModelProperty(value = "动力价格")
     private BigDecimal powerPrice;
 
     /** 发电机型号(仿斯坦福) */
-    @Excel(name = "发电机型号(仿斯坦福)", sort=9)
+    @Excel(name = "发电机型号(仿斯坦福)", sort=11)
     @TableField("generator_model_fstf")
     @ApiModelProperty(value = "发电机型号(仿斯坦福)")
     private String generatorModelFstf;
 
     /** 发电机价格(仿斯坦福) */
-    @Excel(name = "发电机价格(仿斯坦福)", sort=10)
+    @Excel(name = "发电机价格(仿斯坦福)", sort=12)
     @TableField("generator_price_fstf")
     @ApiModelProperty(value = "发电机价格(仿斯坦福)")
     private BigDecimal generatorPriceFstf;
 
     /** 发电机型号(斯坦福) */
-    @Excel(name = "发电机型号(斯坦福)", sort=11)
+    @Excel(name = "发电机型号(斯坦福)", sort=13)
     @TableField("generator_model_stf")
     @ApiModelProperty(value = "发电机型号(斯坦福)")
     private String generatorModelStf;
 
     /** 发电机价格(斯坦福) */
-    @Excel(name = "发电机价格(斯坦福)", sort=12)
+    @Excel(name = "发电机价格(斯坦福)", sort=14)
     @TableField("generator_price_stf")
     @ApiModelProperty(value = "发电机价格(斯坦福)")
     private BigDecimal generatorPriceStf;
 
     /** 发电机型号(利来森马) */
-    @Excel(name = "发电机型号(利来森马)", sort=13)
+    @Excel(name = "发电机型号(利来森马)", sort=15)
     @TableField("generator_model_llsm")
     @ApiModelProperty(value = "发电机型号(利来森马)")
     private String generatorModelLlsm;
 
     /** 发电机价格(利来森马) */
-    @Excel(name = "发电机价格(利来森马)", sort=14)
+    @Excel(name = "发电机价格(利来森马)", sort=16)
     @TableField("generator_price_llsm")
     @ApiModelProperty(value = "发电机价格(利来森马)")
     private BigDecimal generatorPriceLlsm;
 
     /** 发电机型号(马拉松) */
-    @Excel(name = "发电机型号(马拉松)", sort=15)
+    @Excel(name = "发电机型号(马拉松)", sort=17)
     @TableField("generator_model_mls")
     @ApiModelProperty(value = "发电机型号(马拉松)")
     private String generatorModelMls;
 
     /** 发电机价格(马拉松) */
-    @Excel(name = "发电机价格(马拉松)", sort=16)
+    @Excel(name = "发电机价格(马拉松)", sort=18)
     @TableField("generator_price_mls")
     @ApiModelProperty(value = "发电机价格(马拉松)")
     private BigDecimal generatorPriceMls;
 
     /** 发电机型号(美迪奥) */
-    @Excel(name = "发电机型号(美迪奥)", sort=17)
+    @Excel(name = "发电机型号(美迪奥)", sort=19)
     @TableField("generator_model_mda")
     @ApiModelProperty(value = "发电机型号(美迪奥)")
     private String generatorModelMda;
 
     /** 发电机价格(美迪奥) */
-    @Excel(name = "发电机价格(美迪奥)", sort=18)
+    @Excel(name = "发电机价格(美迪奥)", sort=20)
     @TableField("generator_price_mda")
     @ApiModelProperty(value = "发电机价格(美迪奥)")
     private BigDecimal generatorPriceMda;
 
     /** 静音机壳价格 */
-    @Excel(name = "静音机壳价格", sort=19)
+    @Excel(name = "静音机壳价格", sort=21)
     @TableField("mute_price")
     @ApiModelProperty(value = "静音机壳价格")
     private BigDecimal mutePrice;
 
     /** 开架价格 */
-    @Excel(name = "开架价格", sort=20)
+    @Excel(name = "开架价格", sort=22)
     @TableField("open_price")
     @ApiModelProperty(value = "开架价格")
     private BigDecimal openPrice;
 
     /** ATS型号 */
-    @Excel(name = "ATS型号", sort=21)
+    @Excel(name = "ATS型号", sort=23)
     @TableField("ats_model")
     @ApiModelProperty(value = "ATS型号")
     private String atsModel;
 
     /** ATS价格 */
-    @Excel(name = "ATS价格", sort=22)
+    @Excel(name = "ATS价格", sort=24)
     @TableField("ats_price")
     @ApiModelProperty(value = "ATS价格")
     private BigDecimal atsPrice;
 
     /** 电瓶型号 */
-    @Excel(name = "电瓶型号", sort=23)
+    @Excel(name = "电瓶型号", sort=25)
     @TableField("battery_model")
     @ApiModelProperty(value = "电瓶型号")
     private String batteryModel;
 
     /** 电瓶价格 */
-    @Excel(name = "电瓶价格", sort=24)
+    @Excel(name = "电瓶价格", sort=26)
     @TableField("battery_price")
     @ApiModelProperty(value = "电瓶价格")
     private BigDecimal batteryPrice;
 
-    /** 合计含税成本(静音配仿斯坦福) */
-    @Excel(name = "合计含税成本(静音配仿斯坦福)", sort=25)
-    @TableField("total_cost_mute_fstf")
-    @ApiModelProperty(value = "合计含税成本(静音配仿斯坦福)")
-    private BigDecimal totalCostMuteFstf;
-
-    /** 合计含税成本(开架配仿斯坦福) */
-    @Excel(name = "合计含税成本(开架配仿斯坦福)", sort=26)
-    @TableField("total_cost_open_fstf")
-    @ApiModelProperty(value = "合计含税成本(开架配仿斯坦福)")
-    private BigDecimal totalCostOpenFstf;
-
-    /** 合计含税成本(静音配斯坦福) */
-    @Excel(name = "合计含税成本(静音配斯坦福)", sort=27)
-    @TableField("total_cost_mute_stf")
-    @ApiModelProperty(value = "合计含税成本(静音配斯坦福)")
-    private BigDecimal totalCostMuteStf;
-
-    /** 合计含税成本(开架配斯坦福) */
-    @Excel(name = "合计含税成本(开架配斯坦福)", sort=28)
-    @TableField("total_cost_open_stf")
-    @ApiModelProperty(value = "合计含税成本(开架配斯坦福)")
-    private BigDecimal totalCostOpenStf;
-
-    /** 合计含税成本(静音配利来森马) */
-    @Excel(name = "合计含税成本(静音配利来森马)", sort=29)
-    @TableField("total_cost_mute_llsm")
-    @ApiModelProperty(value = "合计含税成本(静音配利来森马)")
-    private BigDecimal totalCostMuteLlsm;
-
-    /** 合计含税成本(开架配利来森马) */
-    @Excel(name = "合计含税成本(开架配利来森马)", sort=30)
-    @TableField("total_cost_open_llsm")
-    @ApiModelProperty(value = "合计含税成本(开架配利来森马)")
-    private BigDecimal totalCostOpenLlsm;
-
-    /** 合计含税成本(静音配马拉松) */
-    @Excel(name = "合计含税成本(静音配马拉松)", sort=31)
-    @TableField("total_cost_mute_mls")
-    @ApiModelProperty(value = "合计含税成本(静音配马拉松)")
-    private BigDecimal totalCostMuteMls;
-
-    /** 合计含税成本(开架配马拉松) */
-    @Excel(name = "合计含税成本(开架配马拉松)", sort=32)
-    @TableField("total_cost_open_mls")
-    @ApiModelProperty(value = "合计含税成本(开架配马拉松)")
-    private BigDecimal totalCostOpenMls;
-
-    /** 合计含税成本(静音配美迪奥) */
-    @Excel(name = "合计含税成本(静音配美迪奥)", sort=33)
-    @TableField("total_cost_mute_mda")
-    @ApiModelProperty(value = "合计含税成本(静音配美迪奥)")
-    private BigDecimal totalCostMuteMda;
-
-    /** 合计含税成本(开架配美迪奥) */
-    @Excel(name = "合计含税成本(开架配美迪奥)", sort=34)
-    @TableField("total_cost_open_mda")
-    @ApiModelProperty(value = "合计含税成本(开架配美迪奥)")
-    private BigDecimal totalCostOpenMda;
+//    /** 合计含税成本(静音配仿斯坦福) */
+//    @Excel(name = "合计含税成本(配仿斯坦福)", sort=27)
+//    @TableField("total_cost_mute_fstf")
+//    @ApiModelProperty(value = "合计含税成本(配仿斯坦福)")
+//    private BigDecimal totalCostMuteFstf;
+//
+//    /** 合计含税成本(开架配仿斯坦福) */
+//    @Excel(name = "合计含税成本(开架配仿斯坦福)", sort=28)
+//    @TableField("total_cost_open_fstf")
+//    @ApiModelProperty(value = "合计含税成本(配仿斯坦福)")
+//    private BigDecimal totalCostOpenFstf;
+//
+//    /** 合计含税成本(静音配斯坦福) */
+//    @Excel(name = "合计含税成本(静音配斯坦福)", sort=29)
+//    @TableField("total_cost_mute_stf")
+//    @ApiModelProperty(value = "合计含税成本(配斯坦福)")
+//    private BigDecimal totalCostMuteStf;
+//
+//    /** 合计含税成本(开架配斯坦福) */
+//    @Excel(name = "合计含税成本(开架配斯坦福)", sort=30)
+//    @TableField("total_cost_open_stf")
+//    @ApiModelProperty(value = "合计含税成本(配斯坦福)")
+//    private BigDecimal totalCostOpenStf;
+//
+//    /** 合计含税成本(静音配利来森马) */
+//    @Excel(name = "合计含税成本(静音配利来森马)", sort=31)
+//    @TableField("total_cost_mute_llsm")
+//    @ApiModelProperty(value = "合计含税成本(配利来森马)")
+//    private BigDecimal totalCostMuteLlsm;
 
     /** 静音尺寸（长/宽/高/重量） */
-    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=35)
+    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=27)
     @TableField("mute_parms")
     @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
     private String muteParms;
 
     /** 静音尺寸（长/宽/高/重量） */
-    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=36)
+    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=28)
     @TableField("open_parms")
     @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
     private String openParms;

xxgl-service/src/main/resources/mapper/price/PriceInfoMapper.xml

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unitModel"    column="unit_model"    />
         <result property="unitPowerKw"    column="unit_power_kw"    />
         <result property="unitPowerKva"    column="unit_power_kva"    />
+        <result property="unitPowerKwSpare"    column="unit_power_kw_spare"    />
+        <result property="unitPowerKvaSpare"    column="unit_power_kva_spare"    />
         <result property="rate"    column="rate"    />
         <result property="brand"    column="brand"    />
         <result property="dieselEngineModel"    column="diesel_engine_model"    />
@@ -29,16 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="atsPrice"    column="ats_price"    />
         <result property="batteryModel"    column="battery_model"    />
         <result property="batteryPrice"    column="battery_price"    />
-        <result property="totalCostMuteFstf"    column="total_cost_mute_fstf"    />
-        <result property="totalCostOpenFstf"    column="total_cost_open_fstf"    />
-        <result property="totalCostMuteStf"    column="total_cost_mute_stf"    />
-        <result property="totalCostOpenStf"    column="total_cost_open_stf"    />
-        <result property="totalCostMuteLlsm"    column="total_cost_mute_llsm"    />
-        <result property="totalCostOpenLlsm"    column="total_cost_open_llsm"    />
-        <result property="totalCostMuteMls"    column="total_cost_mute_mls"    />
-        <result property="totalCostOpenMls"    column="total_cost_open_mls"    />
-        <result property="totalCostMuteMda"    column="total_cost_mute_mda"    />
-        <result property="totalCostOpenMda"    column="total_cost_open_mda"    />
+
         <result property="muteParms"    column="mute_parms"    />
         <result property="openParms"    column="open_parms"    />
         <result property="updateTime"    column="update_time"    />
@@ -80,16 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="atsPrice != null "> and ats_price = #{atsPrice}</if>
             <if test="batteryModel != null  and batteryModel != ''"> and battery_model = #{batteryModel}</if>
             <if test="batteryPrice != null "> and battery_price = #{batteryPrice}</if>
-            <if test="totalCostMuteFstf != null "> and total_cost_mute_fstf = #{totalCostMuteFstf}</if>
-            <if test="totalCostOpenFstf != null "> and total_cost_open_fstf = #{totalCostOpenFstf}</if>
-            <if test="totalCostMuteStf != null "> and total_cost_mute_stf = #{totalCostMuteStf}</if>
-            <if test="totalCostOpenStf != null "> and total_cost_open_stf = #{totalCostOpenStf}</if>
-            <if test="totalCostMuteLlsm != null "> and total_cost_mute_llsm = #{totalCostMuteLlsm}</if>
-            <if test="totalCostOpenLlsm != null "> and total_cost_open_llsm = #{totalCostOpenLlsm}</if>
-            <if test="totalCostMuteMls != null "> and total_cost_mute_mls = #{totalCostMuteMls}</if>
-            <if test="totalCostOpenMls != null "> and total_cost_open_mls = #{totalCostOpenMls}</if>
-            <if test="totalCostMuteMda != null "> and total_cost_mute_mda = #{totalCostMuteMda}</if>
-            <if test="totalCostOpenMda != null "> and total_cost_open_mda = #{totalCostOpenMda}</if>
+
             <if test="muteParms != null  and muteParms != ''"> and mute_parms = #{muteParms}</if>
             <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
         </where>