1

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

@@ -15,8 +15,17 @@ public interface FeignBasicService {
 
     @RequestMapping(value = "/Warehouse/getWareDataByHwbm", method = RequestMethod.GET)
     Map<String, Object> getWareDataByHwbm(@RequestParam(value = "hwbm") String hwbm);
-    
-    
+
+    /**
+     * 获取字典树类型
+     * @param parentId
+     * @param notParentId
+     * @param notEnumId
+     * @return
+     */
+    @RequestMapping(value = "/Enum/findConditionEnum", method = RequestMethod.GET)
+    Map<String, Object> findConditionEnum(@RequestParam(value = "parentId") Integer parentId, @RequestParam(value = "notParentId") Integer notParentId, @RequestParam(value = "notEnumId") Integer notEnumId);
+
     @RequestMapping(value = "/Enum/getIdByNameAndParentId", method = RequestMethod.GET)
     Map<String, Object> getIdByNameAndParentId(@RequestParam(value = "parentId") Integer parentId,@RequestParam(value = "enumName") String enumName, @RequestParam(value = "gbCode") String gbCode);
 

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractReceiveServiceImpl.java

@@ -15,6 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.business.controller.BusinessContractController;
 import com.chinaitop.depot.business.mapper.BusinessContractReceiveMapper;
@@ -114,11 +116,11 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		String pz = obj.getString("pz");
 		if (StringUtils.isNotBlank(pz)) {
 			Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, pz);
-			logger.info("获取到的品种数据如下：");
+			logger.info("根据"+pz+"获取到的品种数据如下：");
 			logger.info(basicMap.toString());
-			String lspz = basicMap.get("enumId")+"";
-			if (StringUtils.isNotBlank(lspz)) {
-				dataobj.setLypz(Integer.parseInt(lspz));
+			String lypz = basicMap.get("enumId")+"";
+			if (StringUtils.isNotBlank(lypz)) {
+				dataobj.setLypz(Integer.parseInt(lypz));
 			} else {
 				sbf.append("粮食品种的值"+pz+"有误或不合理,");
 			}
@@ -128,13 +130,10 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		String mxpz = obj.getString("mxpz");
 		if (StringUtils.isNotBlank(mxpz)) {
 			if (null != dataobj.getLypz()) {
-				mxpz = mxpz.replace(" ", "");
-				Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(dataobj.getLypz(), null, mxpz);
-				logger.info("获取到的明细品种数据如下：");
-				logger.info(basicMap.toString());
-				String lsmxpz = basicMap.get("enumId")+"";
-				if (StringUtils.isNotBlank(lsmxpz)) {
-					dataobj.setMxpz(Integer.parseInt(lsmxpz));
+				Integer enumid = getEnumId(dataobj.getLypz(), mxpz);
+				logger.info("根据"+mxpz+"获取到的明细品种数据是："+enumid);
+				if (null != enumid) {
+					dataobj.setMxpz(enumid);
 				} else {
 					sbf.append("粮食明细品种的值"+mxpz+"有误或不合理,");
 				}
@@ -157,12 +156,10 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		}
 		String lyxz = obj.getString("lsxz");
 		if (StringUtils.isNotBlank(lyxz)) {
-			Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1032, null, lyxz);
-			logger.info("获取到的粮食性质数据如下：");
-			logger.info(basicMap.toString());
-			String lsxz = basicMap.get("enumId")+"";
-			if (StringUtils.isNotBlank(lsxz)) {
-				dataobj.setLyxz(Integer.parseInt(lsxz));
+			Integer enumid = getEnumId(1032, lyxz);
+			logger.info("根据"+lyxz+"获取到的粮食性质数据如下："+enumid);
+			if (null != enumid) {
+				dataobj.setLyxz(enumid);
 			} else {
 				sbf.append("粮食性质的值"+lyxz+"有误,");
 			}
@@ -219,6 +216,31 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		return resultMap;
 	}
 
+	/**
+	 * 根据字典父级ID和国标编码获取下面的一个字典ID
+	 * @param parentId
+	 * @param gbCode
+	 * @return
+	 */
+	private Integer getEnumId(int parentId, String gbCode) {
+		Integer enumId = null;
+		Map<String, Object> map = feignBasicService.findConditionEnum(parentId, null, null);
+		if (null != map) {
+			String json_str = JSON.toJSONString(map);
+			JSONObject json_obj = JSONObject.parseObject(json_str);
+			JSONArray array = JSONArray.parseArray(json_obj.getString("enumList"));
+			for (int i = 0; i < array.size(); i++) {
+				JSONObject object = JSONObject.parseObject(array.get(i).toString());
+				String code = object.getString("gbcode");
+				if (code.equals(gbCode)) {
+					enumId = Integer.parseInt(object.getString("id"));
+					break;
+				}
+			}
+		}
+		return enumId;
+	}
+
 	@Override
 	public List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx)
 			throws Exception {

src/main/java/com/chinaitop/depot/utils/HelloServiceHystrix.java

@@ -113,4 +113,10 @@ public class HelloServiceHystrix implements FeignAgileService,FeignBasicService,
 		return null;
 	}
 
+	@Override
+	public Map<String, Object> findConditionEnum(Integer parentId, Integer notParentId, Integer notEnumId) {
+		logger.info("获取"+parentId+"下的字典树接口调用失败!");
+		return null;
+	}
+
 }