Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-orangeheap/src/components/Mine.vue

@@ -35,7 +35,7 @@
     export default {
         name: 'Mine',
         data: () => ({
-            userName: "杨铖的号头"
+            userName: "Admin"
         })
 
         //

atms-orangeheap/src/components/Panel.vue

@@ -97,79 +97,93 @@
                 {
                     iconName: '#d-iconyihuankuanbufen',
                     active: false,
-                    title: '未返还税金分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/1.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax',
+                    title: '税种未返还税金分析',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
+                },
+                {
+                    iconName: '#d-iconyihuankuanbufen',
+                    active: false,
+                    title: '地区未返还税金分析',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauDistrictUnreturnedTax',
                 },
                 {
                     iconName: '#d-iconCompare',
                     active: false,
                     title: '未返还/返还后税金比较',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/2.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'taxComparison',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauUnreturnedAndReturnedTax',
+                },
+                {
+                    iconName: '#d-iconCompare',
+                    active: false,
+                    title: '费用分析',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauCostAnalysis',
+                },
+                {
+                    iconName: '#d-iconhuaban',
+                    active: false,
+                    title: '地区利润总额/亏损额',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauDistrictProfitAndLoss',
                 },
                 {
                     iconName: '#d-iconhuaban',
                     active: false,
-                    title: '利润/亏损分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'profitAndLoss',
+                    title: '公司利润总额/亏损额',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauCompanyProfitAndLoss',
                 },
                 {
                     iconName: '#d-iconqita1',
                     active: false,
-                    title: '其他国内数据',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'otherDomesticData',
+                    title: '司机/员工人数',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauDriverAndEmployee',
                 },
                 {
-                    iconName: '#d-iconarchive-paper',
+                    iconName: '#d-iconqita1',
+                    active: false,
+                    title: '业务线GMV及补贴统计',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauGmvAndSubsidy',
+                },
+                {
+                    iconName: '#d-iconqita1',
                     active: false,
                     title: '档案归档情况',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'docSituation',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauFileArrangement',
                 },
                 {
-                    iconName: '#d-iconfeiyong',
+                    iconName: '#d-iconqita1',
                     active: false,
-                    title: '费用分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/3.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'costAnalysis',
+                    title: '国际税全球概览',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauGlobalOverview',
                 },
+
                 {
-                    iconName: '#d-iconquanqiu',
+                    iconName: '#d-iconqita1',
                     active: false,
-                    title: '全球概览',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'globalOverview',
+                    title: '国际税业务数据',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauGlobalBusiness',
                 },
                 {
                     iconName: "#d-iconmexico",
                     active: false,
                     title: '墨西哥税务分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'mexicanTax',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauMexicanTax',
                 },
                 {
                     iconName: '#d-iconaodaliya',
                     active: false,
                     title: '澳洲税务分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'australianTax',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauAustralianTax',
                 },
                 {
                     iconName: '#d-iconbaxi',
                     active: false,
                     title: '巴西税务分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'brazilianTax',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauBrazilianTax',
                 },
                 {
                     iconName: '#d-iconqita',
                     active: false,
                     title: '其他国家税务分析',
-                    avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
-                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'otherCountries',
+                    chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauOtherTaxAnalysis',
                 },
             ],
             selectedItem: null

atms-web/src/main/java/pwc/taxtech/atms/web/OrangeHeapConfig.java

