添加文档生成

liujun001
1 parent c43ba5a1
Showing 26 changed files with 463 additions and 23 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/carinfo/CarInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/driver/NewDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/driver/healthy/DriverHealthyController.java
Bsth-admin/src/main/java/com/ruoyi/controller/keyinfo/KeyInfoController.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/CarInfoAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/CarInfoQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/CarInfoUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/vo/CarInfoVO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dto/NewDriverAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dto/NewDriverQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dto/NewDriverUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyUpdateStatusDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/vo/DriverHealthyVO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/vo/NewDriverVO.java
Bsth-admin/src/main/java/com/ruoyi/domain/keyInfo/dto/KeyInfoAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/keyInfo/dto/KeyInfoQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/keyInfo/dto/KeyInfoUpdateDTO.java
@@ -3,6 +3,7 @@ package com.ruoyi.controller.carinfo;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.domain.OrderEntity;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,11 +35,13 @@ import com.ruoyi.domain.caiinfo.CarInfo;
 @RestController
 @RequestMapping("car/info")
+@Api(tags="车辆信息")
 public class CarInfoController extends BaseController {
     @Autowired
     private CarInfoService CarInfoService;
     @PreAuthorize("@ss.hasPermi('car:info:list:limit:page:limit')")
+    @ApiOperation("分页查询")
     @PostMapping(value = "/list/limit/{page}/{pageLimit}")
     public String listLimit(@ModelAttribute CarInfoQueryDTO request, OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
         CarInfo entity = convert(request);
@@ -47,7 +50,7 @@ public class CarInfoController extends BaseController {
         return JSON.toJSONString(convert(response));
     }
-
+    @ApiOperation("根据ID查询详情")
     @GetMapping(value = "/view/{id}")
     public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
         CarInfo source = CarInfoService.getById(id);
@@ -59,6 +62,7 @@ public class CarInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('car:info:export')")
     @PostMapping("/export")
+    @ApiOperation("导出")
     public void export(HttpServletResponse response, CarInfo entity) {
         List<CarInfo> list = CarInfoService.list(entity);
         ExcelUtil<CarInfo> util = new ExcelUtil<CarInfo>(CarInfo.class);
@@ -89,6 +93,7 @@ public class CarInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('car:info:add')")
     @PostMapping(value = "/add")
+    @ApiOperation("添加车辆信息")
     public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute CarInfoAddDTO request) {
         CarInfo entity = convert(request);
         entity.setCreateBy(getUserId());
@@ -99,6 +104,7 @@ public class CarInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('car:info:update')")
     @PostMapping(value = "/update")
+    @ApiOperation("修改车辆信息")
     public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute CarInfoUpdateDTO request) {
         CarInfo entity = convert(request);
         entity.setUpdateBy(getUserId());
@@ -109,6 +115,7 @@ public class CarInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('car:info:del')")
     @GetMapping(value = "/del/{id}")
+    @ApiOperation("删除车辆信息")
     public com.ruoyi.common.core.domain.AjaxResult delById(@PathVariable("id") Integer id) {
         boolean flag = CarInfoService.deleteById(id);
         return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("操作数据失败，请稍后再试");
+package com.ruoyi.controller.driver;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.driver.dto.NewDriverAddDTO;
+import com.ruoyi.domain.driver.dto.NewDriverQueryDTO;
+import com.ruoyi.domain.driver.dto.NewDriverUpdateDTO;
+import com.ruoyi.domain.driver.vo.NewDriverVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.BeanUtils;
+
+
+import java.util.List;
+
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+
+
+@RestController
+@RequestMapping("new/driver")
+@Api(tags = "新-驾驶员信息")
+public class NewDriverController extends BaseController {
+    @Autowired
+    private com.NewDriverService newDriverService;
+
+
+    @PostMapping(value = "/list/select")
+    @ApiOperation("（页面选择）")
+    public AjaxResult listSelect() {
+        NewDriver entity = new NewDriver();
+        List<NewDriver> selectList = newDriverService.listOfSelect(entity);
+        return AjaxResult.success(convert(selectList));
+    }
+
+    private NewDriver convert(NewDriverQueryDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            NewDriver target = new NewDriver();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private NewDriver convert(NewDriverUpdateDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            NewDriver target = new NewDriver();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+
+    private NewDriver convert(NewDriverAddDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            NewDriver target = new NewDriver();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private NewDriverVO convert(NewDriver source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            NewDriverVO target = new NewDriverVO();
+            BeanUtils.copyProperties(source, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private List<NewDriverVO> convert(List<NewDriver> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            return scs.stream().map(source -> {
+                return convert(source);
+            }).collect(java.util.stream.Collectors.toList());
+        }).orElseGet(null);
+    }
+
+    private IPage<NewDriverVO> convert(IPage<NewDriver> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            IPage<NewDriverVO> target = new com.baomidou.mybatisplus.extension.plugins.pagination.Page();
+            BeanUtils.copyProperties(scs, target);
+            List<NewDriverVO> voNames = convert(scs.getRecords());
+            target.setRecords(voNames);
+
+            return target;
+        }).orElseGet(null);
+    }
+}
 \ No newline at end of file
 package com.ruoyi.controller.driver.healthy;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,12 +36,14 @@ import com.ruoyi.domain.driver.healthy.DriverHealthy;
 @RestController
 @RequestMapping("driver/healthy")
+@Api(tags="驾驶员健康信息")
 public class DriverHealthyController extends BaseController {
     @Autowired
     private DriverHealthyService driverHealthyService;
     @PreAuthorize("@ss.hasPermi('driver:healthy:list:limit:page:limit')")
     @PostMapping(value = "/list/limit/{page}/{pageLimit}")
+    @ApiOperation("分页查询")
     public String listLimit(@ModelAttribute DriverHealthyQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
@@ -52,6 +54,7 @@ public class DriverHealthyController extends BaseController {
     @GetMapping(value = "/view/{id}")
+    @ApiOperation("根据ID查看详情")
     public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
         DriverHealthy source = driverHealthyService.getById(id);
@@ -61,6 +64,7 @@ public class DriverHealthyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('driver:healthy:export')")
     @PostMapping("/export")
+    @ApiOperation("导出")
     public void export(HttpServletResponse response, @RequestBody DriverHealthyQueryDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
@@ -71,6 +75,7 @@ public class DriverHealthyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('driver:healthy:add')")
     @PostMapping(value = "/add")
+    @ApiOperation("添加 ")
     public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute DriverHealthyAddDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
@@ -82,6 +87,7 @@ public class DriverHealthyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('driver:healthy:update')")
     @PostMapping(value = "/update")
+    @ApiOperation("修改 ")
     public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute DriverHealthyUpdateDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
@@ -93,6 +99,7 @@ public class DriverHealthyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('driver:healthy:update:status')")
     @PostMapping(value = "/update/status")
+    @ApiOperation("修改状态 ")
     public com.ruoyi.common.core.domain.AjaxResult updateState(@ModelAttribute DriverHealthyUpdateStatusDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
@@ -11,6 +11,7 @@ import com.ruoyi.domain.keyInfo.vo.KeyInfoVO;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.service.carinfo.CarInfoService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jdk.nashorn.internal.runtime.options.Option;
 import org.apache.commons.collections4.CollectionUtils;
@@ -38,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 @RestController
 @RequestMapping("key/info")
+@Api(tags = "钥匙管理")
 public class KeyInfoController {
     @Autowired
     private com.ruoyi.service.keyinfo.KeyInfoService KeyInfoService;
@@ -46,6 +48,7 @@ public class KeyInfoController {
     @PreAuthorize("@ss.hasPermi('key:info:list:limit:page:limit')")
     @PostMapping(value = "/list/limit/{page}/{pageLimit}")
+    @ApiOperation("分页查询")
     public String listLimit(@ModelAttribute KeyInfoQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
@@ -69,7 +72,7 @@ public class KeyInfoController {
     }
     @PostMapping(value = "list/select")
-    @ApiOperation("设备列表（页面选择）")
+    @ApiOperation("（页面选择）")
     public AjaxResult listSelect(@RequestBody KeyInfoQueryDTO dto) {
         dto.clearStrEmpty();
         KeyInfo entity = convert(dto);
@@ -78,6 +81,7 @@ public class KeyInfoController {
     }
     @GetMapping(value = "/view/{id}")
+    @ApiOperation("根据ID查看详情")
     public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
         KeyInfo source = KeyInfoService.getById(id);
@@ -86,6 +90,7 @@ public class KeyInfoController {
     @PreAuthorize("@ss.hasPermi('key:info:export')")
     @PostMapping("/export")
+    @ApiOperation("导出")
     public void export(HttpServletResponse response, KeyInfoQueryDTO dto) {
         dto.clearStrEmpty();
         KeyInfo entity = convert(dto);
@@ -96,6 +101,7 @@ public class KeyInfoController {
     @PreAuthorize("@ss.hasPermi('key:info:add')")
     @PostMapping(value = "/add")
+    @ApiOperation("添加")
     public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute KeyInfoAddDTO request) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
@@ -105,6 +111,7 @@ public class KeyInfoController {
     @PreAuthorize("@ss.hasPermi('key:info:update')")
     @PostMapping(value = "/update")
+    @ApiOperation("修改")
     public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute KeyInfoUpdateDTO request) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
@@ -114,6 +121,7 @@ public class KeyInfoController {
     @PreAuthorize("@ss.hasPermi('key:info:update:status')")
     @PostMapping(value = "/update/status")
+    @ApiOperation("修改状态")
     public com.ruoyi.common.core.domain.AjaxResult updateState(@ModelAttribute KeyInfoUpdateStatusDTO request) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="车辆的新增DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoAddDTO implements java.io.Serializable {
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="车辆的查询DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoQueryDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="车辆的修改DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoUpdateDTO implements java.io.Serializable {
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 import java.util.Objects;
 @Data
-@ApiModel
+@ApiModel(value="车辆的VO")
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoVO implements java.io.Serializable {
     private static final long serialVersionUID = 522735525L;
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机信息的添加DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class NewDriverAddDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机信息的查询DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class NewDriverQueryDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机信息的修改DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class NewDriverUpdateDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机健康信息的新增DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class DriverHealthyAddDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机健康信息的查询DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class DriverHealthyQueryDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机健康信息的修改DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class DriverHealthyUpdateDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机健康信息的修改状态DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class DriverHealthyUpdateStatusDTO implements java.io.Serializable {
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="司机健康信息的VO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class DriverHealthyVO implements java.io.Serializable {
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 import org.apache.commons.lang3.StringUtils;
 @Data
-@ApiModel
+@ApiModel(value="司机信息的VO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class NewDriverVO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="钥匙信息的添加DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class KeyInfoAddDTO implements java.io.Serializable {
@@ -8,9 +8,10 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="钥匙信息的查询DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
+
 public class KeyInfoQueryDTO  implements java.io.Serializable {
     private static final long serialVersionUID = 397900919L;
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="钥匙信息的修改DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class KeyInfoUpdateDTO implements java.io.Serializable {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="钥匙信息的修改状态DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class KeyInfoUpdateStatusDTO implements java.io.Serializable {
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel
+@ApiModel(value="钥匙信息的VO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class KeyInfoVO implements java.io.Serializable {
+package com.ruoyi.mapper.driver;
+
+import com.ruoyi.domain.driver.NewDriver;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+@Mapper
+public interface NewDriverMapper extends BaseMapper<NewDriver> {
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(NewDriver name);
+}
 \ No newline at end of file
+package com;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.driver.NewDriver;
+
+
+public interface NewDriverService extends IService<NewDriver> {
+    /**
+     * 分页查询
+     */
+    IPage<NewDriver> pageList(com.baomidou.mybatisplus.extension.plugins.pagination.Page<NewDriver> page, NewDriver entity, OrderEntity orderEntity);
+
+    /**
+     * 带条件查询
+     */
+    List<NewDriver> list(NewDriver entity);
+
+    List<NewDriver> listOfIds(java.util.Collection<java.lang.String> ids);
+
+    /***
+     *用于页面选择
+     */
+    List<NewDriver> listOfSelect(NewDriver entity);
+
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    NewDriver getOne(NewDriver entity);
+
+    Integer countId(NewDriver entity);
+
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(NewDriver entity);
+
+    /***插入数据*/
+    boolean insert(NewDriver entity);
+
+    /**
+     * 根据主键修改数据
+     */
+    boolean updateByPrimaryKey(NewDriver entity);
+
+    boolean deleteById(java.lang.String jobCode);
+}
 \ No newline at end of file
+package com.ruoyi.service.impl.driver;
+
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.mapper.driver.NewDriverMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.github.pagehelper.PageHelper;
+
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import com.ruoyi.domain.OrderEntity;
+
+@Service
+public class NewDriverServiceImpl extends ServiceImpl<NewDriverMapper, NewDriver> implements com.NewDriverService {
+    @Autowired
+    private NewDriverMapper newDriverMapper;
+
+    /**
+     * 分页查询
+     */
+    @Override
+    public IPage<NewDriver> pageList(Page<NewDriver> page, NewDriver entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<NewDriver> countWrapper = new LambdaQueryWrapper<>(entity);
+        countWrapper.select(NewDriver::getJobCode);
+        int count = count(countWrapper);
+
+        List<NewDriver> lists = Collections.emptyList();
+        if (count > 0) {
+            PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
+            LambdaQueryWrapper<NewDriver> selectWrapper = new LambdaQueryWrapper<>(entity);
+            orderColumn(selectWrapper, orderEntity);
+            lists = list(selectWrapper);
+        }
+
+        IPage<NewDriver> returnPage = new Page<NewDriver>();
+        returnPage.setRecords(lists);
+        returnPage.setPages(count % page.getSize() == 0 ? count / page.getSize() : count / page.getSize() + 1);
+        returnPage.setCurrent(page.getCurrent());
+        returnPage.setSize(page.getSize());
+        returnPage.setTotal(count);
+
+        return returnPage;
+    }
+
+    @Override
+    public List<NewDriver> list(NewDriver entity) {
+        return list(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public List<NewDriver> listOfIds(Collection<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(NewDriver::getId, ids);
+        return list(wrapper);
+    }
+
+    @Override
+    public List<NewDriver> listOfSelect(NewDriver entity) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(NewDriver::getId, NewDriver::getJobCode, NewDriver::getPersonnelName);
+        return list(wrapper);
+    }
+
+    @Override
+    public NewDriver getOne(NewDriver entity) {
+        return getOne(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public Integer countId(NewDriver entity) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(NewDriver::getJobCode);
+        return count(wrapper);
+    }
+
+
+    /**
+     * 插入有值的列
+     */
+    @Override
+    public int insertSelective(NewDriver entity) {
+        return newDriverMapper.insertSelective(entity);
+    }
+
+    /**
+     * 插入数据
+     */
+    @Override
+    public boolean insert(NewDriver entity) {
+        return save(entity);
+    }
+
+    /**
+     * 根据主键修改数据
+     */
+    @Override
+    public boolean updateByPrimaryKey(NewDriver entity) {
+        return updateById(entity);
+    }
+
+    /***根据主键删除数据*/
+    @Override
+    public boolean deleteById(java.lang.String jobCode) {
+        return removeById(jobCode);
+    }
+
+
+    public static void orderColumn(LambdaQueryWrapper<NewDriver> wrapper, com.ruoyi.domain.OrderEntity orderEntity) {
+        if (org.apache.commons.lang3.StringUtils.equals("ascending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByAsc(NewDriver::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "jobCode")) {
+                wrapper.orderByAsc(NewDriver::getJobCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "companyCode")) {
+                wrapper.orderByAsc(NewDriver::getCompanyCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "brancheCompanyCode")) {
+                wrapper.orderByAsc(NewDriver::getBrancheCompanyCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "personnelName")) {
+                wrapper.orderByAsc(NewDriver::getPersonnelName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "papersCode")) {
+                wrapper.orderByAsc(NewDriver::getPapersCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "icCardCode")) {
+                wrapper.orderByAsc(NewDriver::getIcCardCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "personnelType")) {
+                wrapper.orderByAsc(NewDriver::getPersonnelType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "posts")) {
+                wrapper.orderByAsc(NewDriver::getPosts);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "card")) {
+                wrapper.orderByAsc(NewDriver::getCard);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "telphone")) {
+                wrapper.orderByAsc(NewDriver::getTelphone);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "icRfid")) {
+                wrapper.orderByAsc(NewDriver::getIcRfid);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "idRfid")) {
+                wrapper.orderByAsc(NewDriver::getIdRfid);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "tagRfid")) {
+                wrapper.orderByAsc(NewDriver::getTagRfid);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "remark")) {
+                wrapper.orderByAsc(NewDriver::getRemark);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineName")) {
+                wrapper.orderByAsc(NewDriver::getLineName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineCode")) {
+                wrapper.orderByAsc(NewDriver::getLineCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "faceSignIn")) {
+                wrapper.orderByAsc(NewDriver::getFaceSignIn);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "image")) {
+                wrapper.orderByAsc(NewDriver::getImage);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByAsc(NewDriver::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signInEquipment")) {
+                wrapper.orderByAsc(NewDriver::getSignInEquipment);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fleetName")) {
+                wrapper.orderByAsc(NewDriver::getFleetName);
+            }
+        } else if (org.apache.commons.lang3.StringUtils.equals("descending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByDesc(NewDriver::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "jobCode")) {
+                wrapper.orderByDesc(NewDriver::getJobCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "companyCode")) {
+                wrapper.orderByDesc(NewDriver::getCompanyCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "brancheCompanyCode")) {
+                wrapper.orderByDesc(NewDriver::getBrancheCompanyCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "personnelName")) {
+                wrapper.orderByDesc(NewDriver::getPersonnelName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "papersCode")) {
+                wrapper.orderByDesc(NewDriver::getPapersCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "icCardCode")) {
+                wrapper.orderByDesc(NewDriver::getIcCardCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "personnelType")) {
+                wrapper.orderByDesc(NewDriver::getPersonnelType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "posts")) {
+                wrapper.orderByDesc(NewDriver::getPosts);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "card")) {
+                wrapper.orderByDesc(NewDriver::getCard);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "telphone")) {
+                wrapper.orderByDesc(NewDriver::getTelphone);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "icRfid")) {
+                wrapper.orderByDesc(NewDriver::getIcRfid);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "idRfid")) {
+                wrapper.orderByDesc(NewDriver::getIdRfid);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "tagRfid")) {
+                wrapper.orderByDesc(NewDriver::getTagRfid);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "remark")) {
+                wrapper.orderByDesc(NewDriver::getRemark);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineName")) {
+                wrapper.orderByDesc(NewDriver::getLineName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineCode")) {
+                wrapper.orderByDesc(NewDriver::getLineCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "faceSignIn")) {
+                wrapper.orderByDesc(NewDriver::getFaceSignIn);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "image")) {
+                wrapper.orderByDesc(NewDriver::getImage);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByDesc(NewDriver::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signInEquipment")) {
+                wrapper.orderByDesc(NewDriver::getSignInEquipment);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fleetName")) {
+                wrapper.orderByDesc(NewDriver::getFleetName);
+            }
+        }
+    }
+}
 \ No newline at end of file
@@ -59,9 +59,9 @@ public class SwaggerConfig
                 // 设置哪些接口暴露给Swagger展示
                 .select()
                 // 扫描所有有注解的api，用这种方式更灵活
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+               // .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                 .apis(RequestHandlerSelectors.basePackage("com.ruoyi"))
                 // 扫描所有
                 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())