后端提交

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/controller/MeterWorkCompareSpotController.java

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
-import java.math.BigDecimal;
 
 /**
  * MeterWorkCompareSpot RESTful接口：
@@ -132,6 +131,16 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
         //日期
         Date date = new Date();
 
+        //防止传过来的参数为空字符串
+        if(carNo.equals("")||name.equals("")||spotName.equals("")||spotNo.equals("")){
+            return failed(null,"传过来的参数存在空字符串");
+        }
+
+        //重量不能小于0
+        if(weight < 0){
+            return failed(null,"重量不能小于0");
+        }
+
         //取出车号为carNo的一个小时以内的较秤类型为断差（即数据库中标识为1）的数据主键
         String COMPARE_SPOT_ID = meterWorkCompareSpotService.isExistWithinOneHour(carNo);
 //        System.out.println("---------------");
@@ -184,13 +193,13 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
             }
 
 
-            if (spot.getWeightNum5() == null){//第5个重量为空，表示在该条数据内还可以继续存储重量
+            if (spot.getWeightNum5() == null||spot.getBaseSpotName5()==null){//第5个重量为空，表示在该条数据内还可以继续存储重量
                 //设置更新时间
                 spot.setUpdateTime(date);
                 //设置更新操作人们姓名
                 spot.setUpdateManName(name);
-                //从第二个重量开始查询
-                if (spot.getWeightNum2()==null) {
+                //通过站点名来判断
+                if (spot.getWeightNum2()==null||spot.getBaseSpotName2()==null) {
                     //重量
                     spot.setWeightNum2(weight);
                     //称重时间
@@ -199,18 +208,18 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
                     spot.setBaseSpotName2(spotName);
                     //秤点编号
                     spot.setBaseSpotNo2(spotNo);
-                }else if (spot.getWeightNum3()==null){
+                }else if (spot.getWeightNum3()==null||spot.getBaseSpotName3()==null){
                     spot.setWeightNum3(weight);
                     spot.setWeightDate3(date);
                     spot.setBaseSpotName3(spotName);
                     spot.setBaseSpotNo3(spotNo);
-                }else if (spot.getWeightNum4()==null){
+                }else if (spot.getWeightNum4()==null||spot.getBaseSpotName4()==null){
                     spot.setWeightNum4(weight);
                     spot.setWeightDate4(date);
                     spot.setBaseSpotName4(spotName);
                     spot.setBaseSpotNo4(spotNo);
                 }else{
-                    //注意即使存满了5条数据也没有修改VALUE_FLAG的值，仍保持为 2：正是用
+                    //注意即使存满了5条数据也没有修改VALUE_FLAG的值，仍保持为 2：正使用
                     //如果后期有需求再修改
                     spot.setWeightNum5(weight);
                     spot.setWeightDate5(date);
@@ -223,6 +232,11 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
                 return failed(null,"一个小时以内，已存在5条重量数据");
             }
         }
+
+        if (weight == 0L){
+            return success(null,"提交成功，请注意：传过来的重量为0");
+        }
+
         //所有都没问题 返回提交成功
         return success(null,"提交成功");
     }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/controller/MeterWorkCompareSpotScaleController.java

@@ -139,6 +139,16 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
         //日期
         Date date = new Date();
 
+        //防止传过来的参数为空字符串
+        if(carNo.equals("")||name.equals("")||spotName.equals("")||spotNo.equals("")){
+            return failed(null,"传过来的参数存在空字符串");
+        }
+
+        //重量不能小于0
+        if(weight < 0){
+            return failed(null,"重量不能小于0");
+        }
+
         //提交预约时，最大预约次数为4
         //提交预约的同时也会向METER_WORK_COMPARE_SPOT表插入一条数据
         //最大存储数据量(5) - 已存储量(1) = 4
@@ -147,6 +157,10 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
             return failed(null,"预约次数不允许超过最大值4");
         }
 
+        if (num < 1){
+            return failed(null,"预约次数不允许小于最小值1");
+        }
+
         //1、判断该车号在过去一天内是否存在未使用的预约
         String compareSpotScaleId = meterWorkCompareSpotScaleService.isExistWithinOneDay(carNo);
 
@@ -236,6 +250,16 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
         }
         Date date = new Date();
 
+        //防止传过来的参数为空字符串
+        if(carNo.equals("")||name.equals("")||spotName.equals("")||spotNo.equals("")||scaleNo.equals("")){
+            return failed(null,"传过来的参数存在空字符串");
+        }
+
+        //重量不能小于0
+        if(weight < 0){
+            return failed(null,"重量不能小于0");
+        }
+
         //查看预约号是否可用
         MeterWorkCompareSpotScale scale = null;
         try {
@@ -272,7 +296,7 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
             return failed(null,"METER_WORK_COMPARE_SPOT表中没有该预约号");
         }
         //判断该数据填到哪里
-        if (spot.getWeightNum2() == null){
+        if (spot.getWeightNum2() == null||spot.getBaseSpotName2() == null){
             //重量
             spot.setWeightNum2(weight);
             //秤点编号
@@ -281,17 +305,17 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
             spot.setWeightDate2(date);
             //称点名
             spot.setBaseSpotName2(spotName);
-        }else if (spot.getWeightNum3() == null){
+        }else if (spot.getWeightNum3() == null||spot.getBaseSpotName3() == null){
             spot.setWeightNum3(weight);
             spot.setBaseSpotNo3(spotNo);
             spot.setWeightDate3(date);
             spot.setBaseSpotName3(spotName);
-        }else if (spot.getWeightNum4() == null){
+        }else if (spot.getWeightNum4() == null||spot.getBaseSpotName4() == null){
             spot.setWeightNum4(weight);
             spot.setBaseSpotNo4(spotNo);
             spot.setWeightDate4(date);
             spot.setBaseSpotName4(spotName);
-        }else{
+        }else if (spot.getWeightNum5() == null||spot.getBaseSpotName5() == null){
             spot.setWeightNum5(weight);
             spot.setBaseSpotNo5(spotNo);
             spot.setWeightDate5(date);
@@ -303,6 +327,11 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
         spot.setUpdateManName(name);
         //更新
         meterWorkCompareSpotService.updateSpotAndScale(scale,spot);
+
+        if (weight == 0L){
+            return success(null,"提交成功，请注意：传过来的重量为0");
+        }
+
         //返回：”添加成功“
         return success(null,"添加成功");
     }
@@ -314,7 +343,7 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
         if (scaleId == null){
             return success(null,"不存在24小时内未使用的预约");
         }else{
-            return success(scaleId,"存在24小小时内未使用得到预约");
+            return success((Object) scaleId,"存在24小小时内未使用得到预约");
         }
 
     }