车载终端 增 删 改 查 详情 接口

business-service/src/main/java/com/ozs/entity/BaseVehicleTerminal.java

@@ -2,12 +2,12 @@ package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 机车车载终端信息表
@@ -67,10 +67,12 @@ public class BaseVehicleTerminal implements Serializable {
      * 备注
      */
     private String remark;
+
     /**
      * 终端经度
      */
     private String terminalLongitude;
+
     /**
      * 终端纬度
      */

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

@@ -0,0 +1,69 @@
+package com.ozs.entity.vo;
+
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : sunhh
+ * @create 2023/4/19 14:12
+ */
+@Data
+public class BaseVehicleTerminalVo extends PageVo {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 终端名称
+     */
+    private String terminalName;
+
+    /**
+     * 状态 1在线2离线
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 终端经度
+     */
+    private String terminalLongitude;
+
+    /**
+     * 终端纬度
+     */
+    private String terminalLatitude;
+}

business-service/src/main/java/com/ozs/service/BaseVehicleTerminalService.java

@@ -1,7 +1,10 @@
 package com.ozs.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.entity.BaseVehicleTerminal;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.entity.vo.BaseVehicleTerminalVo;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BaseVehicleTerminalService extends IService<BaseVehicleTerminal> {
 
+    IPage<BaseVehicleTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo);
+
+    AjaxResult baseVehicleTerminalDetails(BaseVehicleTerminalVo baseVehicleTerminalVo);
+
+    AjaxResult vehicleTerminalAdd(BaseVehicleTerminal baseVehicleTerminal, String userId);
+
+    AjaxResult vehicleTerminalUpdate(BaseVehicleTerminal baseVehicleTerminal, String userId);
 }

business-service/src/main/java/com/ozs/service/impl/BaseVehicleTerminalServiceImpl.java

@@ -1,11 +1,21 @@
 package com.ozs.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.mapper.BaseVehicleTerminalMapper;
 import com.ozs.service.BaseVehicleTerminalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 机车车载终端信息表 服务实现类
@@ -17,4 +27,78 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseVehicleTerminalServiceImpl extends ServiceImpl<BaseVehicleTerminalMapper, BaseVehicleTerminal> implements BaseVehicleTerminalService {
 
+    @Autowired
+    private BaseVehicleTerminalMapper baseVehicleTerminalMapper;
+
+    @Override
+    public IPage<BaseVehicleTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo) {
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getTerminalCode())) {
+            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminalleVo.getTerminalCode());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getTerminalName())) {
+            wrapper.eq(BaseVehicleTerminal::getTerminalName, baseVehicleTerminalleVo.getTerminalName());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getStatus())) {
+            wrapper.eq(BaseVehicleTerminal::getStatus, baseVehicleTerminalleVo.getStatus());
+        }
+        int pageNum = Integer.parseInt(baseVehicleTerminalleVo.getPageNum().toString());
+        int pageSize = Integer.parseInt(baseVehicleTerminalleVo.getPageSize().toString());
+        com.github.pagehelper.Page<BaseVehicleTerminal> page = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> baseVehicleTerminalMapper.selectList(wrapper));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseVehicleTerminal> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
+        pageR.setRecords(page.getResult());
+        pageR.setTotal(page.getTotal());
+        return pageR;
+    }
+
+    @Override
+    public AjaxResult baseVehicleTerminalDetails(BaseVehicleTerminalVo baseVehicleTerminalVo) {
+        BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectById(baseVehicleTerminalVo.getId());
+        return AjaxResult.success(baseVehicleTerminal);
+    }
+
+    @Override
+    public AjaxResult vehicleTerminalAdd(BaseVehicleTerminal baseVehicleTerminal, String userId) {
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+        }
+        List<BaseVehicleTerminal> baseVehicles = baseVehicleTerminalMapper.selectList(wrapper);
+        if (baseVehicles.size() > 0) {
+            return AjaxResult.error("车载终端编码已存在！");
+        }
+        Date date = new Date();
+        baseVehicleTerminal.setCreateBy(userId);
+        baseVehicleTerminal.setUpdateBy(userId);
+        baseVehicleTerminal.setCreateTime(date);
+        baseVehicleTerminal.setUpdateTime(date);
+        int insert = baseVehicleTerminalMapper.insert(baseVehicleTerminal);
+        if (insert > 0) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
+
+    @Override
+    public AjaxResult vehicleTerminalUpdate(BaseVehicleTerminal baseVehicleTerminal, String userId) {
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+        }
+        List<BaseVehicleTerminal> baseVehicles = baseVehicleTerminalMapper.selectList(wrapper);
+        if (baseVehicles.size() > 0) {
+            return AjaxResult.error("机车编码已存在！");
+        }
+        baseVehicleTerminal.setUpdateBy(userId);
+        baseVehicleTerminal.setUpdateTime(new Date());
+        int update = baseVehicleTerminalMapper.updateById(baseVehicleTerminal);
+        if (update > 0) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
 }

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

