new

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/OrdersIssueServiceImpl.java

@@ -25,6 +25,7 @@ import com.fuzamei.mapperInterface.OrdersIssueMapper;
 import com.fuzamei.service.OrdersIssueService;
 import com.fuzamei.util.PageDTO;
 import com.fuzamei.util.blockchain.BlockChainUtil;
+import com.fuzamei.util.blockchain.ProtobufBean;
 
 @Service
 public class OrdersIssueServiceImpl implements OrdersIssueService {
@@ -103,8 +104,11 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 		params.setOperationTime(currentTime);
 		params.setHash(hash);
 		operationHistoryMapper.addToHistory(params);
-		boolean flag = blockChainUtil.sendBlockChain(params.getSign());
-		if(!flag) throw new RuntimeException("区块链操作失败");
+		ProtobufBean protobufBean = blockChainUtil.getProtobufBean(params.getSign());
+		String result = blockChainUtil.sendPostParam(protobufBean);
+		boolean flag = blockChainUtil.vilaResult(result);
+//		boolean flag = blockChainUtil.sendBlockChain(params.getSign());
+		if(!flag) throw new RuntimeException("区块链操作失败:"+result);
 	}
 
 	@Override

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/PlannerServiceImpl.java

@@ -16,12 +16,15 @@ import com.fuzamei.mapperInterface.PlannerMapper;
 import com.fuzamei.mapperInterface.ReceivingClerkMapper;
 import com.fuzamei.mapperInterface.UserMapper;
 import com.fuzamei.service.PlannerService;
+import com.fuzamei.util.blockchain.BlockChainUtil;
 @Service
 public class PlannerServiceImpl implements  PlannerService{
   @Autowired
   private PlannerMapper  plannerMapper;
   @Autowired
   private UserMapper userMapper;
+  @Autowired
+  private BlockChainUtil blockChainUtil;
 	@Override
 	public List<User> queryPlanner(Map<String, Object> map) {
 		 return plannerMapper.queryPlanner(map);
@@ -47,12 +50,11 @@ public class PlannerServiceImpl implements  PlannerService{
 	@Override
 	@Transactional(rollbackFor=Exception.class)
 	public void insertAgainSupplier(User  pp) {//得到前端传来所有得供应商ID 做插入操作
+		deleteBeforeSupplierByUserId(Integer.parseInt(pp.getPlannerId()));//删除计划员下面的所有供应商
+		
 		//下面是【循环添加供应商得id】
-		String[] str=pp.getSupplierId().split(",");
-		for (int i = 0; i < str.length; i++) {
-			pp.setSupplierId(str[i]);
-			plannerMapper.insertAgainSupplier(pp);
-		}
+		pp.setSupplierIds(pp.getSupplierId().split(","));
+		plannerMapper.insertAgainSupplier(pp);
 		
 		
 		//下面往【操作记录】表插入数据
@@ -68,10 +70,10 @@ public class PlannerServiceImpl implements  PlannerService{
 		pp.setHash(hash);//操作hash
 		userMapper.insertOperationHistory(pp);//插入到操作记录表去
 		
-		/*boolean flag = blockChainUtil.sendBlockChain(pp.getSign());//发送签名直接转发到区块链
+		boolean flag = blockChainUtil.sendBlockChain(pp.getSign());//发送签名直接转发到区块链
 		if(!flag) {
-			 throw new RuntimeException("区块链操作失败2");	
-		}*/
+			 throw new RuntimeException("区块链操作失败");
+		}
 
 	}
 

saicLogistics/src/main/java/com/fuzamei/web/PlannerAction.java

@@ -124,7 +124,7 @@ public class PlannerAction {
 		    }else {//否则就做先删除原先得  在添加得到新的供应商id 做插入操作
 		    	plannerService.insertAgainSupplier(pp);//然后在插入新得到的供应商id
 		    }
-			return  JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS,pp);//待
+			return  JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS,null);//待
 		} catch (Exception e) {
 			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);

saicLogistics/src/main/resources/spring-mvc.xml

@@ -35,11 +35,11 @@
 	<tx:annotation-driven transaction-manager="transactionManager"
 		proxy-target-class="true" />
 	<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
-  <!--  	<mvc:interceptors>
+   	<mvc:interceptors>
 		<mvc:interceptor>
 			<mvc:mapping path="/**" />
 			<mvc:exclude-mapping path="/login"/>
 			<bean class="com.fuzamei.interceptor.TokenInterceptor" />
 		</mvc:interceptor>
-	</mvc:interceptors>  -->  
+	</mvc:interceptors>   
 </beans>