4568

saicLogistics/src/main/java/com/fuzamei/entity/PlannerSupplier.java

@@ -3,7 +3,7 @@ package com.fuzamei.entity;
 import java.util.List;
 
 //计划员供应商表
-public class PlannerSupplier extends  User{
+public class PlannerSupplier {
 	private  Integer id;         //主键id
 	private  String plannerId; //计划员id
 	private  String supplierId;//供应商id

saicLogistics/src/main/java/com/fuzamei/entity/User.java

@@ -7,7 +7,7 @@ package com.fuzamei.entity;
  * @date:2018年1月30日下午3:28:48
  * @version v1.0
  */
-public class User {
+public class User  extends  PlannerSupplier{
 	private String tokenId;	
 	private Integer id;             //主键id
 	private Integer userId;	        //用户id

saicLogistics/src/main/java/com/fuzamei/mapperInterface/PlannerMapper.java

@@ -12,6 +12,6 @@ public interface PlannerMapper {
 	 public List<User> queryAllNoSupplierByPlannerId(int plannerId);//查询未添加的供应商
 	 
 	 public void deleteBeforeSupplierByUserId(int plannerId);//根据计划员id删除之前所有的供应商
-	 public void  insertAgainSupplier(PlannerSupplier  pp);//得到前端传来所有得供应商ID 做插入操作
+	 public void  insertAgainSupplier(User  user);//得到前端传来所有得供应商ID 做插入操作
 	 
 }

saicLogistics/src/main/java/com/fuzamei/service/PlannerService.java

@@ -15,7 +15,7 @@ public interface PlannerService {
 	
 	public void deleteBeforeSupplierByUserId(int plannerId);//根据计划员id删除之前所有的供应商
 	 
-	public void insertAgainSupplier(PlannerSupplier pp);//得到前端传来所有得供应商ID 做插入操作
+	public void insertAgainSupplier(User  user);//得到前端传来所有得供应商ID 做插入操作
 	
 	
 }

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

@@ -46,8 +46,8 @@ public class PlannerServiceImpl implements  PlannerService{
 
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public void insertAgainSupplier(PlannerSupplier  pp) {//得到前端传来所有得供应商ID 做插入操作
-		//下面是【先删除原先的，在添加传来的供应商id】
+	public void insertAgainSupplier(User  pp) {//得到前端传来所有得供应商ID 做插入操作
+		//下面是【循环添加供应商得id】
 		String[] str=pp.getSupplierId().split(",");
 		for (int i = 0; i < str.length; i++) {
 			pp.setSupplierId(str[i]);
@@ -55,7 +55,6 @@ public class PlannerServiceImpl implements  PlannerService{
 		}
 		
 		
-		//下面待改动   
 		//下面往【操作记录】表插入数据
 		Long currentTime = System.currentTimeMillis();//得到当前系统时间
 		String sign = pp.getSign();
@@ -69,7 +68,7 @@ public class PlannerServiceImpl implements  PlannerService{
 		pp.setHash(hash);//操作hash
 		userMapper.insertOperationHistory(pp);//插入到操作记录表去
 		
-		/*boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链
+		/*boolean flag = blockChainUtil.sendBlockChain(pp.getSign());//发送签名直接转发到区块链
 		if(!flag) {
 			 throw new RuntimeException("区块链操作失败2");	
 		}*/

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

@@ -110,7 +110,7 @@ public class PlannerAction {
 	 * @return
 	 */
 	@PostMapping(value="inserAginSupplierList")
-	public Map<String, Object> inserAginSupplierList(@RequestBody PlannerSupplier  pp){
+	public Map<String, Object> inserAginSupplierList(@RequestBody User  pp){
 		try {
 			@SuppressWarnings("unchecked")
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
@@ -118,11 +118,12 @@ public class PlannerAction {
 			Integer plannerId = ValidationUtil.checkAndAssignInt(pp.getPlannerId());//得到前端传来的计划员id（校验）
 			ValidationUtil.checkBlankAndAssignString(pp.getSign());//校验前端传来的签名
 		    if(pp.getSupplierId().equals("")) {//判断如果传过来得到的供应商是没有移动的的 （就是点击配置后，什么操作都没做） 就提示他   不让删除原先得供应商
-			 throw  new  RuntimeException("不能操作");
+			
+		    throw  new  RuntimeException("什么都不用操作");
 			   
 		    }else {//否则就做先删除原先得  在添加得到新的供应商id 做插入操作
 		    	plannerService.deleteBeforeSupplierByUserId(plannerId);//(前端传来的计划员id)根据计划员id先删除之前所对应的供应商
-		    	plannerService.insertAgainSupplier(pp);
+		    	plannerService.insertAgainSupplier(pp);//然后在插入新得到的供应商id
 		    }
 			 
 			return  JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS,pp);//待

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

@@ -179,7 +179,7 @@ public class UserAction {
 		    if(uu!=0) throw new RuntimeException("随机数重复");
 		    if (us.size()!=0) throw new RuntimeException("账号已存在");
 			userService.insertUsers(user);
-			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, uu);
+			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, user);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
 		}