@@ -51,7 +51,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation(value = "机车信息表 分页查询")
     @PostMapping("/vehicleList")
-    @Log(title = "机车信息台账", businessType = BusinessType.SELECT)
+    @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleList(@RequestBody BaseVehicleVo baseVehicle) {
         IPage<BaseVehicle> baseVehicleList = baseVehicleService.vehicleList(baseVehicle);
         return AjaxResult.success(baseVehicleList);
@@ -65,7 +65,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation(value = "机车信息表 详情")
     @PostMapping("/vehicleDetails")
-    @Log(title = "机车信息台账", businessType = BusinessType.SELECT)
+    @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleDetails(@RequestBody BaseVehicle baseVehicle) {
         if (StringUtils.isEmptySunhh(baseVehicle) || StringUtils.isEmptySunhh(baseVehicle.getId())) {
             return AjaxResult.error("机车id不能为空！");
@@ -81,7 +81,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation(value = "机车信息表 新增")
     @PostMapping("/vehicleAdd")
-    @Log(title = "机车信息台账", businessType = BusinessType.INSERT)
+    @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
     public AjaxResult vehicleAdd(@RequestBody BaseVehicle baseVehicle) {
         if (StringUtils.isEmptySunhh(baseVehicle) || StringUtils.isEmptySunhh(baseVehicle.getVehicleName())
                 || StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
@@ -98,7 +98,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation(value = "机车信息表 修改")
     @PostMapping("/vehicleUpdate")
-    @Log(title = "机车信息台账", businessType = BusinessType.UPDATE)
+    @Log(title = "机车信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult vehicleUpdate(@RequestBody BaseVehicle baseVehicle) {
         if (StringUtils.isEmptySunhh(baseVehicle) || StringUtils.isEmptySunhh(baseVehicle.getId())) {
             return AjaxResult.error("修改ID不能为空！");
@@ -114,7 +114,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation(value = "机车信息表 删除")
     @DeleteMapping("/vehicleDelete/{ids}")
-    @Log(title = "机车信息台账", businessType = BusinessType.DELETE)
+    @Log(title = "机车信息管理", businessType = BusinessType.DELETE)
     public AjaxResult vehicleDelete(@PathVariable List<Long> ids) {
         if (StringUtils.isEmptySunhh(ids)) {
             return AjaxResult.error("删除ID不能为空！");
@@ -137,7 +137,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation("机车信息导入")
     @PostMapping("/importBaseVehicle")
-    @Log(title = "机车信息台账", businessType = BusinessType.IMPORT)
+    @Log(title = "机车信息管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseVehicle(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseVehicle> util = new ExcelUtil<BaseVehicle>(BaseVehicle.class);
         List<BaseVehicle> accountManageList = util.importExcel(file.getInputStream());
@@ -152,7 +152,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation("机车信息导出")
     @PostMapping("/exportBaseVehicle")
-    @Log(title = "机车信息台账", businessType = BusinessType.EXPORT)
+    @Log(title = "机车信息管理", businessType = BusinessType.EXPORT)
     public void exportBaseVehicle(HttpServletResponse response, @RequestBody BaseVehicle baseVehicle) {
         List<BaseVehicle> baseVehicleList = baseVehicleService.exportBaseVehicle(baseVehicle);
         ExcelUtil<BaseVehicle> util = new ExcelUtil<>(BaseVehicle.class);
@@ -166,7 +166,7 @@ public class BaseVehicleController extends BaseController {
      */
     @ApiOperation("机车信息模板下载")
     @GetMapping("/downloaExcel")
-    @Log(title = "机车信息台账", businessType = BusinessType.OTHER)
+    @Log(title = "机车信息管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/BaseVehicle.xlsx");

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleTerminalController.java

@@ -1,18 +1,19 @@
 package com.ozs.web.controller.accountmanagment;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
+import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
-import com.ozs.entity.BaseVehicle;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.service.BaseVehicleTerminalService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -24,13 +25,98 @@ import java.util.List;
  * @author ozs
  * @since 2023-04-11
  */
+@Slf4j
 @RestController
 @RequestMapping("/baseVehicleTerminal")
-public class BaseVehicleTerminalController {
+public class BaseVehicleTerminalController extends BaseController {
 
     @Autowired
     private BaseVehicleTerminalService baseVehicleTerminalService;
 
+    /**
+     * 车载终端信息表 分页查询
+     *
+     * @param baseVehicleTerminalVo
+     * @return
+     */
+    @ApiOperation(value = "终端信息表 分页查询")
+    @PostMapping("/vehicleTerminalList")
+    @Log(title = "车载终端管理", businessType = BusinessType.SELECT)
+    public AjaxResult vehicleTerminalList(@RequestBody BaseVehicleTerminalVo baseVehicleTerminalVo) {
+        IPage<BaseVehicleTerminal> baseVehicleTerminalIPage = baseVehicleTerminalService.vehicleTerminalList(baseVehicleTerminalVo);
+        return AjaxResult.success(baseVehicleTerminalIPage);
+    }
+
+    /**
+     * 车载终端信息表 详情
+     *
+     * @param baseVehicleTerminalVo
+     * @return
+     */
+    @ApiOperation(value = "车载终端信息表 详情")
+    @PostMapping("/baseVehicleTerminalDetails")
+    @Log(title = "车载终端管理", businessType = BusinessType.SELECT)
+    public AjaxResult baseVehicleTerminalDetails(@RequestBody BaseVehicleTerminalVo baseVehicleTerminalVo) {
+        if (StringUtils.isEmptySunhh(baseVehicleTerminalVo) || StringUtils.isEmptySunhh(baseVehicleTerminalVo.getId())) {
+            return AjaxResult.error("车载终端id不能为空！");
+        }
+        return baseVehicleTerminalService.baseVehicleTerminalDetails(baseVehicleTerminalVo);
+    }
+
+    /**
+     * 车载终端信息表 新增
+     *
+     * @param baseVehicleTerminal
+     * @return
+     */
+    @ApiOperation(value = "车载终端信息表 新增")
+    @PostMapping("/vehicleTerminalAdd")
+    @Log(title = "车载终端管理", businessType = BusinessType.INSERT)
+    public AjaxResult vehicleTerminalAdd(@RequestBody BaseVehicleTerminal baseVehicleTerminal) {
+        if (StringUtils.isEmptySunhh(baseVehicleTerminal) || StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())
+                || StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
+            return AjaxResult.error("车载终端名称、车载终端编码不能为空！");
+        }
+        return baseVehicleTerminalService.vehicleTerminalAdd(baseVehicleTerminal, getUserId());
+    }
+
+    /**
+     * 车载终端信息表 修改
+     *
+     * @param baseVehicleTerminal
+     * @return
+     */
+    @ApiOperation(value = "车载终端信息表 修改")
+    @PostMapping("/vehicleTerminalUpdate")
+    @Log(title = "车载终端管理", businessType = BusinessType.UPDATE)
+    public AjaxResult vehicleTerminalUpdate(@RequestBody BaseVehicleTerminal baseVehicleTerminal) {
+        if (StringUtils.isEmptySunhh(baseVehicleTerminal) || StringUtils.isEmptySunhh(baseVehicleTerminal.getId())) {
+            return AjaxResult.error("修改ID不能为空！");
+        }
+        return baseVehicleTerminalService.vehicleTerminalUpdate(baseVehicleTerminal, getUserId());
+    }
+
+    /**
+     * 车载终端信息表 删除
+     *
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "车载终端信息表 删除")
+    @DeleteMapping("/vehicleTerminaleDelete/{ids}")
+    @Log(title = "车载终端管理", businessType = BusinessType.DELETE)
+    public AjaxResult vehicleDelete(@PathVariable List<Long> ids) {
+        if (StringUtils.isEmptySunhh(ids)) {
+            return AjaxResult.error("删除ID不能为空！");
+        }
+        boolean delete = baseVehicleTerminalService.removeByIds(ids);
+        if (delete) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
+
     /**
      * 终端信息表 查询
      *