@@ -15,31 +15,54 @@ public class OrangeHeapConfig {
     //tableau相关配置
     @Value("${tableau_get_ticket}")
     private String tableauGetTicket;
-    @Value("${tableau_unreturned_tax}")
-    private String tableauUnreturnedTax;
-    @Value("${tableau_tax_comparison}")
-    private String tableauTaxComparison;
-    @Value("${tableau_other_countries}")
-    private String tableauOtherCountries;
+
+    @Value("${tableau_tax_category_unreturned_tax}")
+    private String tableauTaxCategoryUnreturnedTax;
+
+    @Value("${tableau_district_unreturned_tax}")
+    private String tableauDistrictUnreturnedTax;
+
+    @Value("${tableau_unreturned_and_returned_tax}")
+    private String tableauUnreturnedAndReturnedTax;
+
     @Value("${tableau_cost_analysis}")
     private String tableauCostAnalysis;
-    @Value("${tableau_profit_and_loss}")
-    private String tableauProfitAndLoss;
-    @Value("${tableau_other_domestic_data}")
-    private String tableauOtherDomesticData;
-    @Value("${tableau_doc_situation}")
-    private String tableauDocSituation;
+
+    @Value("${tableau_district_profit_and_loss}")
+    private String tableauDistrictProfitAndLoss;
+
+    @Value("${tableau_company_profit_and_loss}")
+    private String tableauCompanyProfitAndLoss;
+
+    @Value("${tableau_driver_and_employee}")
+    private String tableauDriverAndEmployee;
+
+    @Value("${tableau_gmv_and_subsidy}")
+    private String tableauGmvAndSubsidy;
+
+    @Value("${tableau_file_arrangement}")
+    private String tableauFileArrangement;
+
     @Value("${tableau_global_overview}")
     private String tableauGlobalOverview;
+
+    @Value("${tableau_global_business}")
+    private String tableauGlobalBusiness;
+
     @Value("${tableau_mexican_tax}")
     private String tableauMexicanTax;
+
     @Value("${tableau_australian_tax}")
     private String tableauAustralianTax;
+
     @Value("${tableau_brazilian_tax}")
     private String tableauBrazilianTax;
 
+    @Value("${tableau_other_tax_analysis}")
+    private String tableauOtherTaxAnalysis;
+
     public String getLongiApiBasicUser() {
-        return this.longiApiBasicUser;
+        return longiApiBasicUser;
     }
 
     public void setLongiApiBasicUser(String longiApiBasicUser) {
@@ -47,7 +70,7 @@ public class OrangeHeapConfig {
     }
 
     public String getLongiApiBasicPwd() {
-        return this.longiApiBasicPwd;
+        return longiApiBasicPwd;
     }
 
     public void setLongiApiBasicPwd(String longiApiBasicPwd) {
@@ -55,7 +78,7 @@ public class OrangeHeapConfig {
     }
 
     public String getLongiApiGlBalance() {
-        return this.longiApiGlBalance;
+        return longiApiGlBalance;
     }
 
     public void setLongiApiGlBalance(String longiApiGlBalance) {
@@ -63,79 +86,103 @@ public class OrangeHeapConfig {
     }
 
     public String getTableauGetTicket() {
-        return this.tableauGetTicket;
+        return tableauGetTicket;
     }
 
     public void setTableauGetTicket(String tableauGetTicket) {
         this.tableauGetTicket = tableauGetTicket;
     }
 
-    public String getTableauUnreturnedTax() {
-        return this.tableauUnreturnedTax;
+    public String getTableauTaxCategoryUnreturnedTax() {
+        return tableauTaxCategoryUnreturnedTax;
     }
 
-    public void setTableauUnreturnedTax(String tableauUnreturnedTax) {
-        this.tableauUnreturnedTax = tableauUnreturnedTax;
+    public void setTableauTaxCategoryUnreturnedTax(String tableauTaxCategoryUnreturnedTax) {
+        this.tableauTaxCategoryUnreturnedTax = tableauTaxCategoryUnreturnedTax;
     }
 
-    public String getTableauTaxComparison() {
-        return this.tableauTaxComparison;
+    public String getTableauDistrictUnreturnedTax() {
+        return tableauDistrictUnreturnedTax;
     }
 
-    public void setTableauTaxComparison(String tableauTaxComparison) {
-        this.tableauTaxComparison = tableauTaxComparison;
+    public void setTableauDistrictUnreturnedTax(String tableauDistrictUnreturnedTax) {
+        this.tableauDistrictUnreturnedTax = tableauDistrictUnreturnedTax;
     }
 
-    public String getTableauOtherCountries() {
-        return this.tableauOtherCountries;
+    public String getTableauUnreturnedAndReturnedTax() {
+        return tableauUnreturnedAndReturnedTax;
     }
 
-    public void setTableauOtherCountries(String tableauOtherCountries) {
-        this.tableauOtherCountries = tableauOtherCountries;
+    public void setTableauUnreturnedAndReturnedTax(String tableauUnreturnedAndReturnedTax) {
+        this.tableauUnreturnedAndReturnedTax = tableauUnreturnedAndReturnedTax;
     }
 
     public String getTableauCostAnalysis() {
-        return this.tableauCostAnalysis;
+        return tableauCostAnalysis;
     }
 
     public void setTableauCostAnalysis(String tableauCostAnalysis) {
         this.tableauCostAnalysis = tableauCostAnalysis;
     }
 
-    public String getTableauProfitAndLoss() {
-        return this.tableauProfitAndLoss;
+    public String getTableauDistrictProfitAndLoss() {
+        return tableauDistrictProfitAndLoss;
     }
 
-    public void setTableauProfitAndLoss(String tableauProfitAndLoss) {
-        this.tableauProfitAndLoss = tableauProfitAndLoss;
+    public void setTableauDistrictProfitAndLoss(String tableauDistrictProfitAndLoss) {
+        this.tableauDistrictProfitAndLoss = tableauDistrictProfitAndLoss;
     }
 
-    public String getTableauOtherDomesticData() {
-        return this.tableauOtherDomesticData;
+    public String getTableauCompanyProfitAndLoss() {
+        return tableauCompanyProfitAndLoss;
     }
 
-    public void setTableauOtherDomesticData(String tableauOtherDomesticData) {
-        this.tableauOtherDomesticData = tableauOtherDomesticData;
+    public void setTableauCompanyProfitAndLoss(String tableauCompanyProfitAndLoss) {
+        this.tableauCompanyProfitAndLoss = tableauCompanyProfitAndLoss;
     }
 
-    public String getTableauDocSituation() {
-        return this.tableauDocSituation;
+    public String getTableauDriverAndEmployee() {
+        return tableauDriverAndEmployee;
     }
 
-    public void setTableauDocSituation(String tableauDocSituation) {
-        this.tableauDocSituation = tableauDocSituation;
+    public void setTableauDriverAndEmployee(String tableauDriverAndEmployee) {
+        this.tableauDriverAndEmployee = tableauDriverAndEmployee;
+    }
+
+    public String getTableauGmvAndSubsidy() {
+        return tableauGmvAndSubsidy;
+    }
+
+    public void setTableauGmvAndSubsidy(String tableauGmvAndSubsidy) {
+        this.tableauGmvAndSubsidy = tableauGmvAndSubsidy;
+    }
+
+    public String getTableauFileArrangement() {
+        return tableauFileArrangement;
+    }
+
+    public void setTableauFileArrangement(String tableauFileArrangement) {
+        this.tableauFileArrangement = tableauFileArrangement;
     }
 
     public String getTableauGlobalOverview() {
-        return this.tableauGlobalOverview;
+        return tableauGlobalOverview;
     }
 
     public void setTableauGlobalOverview(String tableauGlobalOverview) {
         this.tableauGlobalOverview = tableauGlobalOverview;
     }
 
+    public String getTableauGlobalBusiness() {
+        return tableauGlobalBusiness;
+    }
+
+    public void setTableauGlobalBusiness(String tableauGlobalBusiness) {
+        this.tableauGlobalBusiness = tableauGlobalBusiness;
+    }
+
     public String getTableauMexicanTax() {
-        return this.tableauMexicanTax;
+        return tableauMexicanTax;
     }
 
     public void setTableauMexicanTax(String tableauMexicanTax) {
@@ -143,7 +190,7 @@ public class OrangeHeapConfig {
     }
 
     public String getTableauAustralianTax() {
-        return this.tableauAustralianTax;
+        return tableauAustralianTax;
     }
 
     public void setTableauAustralianTax(String tableauAustralianTax) {
@@ -151,10 +198,18 @@ public class OrangeHeapConfig {
     }
 
     public String getTableauBrazilianTax() {
-        return this.tableauBrazilianTax;
+        return tableauBrazilianTax;
     }
 
     public void setTableauBrazilianTax(String tableauBrazilianTax) {
         this.tableauBrazilianTax = tableauBrazilianTax;
     }
+
+    public String getTableauOtherTaxAnalysis() {
+        return tableauOtherTaxAnalysis;
+    }
+
+    public void setTableauOtherTaxAnalysis(String tableauOtherTaxAnalysis) {
+        this.tableauOtherTaxAnalysis = tableauOtherTaxAnalysis;
+    }
 }
\ No newline at end of file

atms-web/src/main/java/pwc/taxtech/atms/web/controller/OrangeHeapController.java

@@ -20,72 +20,104 @@ public class OrangeHeapController {
     @Resource
     private OrangeHeapService tableauService;
 
+    //以上是示范代码
+    //TODO 加入其他图表
+
+    // 模板
+//    @ResponseBody
+//    @GetMapping("taxComparison")
+//    public ApiResultDto getTaxComparison() {
+//        return ApiResultDto.success(tableauService.getTaxComparison().orElse(StringUtils.EMPTY));
+//    }
+
     @ResponseBody
-    @GetMapping("unreturnedTax")
-    public ApiResultDto getUnreturnedTax() {
-        return ApiResultDto.success(tableauService.getUnreturnedTax().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauTaxCategoryUnreturnedTax")
+    public ApiResultDto getTableauTaxCategoryUnreturnedTax() {
+        return ApiResultDto.success(tableauService.getTableauTaxCategoryUnreturnedTax().orElse(StringUtils.EMPTY));
+    }
+
+    @ResponseBody
+    @GetMapping("getTableauDistrictUnreturnedTax")
+    public ApiResultDto getTableauDistrictUnreturnedTax() {
+        return ApiResultDto.success(tableauService.getTableauDistrictUnreturnedTax().orElse(StringUtils.EMPTY));
+    }
+
+    @ResponseBody
+    @GetMapping("getTableauUnreturnedAndReturnedTax")
+    public ApiResultDto getTableauUnreturnedAndReturnedTax() {
+        return ApiResultDto.success(tableauService.getTableauUnreturnedAndReturnedTax().orElse(StringUtils.EMPTY));
+    }
+
+    @ResponseBody
+    @GetMapping("getTableauCostAnalysis")
+    public ApiResultDto getTableauCostAnalysis() {
+        return ApiResultDto.success(tableauService.getTableauCostAnalysis().orElse(StringUtils.EMPTY));
+    }
+
+    @ResponseBody
+    @GetMapping("getTableauDistrictProfitAndLoss")
+    public ApiResultDto getTableauDistrictProfitAndLoss() {
+        return ApiResultDto.success(tableauService.getTableauDistrictProfitAndLoss().orElse(StringUtils.EMPTY));
     }
 
-    //以上是示范代码
-    //TODO 加入其他图表
     @ResponseBody
-    @GetMapping("taxComparison")
-    public ApiResultDto getTaxComparison() {
-        return ApiResultDto.success(tableauService.getTaxComparison().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauCompanyProfitAndLoss")
+    public ApiResultDto getTableauCompanyProfitAndLoss() {
+        return ApiResultDto.success(tableauService.getTableauCompanyProfitAndLoss().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("otherCountries")
-    public ApiResultDto getOtherCountries() {
-        return ApiResultDto.success(tableauService.getOtherCountries().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauDriverAndEmployee")
+    public ApiResultDto getTableauDriverAndEmployee() {
+        return ApiResultDto.success(tableauService.getTableauDriverAndEmployee().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("costAnalysis")
-    public ApiResultDto getCostAnalysis() {
-        return ApiResultDto.success(tableauService.getCostAnalysis().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauGmvAndSubsidy")
+    public ApiResultDto getTableauGmvAndSubsidy() {
+        return ApiResultDto.success(tableauService.getTableauGmvAndSubsidy().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("profitAndLoss")
-    public ApiResultDto getProfitAndLoss() {
-        return ApiResultDto.success(tableauService.getProfitAndLoss().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauFileArrangement")
+    public ApiResultDto getTableauFileArrangement() {
+        return ApiResultDto.success(tableauService.getTableauFileArrangement().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("otherDomesticData")
-    public ApiResultDto getOtherDomesticData() {
-        return ApiResultDto.success(tableauService.getOtherDomesticData().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauGlobalOverview")
+    public ApiResultDto getTableauGlobalOverview() {
+        return ApiResultDto.success(tableauService.getTableauGlobalOverview().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("docSituation")
-    public ApiResultDto getDocSituation() {
-        return ApiResultDto.success(tableauService.getDocSituation().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauGlobalBusiness")
+    public ApiResultDto getTableauGlobalBusiness() {
+        return ApiResultDto.success(tableauService.getTableauGlobalBusiness().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("globalOverview")
-    public ApiResultDto getGlobalOverview() {
-        return ApiResultDto.success(tableauService.getGlobalOverview().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauMexicanTax")
+    public ApiResultDto getTableauMexicanTax() {
+        return ApiResultDto.success(tableauService.getTableauMexicanTax().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("mexicanTax")
-    public ApiResultDto getMexicanTax() {
-        return ApiResultDto.success(tableauService.getMexicanTax().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauAustralianTax")
+    public ApiResultDto getTableauAustralianTax() {
+        return ApiResultDto.success(tableauService.getTableauAustralianTax().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("australianTax")
-    public ApiResultDto getAustralianTax() {
-        return ApiResultDto.success(tableauService.getAustralianTax().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauBrazilianTax")
+    public ApiResultDto getTableauBrazilianTax() {
+        return ApiResultDto.success(tableauService.getTableauBrazilianTax().orElse(StringUtils.EMPTY));
     }
 
     @ResponseBody
-    @GetMapping("brazilianTax")
-    public ApiResultDto getBrazilianTax() {
-        return ApiResultDto.success(tableauService.getBrazilianTax().orElse(StringUtils.EMPTY));
+    @GetMapping("getTableauOtherTaxAnalysis")
+    public ApiResultDto getTableauOtherTaxAnalysis() {
+        return ApiResultDto.success(tableauService.getTableauOtherTaxAnalysis().orElse(StringUtils.EMPTY));
     }
 
 }

atms-web/src/main/java/pwc/taxtech/atms/web/service/OrangeHeapService.java

@@ -46,73 +46,87 @@ public class OrangeHeapService {
         return Optional.empty();
     }
 
-    public Optional<String> getUnreturnedTax() {
-//          Optional<String> optional = Optional.of("admin");
+    //税种未返还税金
+//    public Optional<String> getTableauTaxCategoryUnreturnedTax() {
+//        Optional<String> optional = Optional.of("admin");
+//        return optional.map(s -> String.format(systemConfig.getTableauTaxCategoryUnreturnedTax(),
+//                getTicket(s).orElse(StringUtils.EMPTY)));
+//    }
+
+
+    public Optional<String> getTableauTaxCategoryUnreturnedTax() {
         Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauTaxCategoryUnreturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
+    }
 
-        return optional.map(s -> String.format(systemConfig.getTableauUnreturnedTax(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauDistrictUnreturnedTax() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauDistrictUnreturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    //TODO 加入其他图表
+    public Optional<String> getTableauUnreturnedAndReturnedTax() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauUnreturnedAndReturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
+    }
 
-    public Optional<String> getTaxComparison() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauTaxComparison(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauCostAnalysis() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauCostAnalysis(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getOtherCountries() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauOtherCountries(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauDistrictProfitAndLoss() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauDistrictProfitAndLoss(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getCostAnalysis() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauCostAnalysis(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauCompanyProfitAndLoss() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauCompanyProfitAndLoss(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getProfitAndLoss() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauProfitAndLoss(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauDriverAndEmployee() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauDriverAndEmployee(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getOtherDomesticData() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauOtherDomesticData(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauGmvAndSubsidy() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauGmvAndSubsidy(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getDocSituation() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauDocSituation(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauFileArrangement() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauFileArrangement(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getGlobalOverview() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauGlobalOverview(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauGlobalOverview() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauGlobalOverview(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getMexicanTax() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauMexicanTax(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauGlobalBusiness() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauGlobalBusiness(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getAustralianTax() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauAustralianTax(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauMexicanTax() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauMexicanTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
-    public Optional<String> getBrazilianTax() {
-          Optional<String> optional = Optional.of("admin");
-        return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(),
-                getTicket(s).orElse(StringUtils.EMPTY)));
+    public Optional<String> getTableauAustralianTax() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauAustralianTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
+
+    public Optional<String> getTableauBrazilianTax() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(), getTicket(s).orElse(StringUtils.EMPTY)));
+    }
+
+    public Optional<String> getTableauOtherTaxAnalysis() {
+        Optional<String> optional = Optional.of("admin");
+        return optional.map(s -> String.format(systemConfig.getTableauOtherTaxAnalysis(), getTicket(s).orElse(StringUtils.EMPTY)));
+    }
+
 }

atms-web/src/main/resources/conf.properties

@@ -23,15 +23,35 @@ longi_api_basic_pwd=${longi_api_basic_pwd}
 longi_api_gl_balance=${longi_api_gl_balance}
 
 #tableau config
-tableau_get_ticket=${tableau_get_ticket}
-tableau_unreturned_tax=${tableau_unreturned_tax}
-tableau_tax_comparison=${tableau_tax_comparison}
-tableau_other_countries=${tableau_other_countries}
+
+
+tableau_tax_category_unreturned_tax=${tableau_tax_category_unreturned_tax}
+tableau_district_unreturned_tax=${tableau_district_unreturned_tax}
+tableau_unreturned_and_returned_tax=${tableau_unreturned_and_returned_tax}
 tableau_cost_analysis=${tableau_cost_analysis}
-tableau_profit_and_loss=${tableau_profit_and_loss}
-tableau_other_domestic_data=${tableau_other_domestic_data}
-tableau_doc_situation=${tableau_doc_situation}
+tableau_district_profit_and_loss=${tableau_district_profit_and_loss}
+tableau_company_profit_and_loss=${tableau_company_profit_and_loss}
+tableau_driver_and_employee=${tableau_driver_and_employee}
+tableau_gmv_and_subsidy=${tableau_gmv_and_subsidy}
+tableau_file_arrangement=${tableau_file_arrangement}
 tableau_global_overview=${tableau_global_overview}
+tableau_global_business=${tableau_global_business}
 tableau_mexican_tax=${tableau_mexican_tax}
 tableau_australian_tax=${tableau_australian_tax}
-tableau_brazilian_tax=${tableau_brazilian_tax}
+tableau_brazilian_tax=${tableau_brazilian_tax}
\ No newline at end of file
+tableau_other_tax_analysis=${tableau_other_tax_analysis}
+
+
+
+#tableau_get_ticket=${tableau_get_ticket}
+#tableau_unreturned_tax=${tableau_unreturned_tax}
+#tableau_tax_comparison=${tableau_tax_comparison}
+#tableau_other_countries=${tableau_other_countries}
+#tableau_cost_analysis=${tableau_cost_analysis}
+#tableau_profit_and_loss=${tableau_profit_and_loss}
+#tableau_other_domestic_data=${tableau_other_domestic_data}
+#tableau_doc_situation=${tableau_doc_situation}
+#tableau_global_overview=${tableau_global_overview}
+#tableau_mexican_tax=${tableau_mexican_tax}
+#tableau_australian_tax=${tableau_australian_tax}
+#tableau_brazilian_tax=${tableau_brazilian_tax}
\ No newline at end of file

atms-web/src/main/resources/conf_profile_dev.properties

@@ -22,14 +22,61 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
 
 #tableau config
 tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
-tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+
+
+#税种未返还税金
+tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#地区未返还税金
+tableau_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#未返还/返还后税金比较
+tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#费用分析
+tableau_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#地区利润总额 / 亏损额
+tableau_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#公司利润总额 / 亏损额
+tableau_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#司机 / 员工人数
+tableau_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#业务线GMV及补贴统计
+tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#档案归档情况
+tableau_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#国际税全球概覧
+tableau_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#国际税业务数据
+tableau_global_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#墨西哥税务分析
+tableau_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#澳洲税务分析
+tableau_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#巴西税务分析
+tableau_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#其他税务分析
+tableau_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+#tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no

atms-web/src/main/webapp/orangeweb/index.html

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.224d7e8d.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.224d7e8d.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.2a94701c.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.2a94701c.js></script></body></html>
\ No newline at end of file

atms-web/src/test/draft.properties

+tableau_tax_category_unreturned_tax
+tableau_district_unreturned_tax
+tableau_unreturned_and_returned_tax
+tableau_cost_analysis
+tableau_district_profit_and_loss
+tableau_company_profit_and_loss
+tableau_driver_and_employee
+tableau_gmv_and_subsidy
+tableau_file_arrangement
+tableau_global_overview
+tableau_global_business
+tableau_mexican_tax
+tableau_australian_tax
+tableau_brazilian_tax
+tableau_other_tax_analysis
+
+
+
+
+
+
+
+
+
+
+tableauTaxCategoryUnreturnedTax
+tableauDistrictUnreturnedTax
+tableauUnreturnedAndReturnedTax
+tableauCostAnalysis
+tableauDistrictProfitAndLoss
+tableauCompanyProfitAndLoss
+tableauDriverAndEmployee
+tableauGmvAndSubsidy
+tableauFileArrangement
+tableauGlobalOverview
+tableauGlobalBusiness
+tableauMexicanTax
+tableauAustralianTax
+tableauBrazilianTax
+tableauOtherTaxAnalysis
+
+
+
+
+getTableauTaxCategoryUnreturnedTax
+getTableauDistrictUnreturnedTax
+getTableauUnreturnedAndReturnedTax
+getTableauCostAnalysis
+getTableauDistrictProfitAndLoss
+getTableauCompanyProfitAndLoss
+getTableauDriverAndEmployee
+getTableauGmvAndSubsidy
+getTableauFileArrangement
+getTableauGlobalOverview
+getTableauGlobalBusiness
+getTableauMexicanTax
+getTableauAustralianTax
+getTableauBrazilianTax
+getTableauOtherTaxAnalysis
+
+
+
+tableauOperation("getTableauTaxCategoryUnreturnedTax")
+tableauOperation("getTableauDistrictUnreturnedTax")
+tableauOperation("getTableauUnreturnedAndReturnedTax")
+tableauOperation("getTableauCostAnalysis")
+tableauOperation("getTableauDistrictProfitAndLoss")
+tableauOperation("getTableauCompanyProfitAndLoss")
+tableauOperation("getTableauDriverAndEmployee")
+tableauOperation("getTableauGmvAndSubsidy")
+tableauOperation("getTableauFileArrangement")
+tableauOperation("getTableauGlobalOverview")
+tableauOperation("getTableauGlobalBusiness")
+tableauOperation("getTableauMexicanTax")
+tableauOperation("getTableauAustralianTax")
+tableauOperation("getTableauBrazilianTax")
+tableauOperation("getTableauOtherTaxAnalysis")
+
+
+
+
+