1

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

@@ -196,6 +196,7 @@ public class ReceiveNoticeController {
 	public void updateNoticeReceiveAuditState(String cblx, String ysid, String hzsj) {
 		try {
 			String param = "cblx="+cblx+"&ysid="+ysid+"&hzsj="+hzsj;
+			logger.error("市平台通知性质转变单审批完该结束了，推送信息是："+param);
 			systemOutsideDataService.addlogger("update_rkxzzbd_zt_and_hzsj", param, null);
 			receiveNoticeService.updateNoticeReceiveAuditState(cblx, ysid, hzsj);
 		} catch (Exception e) {

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessProSheetAuditController.java

@@ -179,7 +179,7 @@ public class BusinessProSheetAuditController {
         BusinessNoticeReceive receiveNotice;
 		try {
 			receiveNotice = (BusinessNoticeReceive)mapper.readValue(receiveNoticeJson, BusinessNoticeReceive.class);
-			 receiveNoticeService.audit(receiveNotice, userId,  realName,orgName,content);
+			receiveNoticeService.audit(receiveNotice, userId,  realName,orgName,content);
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.java

@@ -8,93 +8,35 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 public interface BusinessNoticeReceiveMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
+
     int countByExample(BusinessNoticeReceiveExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int deleteByExample(BusinessNoticeReceiveExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int insert(BusinessNoticeReceive record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int insertSelective(BusinessNoticeReceive record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     List<BusinessNoticeReceive> selectByExample(BusinessNoticeReceiveExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     BusinessNoticeReceive selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int updateByExampleSelective(@Param("record") BusinessNoticeReceive record, @Param("example") BusinessNoticeReceiveExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int updateByExample(@Param("record") BusinessNoticeReceive record, @Param("example") BusinessNoticeReceiveExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int updateByPrimaryKeySelective(BusinessNoticeReceive record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table business_notice_receive
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
-     */
     int updateByPrimaryKey(BusinessNoticeReceive record);
 
 	List<Map<String, String>> getUserRole(Integer userId);
+
+	/**
+	 * 查询一条第三方接口配置数据
+	 * @param param
+	 * @return
+	 */
+	Map<String, Object> getSysCodeUrl(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.xml

@@ -782,4 +782,8 @@
 					user_id = #{userId,jdbcType=INTEGER}
 			)
   </select>
+  
+  <select id="getSysCodeUrl" parameterType="java.util.HashMap" resultType="java.util.HashMap">
+  	select * from sys_code WHERE org_id=#{orgId,jdbcType=INTEGER} and s_code=#{sCode,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -12,7 +12,6 @@ import com.chinaitop.depot.utils.HelloServiceHystrix;
 @FeignClient(name = "depot-basic", fallback = HelloServiceHystrix.class)
 public interface FeignBasicService {
 
-
     @RequestMapping(value = "/Warehouse/getWareDataByHwbm", method = RequestMethod.GET)
     Map<String, Object> getWareDataByHwbm(@RequestParam(value = "hwbm") String hwbm);
 
@@ -31,7 +30,7 @@ public interface FeignBasicService {
 
     @RequestMapping(value = "/Warehouse/getHouseIdBySptDataID", method = RequestMethod.GET)
     String getHouseIdBySptDataID(@RequestParam(value = "sptDataId") String sptDataId);
-    
+
     @RequestMapping(value = "/Tank/getTankIdBySptDataID", method = RequestMethod.GET)
     String getTankIdBySptDataID(@RequestParam(value = "sptDataId") String sptDataId);
 

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

@@ -525,7 +525,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         		receiveNotice.setLdshr(userId+"");
         		businessApproval.setTaskName("库领导审批");//任务名称
         	}
-        	
+
         	//修改本条数据
         	businessNoticeReceiveMapper.updateByPrimaryKeySelective(receiveNotice);
 
@@ -533,14 +533,38 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         //增加审批表数据
     	businessApprovalService.add(businessApproval);
 
-    	System.out.println("5".equals(receiveNotice.getAuditState().toString()));
-    	System.out.println("1".equals(receiveNotice.getIsNotice().toString()));
-    	System.out.println("0".equals(receiveNotice.getIsSheet().toString()));
-    	System.out.println("1".equals(receiveNotice.getCrktype()));
     	//必须是入库，库级和市级都审批完成，并且不是通知单，只是性质转变单
     	if ("5".equals(receiveNotice.getAuditState().toString()) && "1".equals(receiveNotice.getIsNotice().toString()) && "0".equals(receiveNotice.getIsSheet().toString()) && "1".equals(receiveNotice.getCrktype())) {
 			//转储成功后把信息给市平台
-			retSptMeagess(receiveNotice);
+			//retSptMeagess(receiveNotice);
+    		try {
+    			Map<String, Object> sysCodeMap = new HashMap<>();
+    			sysCodeMap.put("orgId", 10);
+    			sysCodeMap.put("sCode", "xzzzxxts");
+    			Map<String, Object> resultMap = businessNoticeReceiveMapper.getSysCodeUrl(sysCodeMap);
+    			String path = "";
+    			if (null != resultMap) {
+    				path = resultMap.get("s_val").toString();
+    			}
+    			if (null != receiveNotice.getCblx() && null != receiveNotice.getYsid()) {
+
+    				//组装请求参数
+    				Map<String, String> params = new HashMap<>();
+    				params.put("crklx", receiveNotice.getCblx());
+    				params.put("ysid", receiveNotice.getYsid());
+
+    				logger.info("给给市平台发送性质转变成功通知信息："+params.toString());
+    				logger.info("给给市平台发送性质转变成功通知信息地址是："+path);
+
+    				//给市平台发送请求
+    				String result = HTTPUtils.doPost(path, params);
+
+    				//保存推送合同引用状态的消息和返回结果
+    				systemOutsideDataService.addlogger("xzzzxx_result", params.toString(), result);
+    			}
+    		} catch (Exception e) {
+    			e.printStackTrace();
+    		}
     	}
 	}
 
@@ -560,21 +584,28 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		String result = "";
 
 		//获取请求的URL地址
-		String path;
 		try {
-			path = sysCodeService.getSVal(10, "xzzzxxts");
+			Map<String, Object> sysCodeMap = new HashMap<>();
+			sysCodeMap.put("orgId", 10);
+			sysCodeMap.put("sCode", "xzzzxxts");
+			Map<String, Object> resultMap = businessNoticeReceiveMapper.getSysCodeUrl(sysCodeMap);
+			String path = "";
+			if (null != resultMap) {
+				path = resultMap.get("s_val").toString();
+			}
 			if (null != receiveNotice.getCblx() && null != receiveNotice.getYsid()) {
-				
+
 				//组装请求参数
 				Map<String, String> params = new HashMap<>();
 				params.put("crklx", receiveNotice.getCblx());
 				params.put("ysid", receiveNotice.getYsid());
-				
+
 				logger.info("给给市平台发送性质转变成功通知信息："+params.toString());
-				
+				logger.info("给给市平台发送性质转变成功通知信息地址是："+path);
+
 				//给市平台发送请求
 				result = HTTPUtils.doPost(path, params);
-				
+
 				//保存推送合同引用状态的消息和返回结果
 				systemOutsideDataService.addlogger("xzzzxx_result", params.toString(), result);
 			}

src/main/java/com/chinaitop/depot/system/service/impl/SysCodeServiceImpl.java

@@ -41,6 +41,7 @@ public class SysCodeServiceImpl implements SysCodeService {
 			SysCode sysCode = querySysCode(orgId, sCode);
 			if (null != sysCode) {
 				val = sysCode.getsVal();
+				System.out.println("配置数据是："+val);
 			} else {
 				val = "无此配置";
 				System.out.println("没有检测到配置URL");