车辆信息测试优化

snowy-admin-web/src/views/biz/bizexcessconfig/form.vue

@@ -13,7 +13,7 @@
 			<a-form-item label="超限重量：" name="excessWeight">
 				<a-input-number v-model:value="formData.excessWeight" style="width:90%"  :precision="0" :min="1" :max="999999" placeholder="请输入超限重量" allow-clear /><span style="margin-left:10px;">KG</span>
 			</a-form-item>
-			<a-form-item label="是否启用：" name="status">
+			<a-form-item label="是否启用：" name="status" v-if="formData.id!=null && formData.id!=''">
 				<a-radio-group button-style="solid" v-model:value="formData.status">
 					<a-radio-button value="1">
 						启用
@@ -54,7 +54,7 @@
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
 		}else{
-			formData.value.status = '2'
+			formData.value.status = '1'
 		}
 	}
 	// 关闭抽屉

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizexcessconfig/service/impl/BizExcessConfigServiceImpl.java

@@ -56,7 +56,8 @@ public class BizExcessConfigServiceImpl extends ServiceImpl<BizExcessConfigMappe
     public void add(BizExcessConfigAddParam bizExcessConfigAddParam) {
         //根据车辆轴数查询，相同的轴数不能重复创建
         long count = this.count(new QueryWrapper<BizExcessConfig>().lambda().
-                eq(BizExcessConfig::getVehicleAxleNumber, bizExcessConfigAddParam.getVehicleAxleNumber()));
+                eq(BizExcessConfig::getVehicleAxleNumber, bizExcessConfigAddParam.getVehicleAxleNumber()).
+                eq(BizExcessConfig::getStatus,"1"));
         if(count>0){
             throw new CommonException("该轴数已经添加过超限重量！");
         }
@@ -71,11 +72,22 @@ public class BizExcessConfigServiceImpl extends ServiceImpl<BizExcessConfigMappe
         //判断是否修改过轴数，如果修改过，则校验该轴数是否添加过超限配置
         if(bizExcessConfig.getVehicleAxleNumber()!=bizExcessConfigEditParam.getVehicleAxleNumber()){
             long count = this.count(new QueryWrapper<BizExcessConfig>().lambda().
-                    eq(BizExcessConfig::getVehicleAxleNumber, bizExcessConfigEditParam.getVehicleAxleNumber()));
+                    eq(BizExcessConfig::getVehicleAxleNumber, bizExcessConfigEditParam.getVehicleAxleNumber()).
+                    eq(BizExcessConfig::getStatus,"1"));
             if(count>0){
                 throw new CommonException("该轴数已经添加过超限重量！");
             }
         }
+        if(!StringUtils.equals(bizExcessConfig.getStatus(),bizExcessConfigEditParam.getStatus())){
+            if(StringUtils.equals(bizExcessConfigEditParam.getStatus(),"1")){
+                long count = this.count(new QueryWrapper<BizExcessConfig>().lambda().
+                        eq(BizExcessConfig::getVehicleAxleNumber, bizExcessConfigEditParam.getVehicleAxleNumber()).
+                        eq(BizExcessConfig::getStatus,"1"));
+                if(count>0){
+                    throw new CommonException("该轴数已经添加过超限重量！");
+                }
+            }
+        }
         BeanUtil.copyProperties(bizExcessConfigEditParam, bizExcessConfig);
         this.updateById(bizExcessConfig);
     }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizvehicle/service/impl/BizVehicleServiceImpl.java

@@ -106,6 +106,12 @@ public class BizVehicleServiceImpl extends ServiceImpl<BizVehicleMapper, BizVehi
                 throw new CommonException("手机号码：{}格式错误", bizVehicleAddParam.getDriverMobile());
             }
         }
+        long count = this.count(new QueryWrapper<BizVehicle>().lambda().
+                eq(BizVehicle::getCreateUser, StpLoginUserUtil.getLoginUser().getId()).
+                eq(BizVehicle::getStatus, "1"));
+        if(count>0){
+            throw new CommonException("已添加过启用得车辆信息");
+        }
     }
 
     public void checkParam(BizVehicleEditParam bizVehicleEditParam,BizVehicle bizVehicle){
@@ -123,6 +129,13 @@ public class BizVehicleServiceImpl extends ServiceImpl<BizVehicleMapper, BizVehi
                 if(count>0){
                     throw new CommonException("车牌号：{}已经添加过！",bizVehicleEditParam.getLicensePlate());
                 }
+                long sum = this.count(new QueryWrapper<BizVehicle>().lambda().
+                        eq(BizVehicle::getCreateUser, StpLoginUserUtil.getLoginUser().getId()).
+                        eq(BizVehicle::getStatus, "1").
+                        ne(BizVehicle::getLicensePlate,bizVehicle.getLicensePlate()));
+                if(sum>0){
+                    throw new CommonException("已添加过启用得车辆信息");
+                }
             }
         }
         //校验司机电话
@@ -132,15 +145,22 @@ public class BizVehicleServiceImpl extends ServiceImpl<BizVehicleMapper, BizVehi
             }
         }
         //启用时校验修改状态
-        if(StringUtils.equals(bizVehicleEditParam.getStatus(),"1")){
-            long count = this.count(new QueryWrapper<BizVehicle>().lambda().
-                    eq(BizVehicle::getLicensePlate, bizVehicleEditParam.getLicensePlate()).
-                    eq(BizVehicle::getStatus, "1"));
-            if(count>0){
-                throw new CommonException("车牌号：{}已经添加过！",bizVehicleEditParam.getLicensePlate());
+        if(!StringUtils.equals(bizVehicle.getStatus(),bizVehicleEditParam.getStatus())){
+            if(StringUtils.equals(bizVehicleEditParam.getStatus(),"1")){
+                long count = this.count(new QueryWrapper<BizVehicle>().lambda().
+                        eq(BizVehicle::getLicensePlate, bizVehicleEditParam.getLicensePlate()).
+                        eq(BizVehicle::getStatus, "1"));
+                if(count>0){
+                    throw new CommonException("车牌号：{}已经添加过！",bizVehicleEditParam.getLicensePlate());
+                }
+                long sum = this.count(new QueryWrapper<BizVehicle>().lambda().
+                        eq(BizVehicle::getCreateUser, StpLoginUserUtil.getLoginUser().getId()).
+                        eq(BizVehicle::getStatus, "1"));
+                if(sum>0){
+                    throw new CommonException("已添加过启用得车辆信息");
+                }
             }
         }
-
     }
 
     @Transactional(rollbackFor = Exception.class)