出库通知单提示

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

@@ -1,6 +1,23 @@
 package com.chinaitop.depot.business.controller;
 
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.RestController;
+
 import com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice;
 import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
 import com.chinaitop.depot.business.model.enums.AuditType;
@@ -8,28 +25,17 @@ import com.chinaitop.depot.business.model.enums.StoreWareType;
 import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
 import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
 import com.chinaitop.depot.business.service.GrainNoticeService;
+import com.chinaitop.depot.business.service.SystemOutsideDataService;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-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.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 储备粮管理-通知单
@@ -41,11 +47,13 @@ import java.util.Map;
 @Api(value= "GrainNoticeController", description = "储备粮管理-出入库通知单管理")
 
 public class GrainNoticeController {
-    
+	public static final Logger logger = LoggerFactory.getLogger(GrainNoticeController.class);
     @Resource
     private GrainNoticeService deliveryStorageNoticeService;
     @Resource
     private BusinessStoreWareDetailService businessStoreWareDetailService;
+    @Resource
+	private SystemOutsideDataService systemOutsideDataService;
     
     /**
      * 申请列表.
@@ -617,4 +625,20 @@ public class GrainNoticeController {
         }
         return modelMap;
     }
+    
+    @RequestMapping(value="/pushCktzdts",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+   	@ApiOperation(value="给市平台推送出库通知单提示消息", notes = "")
+   	@ApiImplicitParams({
+   		@ApiImplicitParam(name = "fsr", value = "发送人", paramType = "query"),
+   		@ApiImplicitParam(name = "fsdw", value = "发送单位", paramType = "query")
+   	})
+    public void pushCktzdts(String fsr, String fsdw) {
+    	try {
+			String resultStr = deliveryStorageNoticeService.pushCktzdts(fsr, fsdw);
+			systemOutsideDataService.addlogger("cktzdts", fsr+"_"+fsdw, resultStr);
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			systemOutsideDataService.addlogger("cktzdts", fsr+"_"+fsdw, e.getMessage());
+		}
+    }
 }

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

@@ -216,8 +216,8 @@ public class ReceiveNoticeController {
 			BusinessNoticeReceive receiveNotice = (BusinessNoticeReceive)mapper.readValue(datas, BusinessNoticeReceive.class);
 			receiveNoticeService.retSptMeagess(receiveNotice);
 		} catch (Exception e) {
-			logger.error("性质转变单生成异常");
-			logger.error(e.getMessage());
+			logger.error("推送性质转变单库级审批结束信息给市平台时代码异常");
+			logger.error(e.getMessage(), e);
 			map.put("status", "error");
 			map.put("msg", "接口异常，请联系管理员！");
 		}

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

@@ -115,6 +115,14 @@ public interface GrainNoticeService {
 
 	List<BusinessDeliveryStorageNotice> getAuditPassList(Integer pageNum, Integer pageSize,
 			BusinessDeliveryStorageNotice notice);
-			
+
+	/**
+	 * 给市平台推送出库通知单提示消息
+	 * @param fsr
+	 * @param fsdw
+	 * @return
+	 * @throws Exception
+	 */
+	String pushCktzdts(String fsr, String fsdw) throws Exception;
 
 }

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

@@ -11,12 +11,15 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.act.service.ActTaskService;
 import com.chinaitop.depot.agile.model.BusinessScedule;
+import com.chinaitop.depot.business.controller.GrainNoticeController;
 import com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessContract;
@@ -41,6 +44,8 @@ import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.GrainContractService;
 import com.chinaitop.depot.business.service.GrainNoticeService;
 import com.chinaitop.depot.business.service.UserInfoService;
+import com.chinaitop.depot.system.service.SysCodeService;
+import com.chinaitop.depot.utils.HTTPUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
@@ -48,7 +53,8 @@ import com.google.common.collect.Maps;
 
 @Service
 public class GrainNoticeServiceImpl implements GrainNoticeService {
-    @Resource
+	public static final Logger logger = LoggerFactory.getLogger(GrainNoticeServiceImpl.class);
+	@Resource
     private BusinessDeliveryStorageNoticeMapper businessDeliveryStorageNoticeMapper;
     @Resource
     private BusinessStoreWareDetailService businessStoreWareDetailService;
@@ -67,6 +73,8 @@ public class GrainNoticeServiceImpl implements GrainNoticeService {
     private UserInfoService userInfoService;
     @Resource
 	private FeignAgileService feignAgileService;
+    @Resource
+	private SysCodeService sysCodeService;
     
     // 入库通知单枚举id,出入库系统使用.
     private static Integer STORAGENOTICEENUMID = 2816;
@@ -1233,5 +1241,29 @@ public class GrainNoticeServiceImpl implements GrainNoticeService {
             List<BusinessDeliveryStorageNotice> list = businessDeliveryStorageNoticeMapper.selectByExample(example);
             return list;
 		}
+
+
+		@Override
+		public String pushCktzdts(String fsr, String fsdw) throws Exception {
+			String path = sysCodeService.getSVal(10, "cktzdts");
+			logger.info("查到的配置接口数据是："+path);
+			String result = null;
+			if (StringUtils.isNotBlank(path)) {
+				//组装请求参数
+				Map<String, String> params = new HashMap<>();
+				params.put("fsr", fsr);
+				params.put("fsdw", fsdw);
+
+				logger.info("给给市平台发送出库通知单提示信息参数是："+params.toString());
+				logger.info("给给市平台发送出库通知单提示信息地址是："+path);
+
+				//给市平台发送请求
+				result = HTTPUtils.doPost(path, params);
+
+				//保存推送合同引用状态的消息和返回结果
+				//systemOutsideDataService.addlogger("cktzdts", params.toString(), result);
+			}
+			return result;
+		}
     
 }