chb před 7 roky
rodič
revize
18987d37bc

+ 0 - 8
saicLogistics/src/main/java/com/fuzamei/entity/PlannerSupplier.java

@@ -7,16 +7,8 @@ public class PlannerSupplier {
 	private  Integer id;         //主键id
 	private  String plannerId; //计划员id
 	private  String supplierId;//供应商id
-	private  int  suppliers [];
 	
 	
-	
-	public int[] getSuppliers() {
-		return suppliers;
-	}
-	public void setSuppliers(int[] suppliers) {
-		this.suppliers = suppliers;
-	}
 	public Integer getId() {
 		return id;
 	}

+ 1 - 1
saicLogistics/src/main/java/com/fuzamei/mapper/PlannerMapper.xml

@@ -24,7 +24,7 @@
 	    delete from planner_supplier where planner_id =#{plannerId}
 	</delete>
 	
-	<!--配置供应商  前端点提交后    获取前端传来得所有Id在做插入操作)  -->
+	<!--配置供应商  前端点提交后    获取前端传来得所有供应商Id在做插入操作)  -->
 	<insert id="insertAgainSupplier">
 		insert into planner_supplier(planner_id,supplier_id) values (#{plannerId},#{supplierId})
 	</insert>

+ 10 - 1
saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/PlannerServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.fuzamei.constant.Roles;
 import com.fuzamei.entity.PlannerSupplier;
@@ -33,14 +34,22 @@ public class PlannerServiceImpl implements  PlannerService{
 	}
 
 	@Override
+	@Transactional(rollbackFor=Exception.class)
 	public void deleteBeforeSupplierByUserId(int plannerId) {//根据计划员id删除之前所有的供应商
+	
 		plannerMapper.deleteBeforeSupplierByUserId(plannerId);
 	}
 
 	@Override
+	@Transactional(rollbackFor=Exception.class)
 	public void insertAgainSupplier(PlannerSupplier  pp) {//得到前端传来所有得供应商ID 做插入操作
+		String[] str=pp.getSupplierId().split(",");
+		for (int i = 0; i < str.length; i++) {
+			pp.setSupplierId(str[i]);
+			plannerMapper.insertAgainSupplier(pp);
+		}
 		
-		plannerMapper.insertAgainSupplier(pp);
+		//plannerMapper.insertAgainSupplier(pp);
 	}
 
 	

+ 16 - 12
saicLogistics/src/main/java/com/fuzamei/web/PlannerAction.java

@@ -115,26 +115,30 @@ public class PlannerAction {
 			@SuppressWarnings("unchecked")
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
-			Integer plannerId = ValidationUtil.checkAndAssignInt(pp.getPlannerId());//得到计划员id
-			plannerService.deleteBeforeSupplierByUserId(plannerId);//(前端传来的计划员id)根据计划员id先删除之前所对应的供应商
-		   
-			String  supplierId = ValidationUtil.checkNullAndAssignString(pp.getSupplierId());//得到挪动得供应商id
-			//System.out.println(pp.getSupplierId());
-			String[] str=supplierId.split(",");
+			Integer plannerId = ValidationUtil.checkAndAssignInt(pp.getPlannerId());//得到前端传来的计划员id
+			
+		    if(pp.getSupplierId().equals("")) {//如果传过来得到的供应商是空的 (点击配置后,什么操作都没做) 就报异常    不让删除原先得供应商
+			 throw  new  RuntimeException("操作异常");
+			   
+		    }else {//否则就做先删除原先得  在添加新得到id做插入操作
+		    	plannerService.deleteBeforeSupplierByUserId(plannerId);//(前端传来的计划员id)根据计划员id先删除之前所对应的供应商
+		    	plannerService.insertAgainSupplier(pp);
+		    }
+			 
+			//String  supplierId = ValidationUtil.checkNullAndAssignString(pp.getSupplierId());//得到挪动得供应商id  要以逗号隔开传过来
+			/*String[] str=supplierId.split(",");
 			for (int i = 0; i < str.length; i++) {
 				//System.out.println(str.length);
 				//System.out.println(str[i]);
-				//plannerService.insertAgainSupplier(pp));
 				pp.setSupplierId(str[i]);
 				plannerService.insertAgainSupplier(pp);
-			}
-			//System.out.println(str+"aaaaa66666666666");
+			}*/
+			
 			
 			
-			return  JSONUtil.getJsonMap(200, true, "插入成功",str);
+			return  JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS,pp);//待
 		} catch (Exception e) {
-			e.printStackTrace();
-			return JSONUtil.getJsonMap(500, false, "插入失败:"+e.getMessage(), null);
+			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
 		}
 		
 	}

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

@@ -42,5 +42,5 @@
 			<mvc:exclude-mapping path="/login"/>
 			<bean class="com.fuzamei.interceptor.TokenInterceptor" />
 		</mvc:interceptor>
-	</mvc:interceptors>   
+	</mvc:interceptors>    
 </beans>