swagger控制

src/main/java/com/chinaitop/SwaggerConfig.java

@@ -1,6 +1,7 @@
 package com.chinaitop;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +12,6 @@ import com.google.common.base.Predicate;
 import springfox.documentation.RequestHandler;
 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;
@@ -19,6 +19,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
 @EnableSwagger2
+@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
 public class SwaggerConfig {
 
 	@Value("${eureka.instance.hostname}")

src/main/java/com/chinaitop/depot/basic/service/impl/BasicTankServiceImpl.java

@@ -811,7 +811,13 @@ public class BasicTankServiceImpl implements BasicTankService {
     	if (StringUtils.isNotBlank(ajdh)) {
 			tank.setYgajdm(ajdh.trim());
 		}
-    	
+
+    	//油罐货位标准编码
+    	String yghwdm = obj.getString("hwdm");
+    	if (StringUtils.isNotBlank(yghwdm)) {
+			tank.setYghwdm(yghwdm.trim());
+		}
+
 		String msg = sbf.toString();
 		map.put("msg", msg);
 		
@@ -882,7 +888,7 @@ public class BasicTankServiceImpl implements BasicTankService {
 		tankhw.setHwmc(basicTank.getStoragetankName());
 		tankhw.setHwqyrq(basicTank.getBuilddate());
 		tankhw.setHwrl(basicTank.getTankCapacity());
-//		tankhw.setBgdw(bgdw);
+		tankhw.setBgdw(basicTank.getYghwdm());
 		tankhw.setCzbz("i");
 		tankhw.setZhgxsj(basicTank.getCreatedate());
 		tankhw.setCrkStatus(basicTank.getCrkStatus());

src/main/resources/bootstrap.yml

@@ -27,6 +27,10 @@ management:
   server:
     port: -1
 
+#是否开启swaggeer? true开启,false关闭，生产环境要求关闭
+swagger:
+  enable: true
+
 spring:
   application:
     name: depot-basic
@@ -78,7 +82,7 @@ spring:
   #文件临时存储路径
   http:
     multipart:
-      location: /home/depot-web/uploadTmp
+      location: /home/depot/depot-web/uploadTmp
 
 cxf:
   path: /depotbasic