货位更改

pom.xml

@@ -56,6 +56,17 @@
 			<version>3.7</version>
 		</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>
+
 		<!--log4j-->
 		<dependency>
 			<groupId>log4j</groupId>

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

@@ -1,14 +1,17 @@
 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;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @EnableEurekaClient
+@EnableFeignClients
 @EnableDiscoveryClient
-@SpringBootApplication
+@SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
 @MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
 public class DepotQualitycheckApplication {
 

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

@@ -0,0 +1,21 @@
+package com.chinaitop;
+
+import com.chinaitop.depot.feign.FeignBasicService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 吉东杰
+ * 2020/7/30
+ */
+@Component
+public class HystrixClientFallback implements FeignBasicService {
+    private final static Logger logger = LoggerFactory.getLogger(HystrixClientFallback.class);
+
+
+    @Override
+    public void updateWarehouseCrkStatus(Integer wareId, String crk_status) {
+        logger.info("warehouseId: " + wareId + "warehouseStatus" + crk_status);
+    }
+}

src/main/java/com/chinaitop/depot/feign/FeignBasicService.java

@@ -0,0 +1,15 @@
+package com.chinaitop.depot.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "depot-basic")
+public interface FeignBasicService {
+
+    //远程调用，更新货位状态
+    @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/mapper/StorageQualitycheckMapper.java

@@ -2,11 +2,11 @@ package com.chinaitop.depot.storage.mapper;
 
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface StorageQualitycheckMapper {
     /**
      * This method was generated by MyBatis Generator.
@@ -129,4 +129,6 @@ public interface StorageQualitycheckMapper {
     List<Map<String, Object>> getAllQualityInfo(Map<String, Object> paramMap);
 
     List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap);
+
+    void updateByFlagType(StorageQualitycheck qualitycheck);
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -10,6 +10,7 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="house_id" property="houseId" jdbcType="INTEGER" />
     <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="flag_type" property="flagType" jdbcType="INTEGER" />
     <result column="type" property="type" jdbcType="VARCHAR" />
     <result column="sub_type" property="subType" jdbcType="INTEGER" />
     <result column="sub_type_detailed" property="subTypeDetailed" jdbcType="INTEGER" />
@@ -188,7 +189,7 @@
     check_result_time, store_quality, is_pest, inspection_standard_basis, quality, seal_date, 
     seal_status, auth_code, org_id, history_status, intermixing_rate, smelltaste, transparency, 
     peroxide_value, smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, 
-    butyl_phenol, updatetime, zblb, qydbh, qysj, qyqy, jdrxm, ypbh, sfzcccnx
+    butyl_phenol, updatetime, zblb, qydbh, qysj, qyqy, jdrxm, ypbh, sfzcccnx, flag_type
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     <!--
@@ -1770,7 +1771,7 @@
 
 
   <sql id="ExtBase_Column_List">
-    sqk.id, sqk.house_id, sqk.warehouse_id, sqk.type, sqk.sub_type, sqk.sub_type_detailed, sqk.check_time, sqk.check_result,
+    sqk.id, sqk.house_id, sqk.warehouse_id, sqk.type, sqk.sub_type, sqk.sub_type_detailed, sqk.check_time, sqk.check_result,sqk.flag_type,
     sqk.checker, sqk.level, sqk.capacity, sqk.water, sqk.impurity, sqk.mineral, sqk.badpart, sqk.colorsmell, sqk.keeper_advices,
     sqk.keeper_advices_time, sqk.keeper_advices_paint, sqk.chief_advices, sqk.chief_advices_time, sqk.chiet_advices_paint,
     sqk.vice_manager_advices, sqk.vice_manager_advices_time, sqk.vice_manager_advices_paint, sqk.manager_advices,
@@ -1994,4 +1995,11 @@
         LEFT JOIN basic_storehouse bs ON sfo.house_id = bs.storehouse_id
         LEFT JOIN org_info oi ON oi.org_id = sfo.org_id
   </select>
+
+  <update id="updateByFlagType" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
+    update storage_qualitycheck
+    set flag_type = 1
+    where house_id = #{houseId} and warehouse_id = #{warehouseId} and type = 0
+  </update>
+
 </mapper>

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -759,6 +759,9 @@ public class StorageQualitycheck {
     private Integer acceptanceId;
     private String orgName;
 
+    //0 初检，1验收
+    private Integer flagType;
+
     private Integer foodbasicinfoId;
 
     //封仓业务字段
@@ -3105,6 +3108,12 @@ public class StorageQualitycheck {
 	public void setNotice(Integer notice) {
 		this.notice = notice;
 	}
-    
-    
+
+    public Integer getFlagType() {
+        return flagType;
+    }
+
+    public void setFlagType(Integer flagType) {
+        this.flagType = flagType;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.service.impl;
 
 
+import com.chinaitop.depot.feign.FeignBasicService;
 import com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoCheckMapper;
 import com.chinaitop.depot.storage.mapper.StorageFoodbasicinfoMapper;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper;
@@ -36,6 +37,10 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
     @Resource
     private StorageFoodbasicInfoLocationService foodbasicInfoLocationService;
 
+    //远程调用
+    @Resource
+    private FeignBasicService whouseFeignClient;
+
     @Value("${web.upload-path}")
     private String rootPath;
 
@@ -86,6 +91,10 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
             StorageQualitycheck qualitycheckData =qualitycheckMapper.queryPrimaryKey(qualitycheckVo.getQualitycheckId());
             qualitycheck = qualitycheckData;
         }
+
+        //更新或为状态
+        whouseFeignClient.updateWarehouseCrkStatus(wareHouseId,"3");
+
         if(qualitycheck != null){
             foodbasicInfo.setWater(qualitycheck.getWater());//水分
             foodbasicInfo.setImpurity(qualitycheck.getImpurity());//杂质

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

@@ -38,6 +38,10 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
         Integer qualityCheckId=0;
 		if (qualitycheck.getId() == null) {
 			qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
+            //如果验收，把页面验收隐藏
+            if("1".equals(qualitycheck.getType())){
+                qualitycheckMapper.updateByFlagType(qualitycheck);
+            }
             qualityCheckId = qualitycheck.getId();
         } else {
             qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据

src/main/resources/bootstrap.yml

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