货位更改

pom.xml

@@ -50,10 +50,6 @@
 			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
 		<dependency>
-        	<groupId>org.springframework.cloud</groupId>
-        	<artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.7</version>
@@ -109,6 +105,16 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- feign -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+		<!-- hystrix 熔断-->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+		</dependency>
 		<!-- 加载mybatis逆向生成工具包 -->
         <dependency>
 		    <groupId>org.mybatis.generator</groupId>

src/main/java/com/chinaitop/DepotQualitycheckApplication.java

@@ -1,5 +1,6 @@
 package com.chinaitop;
 
+import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,9 +9,9 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @EnableEurekaClient
-@EnableDiscoveryClient
 @EnableFeignClients
-@SpringBootApplication
+@EnableDiscoveryClient
+@SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
 @MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
 public class DepotQualitycheckApplication {
 

src/main/java/com/chinaitop/HystrixClientFallback.java

@@ -0,0 +1,33 @@
+package com.chinaitop;
+
+import com.chinaitop.depot.storage.service.FeignBasicService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2020-07-20 15:16
+ */
+@Component
+public class HystrixClientFallback implements FeignBasicService {
+    private final static Logger logger = LoggerFactory.getLogger(HystrixClientFallback.class);
+
+    @Override
+    public Map<String, Object> getWareDataByHwbm(String hwbm) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getStoreDataByHouseId(int houseId) {
+        return null;
+    }
+
+    @Override
+    public void updateWarehouseCrkStatus(Integer wareId, String crk_status) {
+        logger.info("warehouseId: " + wareId + "warehouseStatus" + crk_status);
+    }
+}

src/main/java/com/chinaitop/depot/storage/service/FeignBasicService.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.storage.service;
 import java.util.Map;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,4 +17,9 @@ public interface FeignBasicService {
 
     @RequestMapping(value = "/Storehouse/getStoreDataByHouseId", method = RequestMethod.GET)
     Map<String, Object> getStoreDataByHouseId(@RequestParam(value = "houseId") int houseId);
+
+    //远程调用，更新货位状态
+    @RequestMapping(value = "/Warehouse/updateWarehouseCrkStatus", method = RequestMethod.POST)
+    void updateWarehouseCrkStatus(@RequestParam(value = "wareId")Integer wareId, @RequestParam(value = "crk_status")String crk_status);
+
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageFoodbasicInfoServiceImpl.java

@@ -1,11 +1,11 @@
 package com.chinaitop.depot.storage.service.impl;
 
-
 import com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoCheckMapper;
 import com.chinaitop.depot.storage.mapper.StorageFoodbasicinfoMapper;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper;
 import com.chinaitop.depot.storage.model.*;
 import com.chinaitop.depot.storage.model.vo.StorageQualitycheckVo;
+import com.chinaitop.depot.storage.service.FeignBasicService;
 import com.chinaitop.depot.storage.service.StorageFoodbasicInfoLocationService;
 import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
@@ -36,6 +36,10 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
     @Resource
     private StorageFoodbasicInfoLocationService foodbasicInfoLocationService;
 
+    //远程调用
+    @Resource
+    private FeignBasicService whouseFeignClient;
+
     @Value("${web.upload-path}")
     private String rootPath;
 
@@ -81,6 +85,9 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
         StorageQualitycheck qualitycheckData =qualitycheckMapper.queryPrimaryKey(qualitycheckVo.getQualitycheckId());
         qualitycheck = qualitycheckData;
 
+        //更新或为状态
+        whouseFeignClient.updateWarehouseCrkStatus(qualitycheck.getWarehouseId(),"3");
+
         if(qualitycheck != null){
             foodbasicInfo.setWater(qualitycheck.getWater());//水分
             foodbasicInfo.setImpurity(qualitycheck.getImpurity());//杂质
@@ -131,7 +138,6 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
 
         foodbasicInfo.setHistoryStatus(0);//0:最新数据  1:历史数据
 
-
         qualitycheck.setHistoryStatus(0);//0:最新数据  1:历史数据
 
         //生成库存识别码 图片img set进去

src/main/resources/bootstrap.yml

@@ -14,7 +14,11 @@ eureka:
     lease-renewal-interval-in-seconds: 10
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
- 
+
+feign:
+  hystrix:
+    enabled: true # 开启Feign熔断
+---
 spring:
   application:
     name: depot-qualitycheck