修正测试

web/consumer-hb/pom.xml

@@ -98,8 +98,49 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <!-- 添加swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
 
+        <!-- https://mvnrepository.com/artifact/io.github.swagger2markup/swagger2markup -->
 
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>1.6.2</version>
+        </dependency>
 
     </dependencies>
 
@@ -130,22 +171,22 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
+
+        <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </build>
+        </build>
+
 
 </project>

web/consumer-hb/src/main/java/com/gyee/consumer/config/FeignConfiguration.java

@@ -1,14 +1,40 @@
 package com.gyee.consumer.config;
 
 
-import com.gyee.consumer.fallback.GenreSetPushServiceFallbackFactory;
+import com.gyee.consumer.fallback.*;
+import feign.Request;
 import org.springframework.context.annotation.Bean;
 
 public class FeignConfiguration {
 
+
     @Bean
-    public GenreSetPushServiceFallbackFactory eenreSetPushServiceFallbackFactory() {
+    public GenreSetPushServiceFallbackFactory geenreSetPushServiceFallbackFactory() {
         return new GenreSetPushServiceFallbackFactory();
     }
 
+    @Bean
+    public MatrixPushServiceFallbackFactory matrixPushServiceFallbackFactory() {
+        return new MatrixPushServiceFallbackFactory();
+    }
+
+    @Bean
+    public MonitorInverterPushServiceFallbackFactory monitorInverterPushServiceFallbackFactory() {
+        return new MonitorInverterPushServiceFallbackFactory();
+    }
+
+    @Bean
+    public MonitorPushServiceFallbackFactory monitorPushServiceFallbackFactory() {
+        return new MonitorPushServiceFallbackFactory();
+    }
+
+    @Bean
+    public SandtableServiceFallbackFactory sandtableServiceFallbackFactory() {
+        return new SandtableServiceFallbackFactory();
+    }
+
+    @Bean
+    public MonitorWtPushServiceFallbackFactory monitorWtPushServiceFallbackFactory() {
+        return new MonitorWtPushServiceFallbackFactory();
+    }
 }

web/consumer-hb/src/main/java/com/gyee/consumer/config/Swagger.java

@@ -0,0 +1,83 @@
+package com.gyee.consumer.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import javax.annotation.Resource;
+
+/**
+* Swagger 配置文件
+* @ClassName: Swagger
+* @Description: 配置文件
+* @author gyee
+* @date 2018年6月3日
+*
+ */
+@Configuration(value="true")
+@EnableSwagger2 //启动swagger注解 启动服务，浏览器输入"http://localhost:8170/swagger-ui.html"
+public class Swagger implements WebMvcConfigurer {
+
+
+	@Resource
+	private V2Config v2Config;
+
+	@Bean
+	public Docket createRestApi() {
+		return new Docket(DocumentationType.SWAGGER_2)
+				.host(v2Config.getSwaggerip())
+				// 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
+				.apiInfo(apiInfo())
+				// 设置哪些接口暴露给Swagger展示
+				.select()
+				 // 扫描所有有注解的api，用这种方式更灵活
+				.apis(RequestHandlerSelectors.basePackage("com.gyee"))
+				// 扫描指定包中的swagger注解
+				//.apis(RequestHandlerSelectors.basePackage("com.gyee.frame.controller"))
+				// 扫描所有 .apis(RequestHandlerSelectors.any())
+				.paths(PathSelectors.any())
+				.build();
+	}
+	
+	private ApiInfo apiInfo() {
+		return new ApiInfoBuilder()
+				//设置标题
+				.title("API文档")
+				//描述
+				.description("项目")
+				 //作者信息
+                //.contact(new Contact(v2Config.getName(), null, V2Config.getEmail_account()))
+                //服务条款URL
+				.termsOfServiceUrl("")
+				//版本
+				.version("")
+				.build();
+	}
+
+	@Override
+
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		// 解决静态资源无法访问
+
+		registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+
+		// 解决swagger无法访问
+
+		registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+
+		// 解决swagger的js文件无法访问
+
+		registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+	}
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/config/V2Config.java

@@ -0,0 +1,30 @@
+package com.gyee.consumer.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取项目相关配置
+ * 
+ * @author gyee
+ */
+@Component
+@ConfigurationProperties(prefix = "gyee")
+public class V2Config
+{
+
+    /** swaggerip指定IP **/
+    private  static  String swaggerip;
+
+
+
+    public  static String getSwaggerip() {
+        return swaggerip;
+    }
+
+    public  void setSwaggerip(String swaggerip) {
+        this.swaggerip = swaggerip;
+    }
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/GenreSetPushController.java

@@ -21,82 +21,82 @@ import java.util.Map;
 
 @Slf4j
 @RestController
-@RequestMapping("/commandmodule")
+@RequestMapping("/genreset")
 @Api(value = "驾驶舱" ,tags =  "驾驶舱")
 public class GenreSetPushController {
 
     @Resource
     private GenreSetPushService genreSetPushService;
 
-    @GetMapping("/queryAgcValues")
+    @GetMapping("/getAgcValues")
     @ApiOperation(value = "获取AGC信息", notes = "获取AGC信息")
     @ApiImplicitParams({})
-    public AjaxResult queryAgcValuesNew() throws Exception {
+    public AjaxResult getAgcValues() throws Exception {
 
         AjaxResult ajax=genreSetPushService.getAgcValues();
 
         return ajax;
     }
-    @GetMapping("/queryPowerInfo")
+    @GetMapping("/findPowerInfo")
     @ApiOperation(value = "获取驾驶舱功率曲线图和电量柱状图信息", notes = "获取驾驶舱功率曲线图和电量柱状图信息")
     @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult queryPowerInfo(@RequestParam("id") String id){
+    public AjaxResult findPowerInfo(@RequestParam("id") String id){
 
         AjaxResult ajax=genreSetPushService.findPowerInfo(id);
 
         return ajax;
     }
 
-    @GetMapping("/queryBasicDataInfo")
+    @GetMapping("/findBasicDataInfo")
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
     @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult queryBasicDataInfo(@RequestParam("id") String id){
+    public AjaxResult findBasicDataInfo(@RequestParam("id") String id){
 
         AjaxResult ajax=genreSetPushService.findBasicDataInfo(id);
 
         return ajax;
     }
 
-    @GetMapping("/queryDayInfo")
+    @GetMapping("/findDayInfo")
     @ApiOperation(value = "获取钻取指标日信息", notes = "获取钻取指标日信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "钻取对象编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "targetName", value = "指标名称", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult  queryDayInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
+    public AjaxResult  findDayInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
 
         AjaxResult ajax=genreSetPushService.findDayInfo(id,targetName);
 
         return ajax;
     }
 
-    @GetMapping("/queryMonthInfo")
+    @GetMapping("/findMonthInfo")
     @ApiOperation(value = "获取钻取指标月信息", notes = "获取钻取指标月信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "钻取对象编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "targetName", value = "指标名称", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult  queryMonthInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
+    public AjaxResult  findMonthInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
 
         AjaxResult ajax=genreSetPushService.findMonthInfo(id,targetName);
 
         return ajax;
     }
 
-    @GetMapping("/queryYearInfo")
+    @GetMapping("/findYearInfo")
     @ApiOperation(value = "获取钻取指标年信息", notes = "获取钻取指标年信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "钻取对象编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "targetName", value = "指标名称", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult  queryYearInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
+    public AjaxResult  findYearInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
 
         AjaxResult ajax=genreSetPushService.findYearInfo(id,targetName);
 
         return ajax;
     }
 
-    @GetMapping("/queryProjectPlanPower")
+    @GetMapping("/findProjectPlanPower")
     @ApiOperation(value = "获取计划发电量钻取信息", notes = "获取计划发电量钻取信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "钻取对象编号", required = true, dataType = "string", paramType = "query")})
@@ -108,37 +108,37 @@ public class GenreSetPushController {
         return ajax;
     }
 
-    @GetMapping("/queryGLDetail")
+    @GetMapping("/findGLDetail")
     @ApiOperation(value = "获取功率曲线钻取信息", notes = "获取功率曲线钻取信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "钻取对象编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "targetName", value = "指标名称", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult  queryGLDetail(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
+    public AjaxResult  findGLDetail(@RequestParam("id")String id,@RequestParam("targetName")String targetName){
 
         AjaxResult ajax=genreSetPushService.findGLDetail(id,targetName);
 
         return ajax;
     }
 
-    @GetMapping("/queryWeatherRealDay5Info")
+    @GetMapping("/getWeatherRealDay5Info")
     @ApiOperation(value = "未来5天天气预报功能", notes = "未来5天天气预报功能")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult  queryWeatherRealDay5Info(@RequestParam("wpId")String wpId){
+    public AjaxResult  getWeatherRealDay5Info(@RequestParam("wpId")String wpId){
 
         AjaxResult ajax=genreSetPushService.getWeatherRealDay5Info(wpId);
 
         return ajax;
     }
 
-    @GetMapping("/queryForecastwindspeedInfo")
+    @GetMapping("/getForecastwindspeedInfo")
     @ApiOperation(value = "预测风速电量", notes = "预测风速电量功能")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult  queryForecastwindspeedInfo(@RequestParam("wpId")String wpId){
+    public AjaxResult  getForecastwindspeedInfo(@RequestParam("wpId") String wpId){
 
         AjaxResult ajax=genreSetPushService.getForecastwindspeedInfo(wpId);
 

web/consumer-hb/src/main/java/com/gyee/consumer/service/GenreSetPushService.java

@@ -9,38 +9,38 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "monitor-web-hb-provider",
+@FeignClient(name = "genreset",url = "${provider.url}",
         fallbackFactory = GenreSetPushServiceFallbackFactory.class,
         configuration = FeignConfiguration.class)
 public interface GenreSetPushService {
 
     @GetMapping("/genreset/getAgcValues")
-    AjaxResult getAgcValues();
+    public AjaxResult getAgcValues();
 
     @GetMapping("/genreset/findPowerInfo")
-    AjaxResult findPowerInfo(@RequestParam("id") String id);
+    public AjaxResult findPowerInfo(@RequestParam("id") String id);
 
     @GetMapping("/genreset/findBasicDataInfo")
-    AjaxResult findBasicDataInfo(@RequestParam("id") String id);
+    public AjaxResult findBasicDataInfo(@RequestParam("id") String id);
 
     @GetMapping("/genreset/findDayInfo")
-    AjaxResult  findDayInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
+    public AjaxResult  findDayInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
 
     @GetMapping("/genreset/findMonthInfo")
-    AjaxResult  findMonthInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
+    public AjaxResult  findMonthInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
 
     @GetMapping("/genreset/findYearInfo")
-    AjaxResult  findYearInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
+    public AjaxResult  findYearInfo(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
 
     @GetMapping("/genreset/findProjectPlanPower")
-    AjaxResult findProjectPlanPower(@RequestParam("id") String id);
+    public AjaxResult findProjectPlanPower(@RequestParam("id") String id);
 
-    @GetMapping("/genreset/getWeatherRealDay5Info")
-    AjaxResult  findGLDetail(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
+    @GetMapping("/genreset/findGLDetail")
+    public AjaxResult  findGLDetail(@RequestParam("id")String id,@RequestParam("targetName")String targetName);
 
     @GetMapping("/genreset/getWeatherRealDay5Info")
-    AjaxResult  getWeatherRealDay5Info(@RequestParam("wpId")String wpId);
+    public AjaxResult  getWeatherRealDay5Info(@RequestParam("wpId")String wpId);
 
     @GetMapping("/genreset/getForecastwindspeedInfo")
-    AjaxResult  getForecastwindspeedInfo(@RequestParam("wpId")String wpId);
+    public AjaxResult  getForecastwindspeedInfo(@RequestParam("wpId")String wpId);
 }

web/consumer-hb/src/main/resources/application.yml

@@ -1,5 +1,10 @@
+# 项目相关配置
+gyee:
+  #API访问ip
+  #swaggerip: 49.4.50.80:8082
+  swaggerip: 192.168.56.1:8170
 server:
-  port: 8020
+  port: 8170
 
 spring:
   application:
@@ -7,7 +12,7 @@ spring:
     cloud:
       nacos:
         discovery:
-          server-addr: 10.0.118.99:8848
+          server-addr: 192.168.56.1:8848
           #指定yaml格式的配置
           file-extension: yaml
           cluster-name: master
@@ -94,9 +99,11 @@ url:
 feign:
   client:
     config:
-      monitor-web-hb-provider:
+      default:
         read-timeout: 60000
         connect-timeout: 60000
+provider:
+  url: http://192.168.56.1:8171/
 management:
   endpoints:
     jmx: