Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-business-tianjin.git

src/main/java/com/chinaitop/depot/business/controller/BusinessContractReceiveController.java

@@ -91,6 +91,8 @@ public class BusinessContractReceiveController {
 		@ApiImplicitParam(name = "datas", value = "数据串", paramType = "form")
 	})
 	public String saveContract(String datas) {
+		logger.info("市平台推送合同数据如下：");
+		logger.info(datas);
 		Map<String, String> result = new HashMap<>();
 		try {
 			result = businessContractReceiveService.receiveContractData(datas);

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

@@ -11,6 +11,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.business.mapper.BusinessContractReceiveMapper;
@@ -19,6 +20,7 @@ import com.chinaitop.depot.business.model.BusinessContractReceiveExample;
 import com.chinaitop.depot.business.model.BusinessContractReceiveExample.Criteria;
 import com.chinaitop.depot.business.service.BusinessContractReceiveService;
 import com.chinaitop.depot.business.service.FeignBasicService;
+import com.chinaitop.depot.feignService.DepotKeeperAccountFeignService;
 
 @Service
 @SuppressWarnings("all")
@@ -30,7 +32,11 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 	@Resource
 	private FeignBasicService feignBasicService;
 
+	@Resource
+	private DepotKeeperAccountFeignService feigenKeeperAccountService;
+
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Map<String, String> receiveContractData(String data) throws Exception {
 		Map<String, String> resultMap = new HashMap<>();
 		if (StringUtils.isBlank(data)) {
@@ -46,11 +52,13 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 			resultMap.put("msg", msg);
 			return resultMap;
 		} else {
-			//保存数据
-			List<BusinessContractReceive> list = (List<BusinessContractReceive>) check_map.get("ware_list");
-			for (BusinessContractReceive b : list) {
-				businessContractReceiveMapper.insert(b);
-			}
+			//保存合同数据
+			BusinessContractReceive obj_map = (BusinessContractReceive) check_map.get("ware_list");
+			businessContractReceiveMapper.insert(obj_map);
+			
+			//处理客户信息数据
+			editCustomer(obj_map.getOrgId(), obj_map.getKhmc());
+
 			resultMap.put("status", "200");
 			resultMap.put("msg", "推送成功");
 		}
@@ -100,7 +108,7 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 			if (StringUtils.isNotBlank(lspz)) {
 				dataobj.setLypz(Integer.parseInt(lspz));
 			} else {
-				sbf.append("粮食品种的值"+pz+"有误,");
+				sbf.append("粮食品种的值"+pz+"有误或不合理,");
 			}
 		} else {
 			sbf.append("粮食品种不能为空,");
@@ -108,12 +116,13 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		String mxpz = obj.getString("mxpz");
 		if (StringUtils.isNotBlank(mxpz)) {
 			if (null != dataobj.getLypz()) {
-				Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(dataobj.getLypz(), null, pz);
+				mxpz = mxpz.replace(" ", "");
+				Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(dataobj.getLypz(), null, mxpz);
 				String lsmxpz = basicMap.get("enumId")+"";
 				if (StringUtils.isNotBlank(lsmxpz)) {
 					dataobj.setMxpz(Integer.parseInt(lsmxpz));
 				} else {
-					sbf.append("粮食明细品种的值"+mxpz+"有误,");
+					sbf.append("粮食明细品种的值"+mxpz+"有误或不合理,");
 				}
 			}
 		} else {
@@ -121,12 +130,13 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		}
 		String lydj = obj.getString("dj");
 		if (StringUtils.isNotBlank(lydj)) {
+			lydj = lydj.replace(" ", "");
 			Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1002, null, lydj);
 			String dj = basicMap.get("enumId")+"";
 			if (StringUtils.isNotBlank(dj)) {
 				dataobj.setLydj(Integer.parseInt(dj));
 			} else {
-				sbf.append("粮食等级的值"+lydj+"有误,");
+				sbf.append("粮食等级的值"+lydj+"有误或不合理,");
 			}
 		} else {
 			sbf.append("粮食等级不能为空,");
@@ -158,33 +168,21 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		}
 		String khmc = obj.getString("khmc");
 		if (StringUtils.isNotBlank(khmc)) {
-			dataobj.setKhmc(khmc.trim());
+			dataobj.setKhmc(khmc.replace(" ", "").trim());
 		} else {
 			sbf.append("客户名称不能为空,");
 		}
-		String tyxydm = obj.getString("khzjh");
-		if (StringUtils.isNotBlank(tyxydm)) {
-			dataobj.setTyxydm(tyxydm.trim());
-		} else {
-			sbf.append("客户证件号不能为空,");
-		}
-		String hw_sptid = obj.getString("hwbm");//getWareOrTankObj
+		String hw_sptid = obj.getString("hwbm");//市平台货物数据主键ID
 		if (StringUtils.isNotBlank(hw_sptid)) {
-			String []id_nums = hw_sptid.split(",");
-			BusinessContractReceive num_data = null;
-			for (String id : id_nums) {
-				Map<String, Object> basicMap = feignBasicService.getWareOrTankObj(id);
-				if (!"0".equals(basicMap.get("houseId")) && !"0".equals(basicMap.get("warehouseId")) && !"0".equals(basicMap.get("orgId"))) {
-					num_data = dataobj;
-					num_data.setHouseId(Integer.parseInt(basicMap.get("houseId").toString()));
-					num_data.setWarehouseId(Integer.parseInt(basicMap.get("warehouseId").toString()));
-					num_data.setOrgId(Integer.parseInt(basicMap.get("orgId").toString()));
-					num_data.setInputTime(new Date());
-					num_data.setUpdateTime(num_data.getInputTime());
-					list.add(num_data);
-				} else {
-					sbf.append("hwbm的值"+id+"异常,");
-				}
+			Map<String, Object> basicMap = feignBasicService.getWareOrTankObj(hw_sptid);
+			if (!"0".equals(basicMap.get("houseId")) && !"0".equals(basicMap.get("warehouseId")) && !"0".equals(basicMap.get("orgId"))) {
+				dataobj.setHouseId(Integer.parseInt(basicMap.get("houseId").toString()));
+				dataobj.setWarehouseId(Integer.parseInt(basicMap.get("warehouseId").toString()));
+				dataobj.setOrgId(Integer.parseInt(basicMap.get("orgId").toString()));
+				dataobj.setInputTime(new Date());
+				dataobj.setUpdateTime(dataobj.getInputTime());
+			} else {
+				sbf.append("未查询到hwbm的值对应的货位数据,");
 			}
 		} else {
 			sbf.append("hwbm的值不能为空,");
@@ -192,7 +190,7 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 
 		Map<String, Object> resultMap = new HashMap<>();
 		resultMap.put("msg", sbf.toString());
-		resultMap.put("data", list);
+		resultMap.put("data", dataobj);
 
 		return resultMap;
 	}
@@ -226,4 +224,17 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		return businessContractReceive;
 	}
 
+	private void editCustomer(Integer orgId, String customerName) throws Exception {
+		String flag = feigenKeeperAccountService.checkRepeat(orgId, 3153, customerName);
+		
+		if ("true".equals(flag)) {//说明这个客户没再库级维护
+			JSONObject json = new JSONObject();
+			json.put("name", customerName);
+			json.put("sfwz", "1");
+			Map<String, Object> modelMap = feigenKeeperAccountService.save(json.toString(), orgId);
+			if ("error".equals(modelMap.get("status"))) {
+				throw new Exception("不完整客户保存异常");
+			}
+		}
+	}
 }

src/main/java/com/chinaitop/depot/feignService/DepotKeeperAccountFeignService.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.feignService;
+
+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;
+
+@FeignClient(value = "DEPOT-KEEPER-ACCOUNT")
+public interface DepotKeeperAccountFeignService {
+
+	/**
+	 * 查询客户是否存在
+	 * @param orgId 组织机构ID
+	 * @param customerType 客户类型(3152:个人客户,3153:企业客户)
+	 * @param customerName 客户名称
+	 * @return false代表存在
+	 */
+	@RequestMapping(value = "/depot/business/customer/checkRepeat", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	String checkRepeat(@RequestParam("orgId") Integer orgId, @RequestParam("customerType") Integer customerType, @RequestParam("customerType")String customerName);
+
+	/**
+	 * 保存一条不完整的客户数据
+	 * @param customerJson
+	 * @param orgId
+	 * @return
+	 */
+	@RequestMapping(value = "/depot/business/customer/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	Map<String, Object> save(@RequestParam("customerJson")String customerJson, @RequestParam("orgId") Integer orgId);
+}

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

@@ -24,30 +24,44 @@ public class CustomFilter implements Filter {
 	@Override
 	public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2)
 			throws IOException, ServletException {
-		//ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper((HttpServletRequest) arg0);
-		HttpServletRequest request = (HttpServletRequest) arg0;
-		HttpSession session = request.getSession();
-		String orgId = "";
-		if (session != null){
-			orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
-		}
-		if (StringUtils.isNotBlank(orgId)) {
-			DataPolicyEngine.set(orgId);
-		}
-
-		/*if (StringUtils.isNotBlank(orgId)) {
-			// 将参数追加到request url 之后
-			requestWrapper.addParameter("orgId", orgId);
-			requestWrapper.addParameter("unitid", orgId);
-			requestWrapper.addParameter("unitId", orgId);
-			// 将参数追加到request 的body 中
-			requestWrapper.addParameterToBody("orgId", orgId);
-			requestWrapper.addParameterToBody("unitid", orgId);
-			requestWrapper.addParameterToBody("unitId", orgId);
-		}*/
-
-		//arg2.doFilter(requestWrapper, arg1);
-		arg2.doFilter(arg0, arg1);
+
+	    if (StringUtils.isBlank(arg0.getContentType()) || this.isJson(arg0)) {
+	    	ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper((HttpServletRequest) arg0);
+	    	HttpServletRequest request = (HttpServletRequest) arg0;
+	    	HttpSession session = request.getSession();
+	    	String orgId = "";
+	    	if (session != null){
+	    		orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
+	    	}
+	    	if (StringUtils.isNotBlank(orgId)) {
+	    		DataPolicyEngine.set(orgId);
+	    	}
+	    	
+	    	if (StringUtils.isNotBlank(orgId)) {
+	    		// 将参数追加到request url 之后
+	    		requestWrapper.addParameter("orgId", orgId);
+	    		requestWrapper.addParameter("unitid", orgId);
+	    		requestWrapper.addParameter("unitId", orgId);
+	    		// 将参数追加到request 的body 中
+	    		requestWrapper.addParameterToBody("orgId", orgId);
+	    		requestWrapper.addParameterToBody("unitid", orgId);
+	    		requestWrapper.addParameterToBody("unitId", orgId);
+	    	}
+	    	
+	    	arg2.doFilter(requestWrapper, arg1);
+	    } else if (isMultipart(arg0)) {
+	    	HttpServletRequest request = (HttpServletRequest) arg0;
+	    	HttpSession session = request.getSession();
+	    	String orgId = "";
+	    	if (session != null){
+	    		orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
+	    	}
+	    	if (StringUtils.isNotBlank(orgId)) {
+	    		DataPolicyEngine.set(orgId);
+	    	}
+
+	    	arg2.doFilter(arg0, arg1);
+	    }
 		DataPolicyEngine.remove();
 	}
 	
@@ -56,4 +70,27 @@ public class CustomFilter implements Filter {
  
     }
 
+	private boolean isJson(ServletRequest request) {
+		boolean flag = request.getContentType().toLowerCase().startsWith("application/");
+        if (flag) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+	/**
+     * 判断本次请求的数据类型是否为上传文件
+     *
+     * @param request request
+     * @return boolean
+     */
+    private boolean isMultipart(ServletRequest request) {
+    	boolean flag = request.getContentType().toLowerCase().startsWith("multipart/");
+        if (request.getContentType() != null && flag) {
+            return true;
+        }
+
+        return false;
+   }
 }

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

@@ -11,9 +11,10 @@ import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.FeignSystemService;
+import com.chinaitop.depot.feignService.DepotKeeperAccountFeignService;
 
 @Component
-public class HelloServiceHystrix implements FeignAgileService,FeignBasicService,FeignSystemService{
+public class HelloServiceHystrix implements FeignAgileService,FeignBasicService,FeignSystemService,DepotKeeperAccountFeignService{
 
 	public static final Logger logger = LoggerFactory.getLogger(HelloServiceHystrix.class);
 	
@@ -72,7 +73,7 @@ public class HelloServiceHystrix implements FeignAgileService,FeignBasicService,
 
 	@Override
 	public Map<String, Object> getIdByNameAndParentId(Integer parentId, String enumName, String gbCode) {
-		logger.info("获取生产年度的ID失败!");
+		logger.info("获取获取字段值失败!");
 		return null;
 	}
 
@@ -100,4 +101,16 @@ public class HelloServiceHystrix implements FeignAgileService,FeignBasicService,
 		return null;
 	}
 
+	@Override
+	public String checkRepeat(Integer orgId, Integer customerType, String customerName) {
+		logger.info("接收合同时，校验客户信息是否存在失败!");
+		return null;
+	}
+
+	@Override
+	public Map<String, Object> save(String customerJson, Integer orgId) {
+		logger.info("接收合同时，保存客户信息接口调用失败!");
+		return null;
+	}
+
 }

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

@@ -1,12 +1,5 @@
-/*package com.chinaitop.depot.utils;
+package com.chinaitop.depot.utils;
 
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -14,14 +7,23 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
-*//**
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.springframework.util.StringUtils;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
  * request 请求参数添加
  *
  * @Description TODO
  * @Date 2022/12/13 09:41
  * @Author fxw
  * @Version 1.0
- *//*
+ */
 public class ParameterRequestWrapper extends HttpServletRequestWrapper {
 
     private Map<String, String[]> params = new HashMap<String, String[]>();
@@ -42,32 +44,32 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
         this.params.putAll(request.getParameterMap());
     }
 
-    *//**
+    /**
      * 重载一个构造方法-- 扩展参数
      *
      * @param request
      * @param extendParams
-     *//*
+     */
     public ParameterRequestWrapper(HttpServletRequest request, Map<String, Object> extendParams) {
         this(request);
         //这里将扩展参数写入参数表
         addAllParameters(extendParams);
     }
 
-    *//**
+    /**
      * 增加多个参数
      *
      * @param otherParams
-     *//*
+     */
     public void addAllParameters(Map<String, Object> otherParams) {
         for (Map.Entry<String, Object> entry : otherParams.entrySet()) {
             addParameter(entry.getKey(), entry.getValue());
         }
     }
 
-    *//**
+    /**
      * 增加参数
-     *//*
+     */
     public void addParameter(String name, Object value) {
         if (value != null) {
             if (value instanceof String[]) {
@@ -80,19 +82,19 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
         }
     }
     
-    *//**
+    /**
      * 删除参数
-     *//*
+     */
     public void deleteParameter(String key) {
     	params.remove(key);
     }
 
-    *//**
+    /**
      * 增加body 参数
      *
      * @param name
      * @param value
-     *//*
+     */
     public void addParameterToBody(String name, Object value) {
         byte[] json = this.body;
         if (null == json) {
@@ -111,12 +113,12 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
 
     }
 
-    *//**
+    /**
      * 删除body 参数
      *
      * @param name
      * @param value
-     *//*
+     */
     public void deleteParameterToBody(String key) {
         byte[] json = this.body;
         if (null == json) {
@@ -134,12 +136,12 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
     }
 
 
-    *//**
+    /**
      * body中参数解密
      *
      * @param json
      * @return
-     *//*
+     */
     private String getData(String json) {
         //加密，如果传过来的是加密数据，先解密，未加密直接返回原json
 //        if(StringUtils.isNotEmpty(json)){
@@ -155,12 +157,12 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
 
     }
 
-    *//**
+    /**
      * 获取body 参数
      *
      * @param request
      * @return
-     *//*
+     */
     public static String getPostData(HttpServletRequest request) {
         StringBuilder data = new StringBuilder();
         String line;
@@ -195,12 +197,12 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
         return new BufferedReader(new InputStreamReader(getInputStream()));
     }
 
-    *//**
+    /**
      * 在使用@RequestBody注解的时候，其实框架是调用了getInputStream()方法，所以我们要重写这个方法
      *
      * @return
      * @throws IOException
-     *//*
+     */
     @Override
     public ServletInputStream getInputStream() throws IOException {
         if (body == null) {
@@ -231,4 +233,3 @@ public class ParameterRequestWrapper extends HttpServletRequestWrapper {
     }
 
 }
-*/