质量检查

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

@@ -0,0 +1,21 @@
+package com.chinaitop.depot.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.HystrixClientFallback;
+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;
+
+/**
+ * 2020/7/21
+ * jidongjie
+ */
+@FeignClient(name = "depot-agile", fallback = HystrixClientFallback.class)
+public interface AgileHouseFeignClient {
+
+    @RequestMapping(value="/agile/kcsw/getList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    JSONObject getList(@RequestParam(value = "pageNum")Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize, @RequestParam(value = "kcswStr")String kcswStr, @RequestParam(value = "order")String order);
+
+}

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

@@ -0,0 +1,21 @@
+package com.chinaitop.depot.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.HystrixClientFallback;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+
+@FeignClient(name = "depot-storage", fallback = HystrixClientFallback.class)
+public interface StorageHouseFeignClient {
+
+
+    @RequestMapping(value = "/StorageProductFcbgz/getProductList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    JSONObject getList(@RequestParam(value = "request")HttpServletRequest request, @RequestParam(value = "pageNum")Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,
+                       @RequestParam(value = "houseId")String houseId, @RequestParam(value = "searchStartDate")String searchStartDate, @RequestParam(value = "searchEndDate")String searchEndDate);
+
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.*;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -599,6 +601,18 @@ public class StorageQualitycheckController {
         return pageInfo;
     }
 
+    @RequestMapping(value="/getHouseIdAll", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取全部仓房", notes = "获取全部仓房")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "数据ID", paramType = "query")
+    })
+    public JSONArray getHouseIdAll(Integer orgId, HttpServletRequest request) {
+
+        JSONArray list = storageQualitycheckService.getHouseIdAll(orgId,request);
+
+        return list;
+    }
+
     //质检信息主表同步
     @RequestMapping("/qualityMainSynchronization")
     public void qualityMainSynchronization() {

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

@@ -1,10 +1,12 @@
 package com.chinaitop.depot.storage.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -121,5 +123,6 @@ public interface StorageQualitycheckService {
     List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap);
 
 
-
+    //获取仓房
+    JSONArray getHouseIdAll(Integer orgId, HttpServletRequest request);
 }

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

@@ -1,5 +1,10 @@
 package com.chinaitop.depot.storage.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.feign.AgileHouseFeignClient;
+import com.chinaitop.depot.feign.StorageHouseFeignClient;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckInspectionMapper;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckSonMapper;
@@ -14,9 +19,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 @Service
 public class StorageQualitycheckServiceImpl implements StorageQualitycheckService {
@@ -30,6 +34,15 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
     @Resource
     private StorageQualitycheckInspectionMapper qualityInspectionMapper;
 
+    @Resource
+    private AgileHouseFeignClient agileHouseFeignClient;
+
+    @Resource
+    private StorageHouseFeignClient storageHouseFeignClient;
+
+
+
+
 
     @Override
 	public List<StorageQualitycheck> queryByQualitycheck(StorageQualitycheck example) {
@@ -285,6 +298,52 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
     }
 
     @Override
+    public JSONArray getHouseIdAll(Integer orgId, HttpServletRequest request) {
+
+        List<JSONArray> ListAll = new ArrayList();
+
+        JSONObject obj = new JSONObject();
+        obj.put("unitid", orgId);
+        String kcswStr = JSON.toJSONString(obj);
+
+        //调用depot-agile接口
+        JSONObject crkobj =  agileHouseFeignClient.getList(1, 10, kcswStr, null);
+
+        //调用depot-storage接口
+        JSONObject cpyobj =  storageHouseFeignClient.getList(request,1, 10, null, null, null);
+
+        JSONArray crkJson = crkobj.getJSONArray("list");
+        JSONArray cpyJson = cpyobj.getJSONArray("list");
+
+        if(crkJson.size() > 0 && cpyJson.size() <= 0 ){
+            ListAll.addAll(Collections.singleton(crkJson));
+        }
+
+        if(crkJson.size() <= 0 && cpyJson.size() > 0){
+            for(int j=0;j<cpyJson.size();j++){
+                cpyJson.getJSONObject(j).put("ch",cpyJson.getJSONObject(j).get("houseId"));
+            }
+            ListAll.addAll(Collections.singleton(cpyJson));
+        }
+
+        if(crkJson.size() > 0 && cpyJson.size() > 0 ){
+            for(int i=0;i<crkJson.size();i++) {
+                for(int j=0;j<cpyJson.size();j++){
+                    cpyJson.getJSONObject(j).put("ch",cpyJson.getJSONObject(j).get("houseId"));
+                    if(crkJson.getJSONObject(i).get("ch").toString().equals(cpyJson.getJSONObject(j).get("houseId"))){
+                        cpyJson.remove(j);
+                        j--;
+                    }
+                }
+            }
+            ListAll.addAll(Collections.singleton(crkJson));
+            ListAll.addAll(Collections.singleton(cpyJson));
+        }
+
+        return JSONObject.parseArray(String.valueOf(ListAll));
+    }
+
+    @Override
 	public List<StorageQualitycheck> findByCondition(StorageQualitycheckExample example) {
 		return qualitycheckMapper.selectByExample(example);
 	}