Bläddra i källkod

机车是否挂载终端

sunhh 2 år sedan
förälder
incheckning
f227619e6e

+ 1 - 1
business-service/src/main/java/com/ozs/entity/vo/BaseVehicleTerminalVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 @Data
 public class BaseVehicleTerminalVo extends PageVo {
     /**
-     * 是否挂载 0未挂载,1挂载
+     * 是否挂载 1未挂载,2挂载
      */
     private String isMount;
 

+ 2 - 0
business-service/src/main/java/com/ozs/service/BaseVehicleService.java

@@ -35,4 +35,6 @@ public interface BaseVehicleService extends IService<BaseVehicle> {
     IPage<BaseVehicleTerminalVo> vehicleTerminal(BaseVehicleVo baseVehicle);
 
     AjaxResult vehicleTerminalAdd(BaseTerminal baseTerminal, String userId);
+
+    Boolean isMount(BaseVehicleVo baseVehicleVo);
 }

+ 15 - 2
business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -211,9 +211,9 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                 BaseVehicleTerminalVo baseVehicleTerminalVo = new BaseVehicleTerminalVo();
                 BeanUtils.copyProperties(o, baseVehicleTerminalVo);
                 if (baseTerminal.getTerminalCode().equals(o.getTerminalCode())) {
-                    baseVehicleTerminalVo.setIsMount("1");
+                    baseVehicleTerminalVo.setIsMount("2");
                 } else {
-                    baseVehicleTerminalVo.setIsMount("0");
+                    baseVehicleTerminalVo.setIsMount("1");
                 }
                 return baseVehicleTerminalVo;
             }).collect(Collectors.toList());
@@ -248,4 +248,17 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         return AjaxResult.success();
     }
+
+    @Override
+    public Boolean isMount(BaseVehicleVo baseVehicleVo) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseVehicleVo) && !StringUtils.isEmptySunhh(baseVehicleVo.getVehicleCode())) {
+            wrapper.eq(BaseTerminal::getVehicleCode, baseVehicleVo.getVehicleCode());
+        }
+        BaseTerminal baseTerminal = baseTerminalMapper.selectOne(wrapper);
+        if (StringUtils.isEmptySunhh(baseTerminal)) {
+            return true;
+        }
+        return false;
+    }
 }

+ 17 - 0
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -62,6 +62,23 @@ public class BaseVehicleController extends BaseController {
         return AjaxResult.success(baseVehicleTerminalVoIPage);
     }
 
+    /**
+     * 机车是否挂载终端
+     *
+     * @param baseVehicleVo
+     * @return
+     */
+    @ApiOperation(value = "机车是否挂载终端")
+    @PostMapping("/isMount")
+    @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
+    public AjaxResult isMount(@RequestBody BaseVehicleVo baseVehicleVo) {
+        if (StringUtils.isEmptySunhh(baseVehicleVo) || StringUtils.isEmptySunhh(baseVehicleVo.getVehicleCode())) {
+            return AjaxResult.error("机车编码不能为空!");
+        }
+        Boolean isMount = baseVehicleService.isMount(baseVehicleVo);
+        return AjaxResult.success(isMount);
+    }
+
     /**
      * 车载终端挂载 保存
      *