guzijian / bsth-alcohol-sign · Commits

Commit c43ba5a19cf38c50cf0b0bcfd729f39b9cd51f6e

Authored by liujun001
1 parent db25de53
build: skipped

司机健康数据

Inline Side-by-side
Showing 17 changed files with 503 additions and 156 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/driver/healthy/DriverHealthyController.java 0 → 100644
  View file @c43ba5a
  1 +package com.ruoyi.controller.driver.healthy;
  2 +
  3 +import com.ruoyi.common.core.controller.BaseController;
  4 +import com.ruoyi.common.core.domain.AjaxResult;
  5 +import io.swagger.annotations.ApiOperation;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.web.bind.annotation.RestController;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.bind.annotation.*;
  10 +import org.springframework.beans.BeanUtils;
  11 +
  12 +import org.springframework.security.access.prepost.PreAuthorize;
  13 +
  14 +import java.util.Date;
  15 +import java.util.List;
  16 +
  17 +import com.ruoyi.domain.OrderEntity;
  18 +
  19 +
  20 +import com.baomidou.mybatisplus.core.metadata.IPage;
  21 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  22 +
  23 +import com.alibaba.fastjson2.JSON;
  24 +
  25 +import com.ruoyi.common.utils.poi.ExcelUtil;
  26 +
  27 +import javax.servlet.http.HttpServletResponse;
  28 +
  29 +import com.ruoyi.service.driver.healthy.DriverHealthyService;
  30 +import com.ruoyi.domain.driver.healthy.vo.DriverHealthyVO;
  31 +import com.ruoyi.domain.driver.healthy.dto.DriverHealthyAddDTO;
  32 +import com.ruoyi.domain.driver.healthy.dto.DriverHealthyUpdateDTO;
  33 +import com.ruoyi.domain.driver.healthy.dto.DriverHealthyUpdateStatusDTO;
  34 +import com.ruoyi.domain.driver.healthy.dto.DriverHealthyQueryDTO;
  35 +import com.ruoyi.domain.driver.healthy.DriverHealthy;
  36 +
  37 +@RestController
  38 +@RequestMapping("driver/healthy")
  39 +public class DriverHealthyController extends BaseController {
  40 + @Autowired
  41 + private DriverHealthyService driverHealthyService;
  42 +
  43 + @PreAuthorize("@ss.hasPermi('driver:healthy:list:limit:page:limit')")
  44 + @PostMapping(value = "/list/limit/{page}/{pageLimit}")
  45 + public String listLimit(@ModelAttribute DriverHealthyQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
  46 + request.clearStrEmpty();
  47 + DriverHealthy entity = convert(request);
  48 + IPage<DriverHealthy> response = driverHealthyService.pageList(new Page<DriverHealthy>(page, pageLimit), entity, orderEntity);
  49 +
  50 + return JSON.toJSONString(convert(response));
  51 + }
  52 +
  53 +
  54 + @GetMapping(value = "/view/{id}")
  55 + public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
  56 + DriverHealthy source = driverHealthyService.getById(id);
  57 +
  58 + return com.ruoyi.common.core.domain.AjaxResult.success(convert(source));
  59 + }
  60 +
  61 +
  62 + @PreAuthorize("@ss.hasPermi('driver:healthy:export')")
  63 + @PostMapping("/export")
  64 + public void export(HttpServletResponse response, @RequestBody DriverHealthyQueryDTO request) {
  65 + request.clearStrEmpty();
  66 + DriverHealthy entity = convert(request);
  67 + List<DriverHealthy> list = driverHealthyService.list(entity);
  68 + ExcelUtil<DriverHealthy> util = new ExcelUtil<DriverHealthy>(DriverHealthy.class);
  69 + util.exportExcel(response, list, "DriverHealthy");
  70 + }
  71 +
  72 + @PreAuthorize("@ss.hasPermi('driver:healthy:add')")
  73 + @PostMapping(value = "/add")
  74 + public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute DriverHealthyAddDTO request) {
  75 + request.clearStrEmpty();
  76 + DriverHealthy entity = convert(request);
  77 + entity.setCreateBy(getUserId());
  78 + entity.setCreateTime(new Date());
  79 + int count = driverHealthyService.insertSelective(entity);
  80 + return count > 0 ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("添加数据失败，请稍后再试");
  81 + }
  82 +
  83 + @PreAuthorize("@ss.hasPermi('driver:healthy:update')")
  84 + @PostMapping(value = "/update")
  85 + public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute DriverHealthyUpdateDTO request) {
  86 + request.clearStrEmpty();
  87 + DriverHealthy entity = convert(request);
  88 + entity.setUpdateBy(getUserId());
  89 + entity.setUpdateTime(new Date());
  90 + boolean flag = driverHealthyService.updateByPrimaryKey(entity);
  91 + return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
  92 + }
  93 +
  94 + @PreAuthorize("@ss.hasPermi('driver:healthy:update:status')")
  95 + @PostMapping(value = "/update/status")
  96 + public com.ruoyi.common.core.domain.AjaxResult updateState(@ModelAttribute DriverHealthyUpdateStatusDTO request) {
  97 + request.clearStrEmpty();
  98 + DriverHealthy entity = convert(request);
  99 + boolean flag = driverHealthyService.updateByPrimaryKey(entity);
  100 + return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
  101 + }
  102 +
  103 + private DriverHealthy convert(DriverHealthyQueryDTO source) {
  104 + return java.util.Optional.ofNullable(source).map(sc -> {
  105 + DriverHealthy target = new DriverHealthy();
  106 + BeanUtils.copyProperties(sc, target);
  107 + return target;
  108 + }).orElse(null);
  109 + }
  110 +
  111 + private DriverHealthy convert(DriverHealthyUpdateDTO source) {
  112 + return java.util.Optional.ofNullable(source).map(sc -> {
  113 + DriverHealthy target = new DriverHealthy();
  114 + BeanUtils.copyProperties(sc, target);
  115 + return target;
  116 + }).orElse(null);
  117 + }
  118 +
  119 + private DriverHealthy convert(DriverHealthyUpdateStatusDTO source) {
  120 + return java.util.Optional.ofNullable(source).map(sc -> {
  121 + DriverHealthy target = new DriverHealthy();
  122 + BeanUtils.copyProperties(sc, target);
  123 + return target;
  124 + }).orElse(null);
  125 + }
  126 +
  127 + private DriverHealthy convert(DriverHealthyAddDTO source) {
  128 + return java.util.Optional.ofNullable(source).map(sc -> {
  129 + DriverHealthy target = new DriverHealthy();
  130 + BeanUtils.copyProperties(sc, target);
  131 + return target;
  132 + }).orElseGet(null);
  133 + }
  134 +
  135 + private DriverHealthyVO convert(DriverHealthy source) {
  136 + return java.util.Optional.ofNullable(source).map(sc -> {
  137 + DriverHealthyVO target = new DriverHealthyVO();
  138 + BeanUtils.copyProperties(source, target);
  139 + return target;
  140 + }).orElseGet(null);
  141 + }
  142 +
  143 + private List<DriverHealthyVO> convert(List<DriverHealthy> sources) {
  144 + return java.util.Optional.ofNullable(sources).map(scs -> {
  145 + return scs.stream().map(source -> {
  146 + return convert(source);
  147 + }).collect(java.util.stream.Collectors.toList());
  148 + }).orElseGet(null);
  149 + }
  150 +
  151 + private IPage<DriverHealthyVO> convert(IPage<DriverHealthy> sources) {
  152 + return java.util.Optional.ofNullable(sources).map(scs -> {
  153 + IPage<DriverHealthyVO> target = new Page();
  154 + BeanUtils.copyProperties(scs, target);
  155 + List<DriverHealthyVO> voNames = convert(scs.getRecords());
  156 + target.setRecords(voNames);
  157 +
  158 + return target;
  159 + }).orElseGet(null);
  160 + }
  161 +}
0 162 \ No newline at end of file
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java 0 → 100644
  View file @c43ba5a
  1 +package com.ruoyi.domain.driver;
  2 +
  3 +import lombok.Data;
  4 +import com.baomidou.mybatisplus.annotation.IdType;
  5 +import com.baomidou.mybatisplus.annotation.TableField;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import org.apache.commons.lang3.StringUtils;
  9 +import lombok.EqualsAndHashCode;
  10 +import lombok.experimental.Accessors;
  11 +import lombok.extern.slf4j.Slf4j;
  12 +import com.ruoyi.common.annotation.Excel;
  13 +
  14 +@Data
  15 +@Slf4j
  16 +@Accessors(chain = true)
  17 +@EqualsAndHashCode(callSuper = false)
  18 +@TableName("driver")
  19 +public class NewDriver {
  20 + /***主键*/
  21 + @Excel(name = "主键")
  22 + private Integer id;
  23 +
  24 +
  25 + /***工号*/
  26 + @TableId(value = "job_code", type = IdType.AUTO)
  27 + @Excel(name = "工号")
  28 + private String jobCode;
  29 +
  30 +
  31 + /***公司编码*/
  32 + @Excel(name = "公司编码")
  33 + private String companyCode;
  34 +
  35 +
  36 + /***分公司编码*/
  37 + @Excel(name = "分公司编码")
  38 + private String brancheCompanyCode;
  39 +
  40 +
  41 + /***姓名*/
  42 + @Excel(name = "姓名")
  43 + private String personnelName;
  44 +
  45 +
  46 + /***运营服务证书号*/
  47 + @Excel(name = "运营服务证书号")
  48 + private String papersCode;
  49 +
  50 +
  51 + /***一卡通工作卡号*/
  52 + @Excel(name = "一卡通工作卡号")
  53 + private String icCardCode;
  54 +
  55 +
  56 + /***性别*/
  57 + @Excel(name = "性别")
  58 + private String personnelType;
  59 +
  60 +
  61 + /***所属岗位/工种*/
  62 + @Excel(name = "所属岗位/工种")
  63 + private String posts;
  64 +
  65 +
  66 + /***身份证*/
  67 + @Excel(name = "身份证")
  68 + private String card;
  69 +
  70 +
  71 + /***联系电话*/
  72 + @Excel(name = "联系电话")
  73 + private String telphone;
  74 +
  75 +
  76 + /***RFID 人卡IC号*/
  77 + @Excel(name = "RFID 人卡IC号")
  78 + private String icRfid;
  79 +
  80 +
  81 + /***RFID 人卡ID号（10进制）*/
  82 + @Excel(name = "RFID 人卡ID号（10进制）")
  83 + private String idRfid;
  84 +
  85 +
  86 + /***RFID 标签号*/
  87 + @Excel(name = "RFID 标签号")
  88 + private String tagRfid;
  89 +
  90 +
  91 + /***备注*/
  92 + @Excel(name = "备注")
  93 + private String remark;
  94 +
  95 +
  96 + /***线路名称*/
  97 + @Excel(name = "线路名称")
  98 + private String lineName;
  99 +
  100 +
  101 + /***线路编码*/
  102 + @Excel(name = "线路编码")
  103 + private String lineCode;
  104 +
  105 +
  106 + /***是否进行人脸注册 1 注册 2 未注册*/
  107 + @Excel(name = "是否进行人脸注册 1 注册 2 未注册")
  108 + private Integer faceSignIn;
  109 +
  110 +
  111 + /***头像*/
  112 + @Excel(name = "头像")
  113 + private String image;
  114 +
  115 +
  116 + /***更新日期*/
  117 + @Excel(name = "更新日期")
  118 + private java.util.Date updateTime;
  119 +
  120 +
  121 + /***注册设备列表*/
  122 + @Excel(name = "注册设备列表")
  123 + private String signInEquipment;
  124 +
  125 +
  126 + /***车队名称*/
  127 + @Excel(name = "车队名称")
  128 + private String fleetName;
  129 +
  130 +
  131 + @Override
  132 + public String toString() {
  133 + return com.alibaba.fastjson2.JSON.toJSONString(this);
  134 + }
  135 +}
0 136 \ No newline at end of file
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/domain/dto/DriverAddDTO.java renamed to Bsth-admin/src/main/java/com/ruoyi/domain/driver/dto/NewDriverAddDTO.java
  View file @c43ba5a
1   -package com.ruoyi.driver.domain.dto;
  1 +package com.ruoyi.domain.driver.dto;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ... @@ -10,8 +10,8 @@ import lombok.experimental.Accessors;
10 10 @ApiModel
11 11 @Accessors(chain = true)
12 12 @EqualsAndHashCode(callSuper = false)
13   -public class DriverAddDTO implements java.io.Serializable {
14   - private static final long serialVersionUID = 758191821L;
  13 +public class NewDriverAddDTO implements java.io.Serializable {
  14 + private static final long serialVersionUID = 984860231L;
15 15  
16 16 /***主键*/
17 17 @ApiModelProperty(value = "主键", example = "1")
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/domain/dto/DriverQueryDTO.java renamed to Bsth-admin/src/main/java/com/ruoyi/domain/driver/dto/NewDriverQueryDTO.java
  View file @c43ba5a
1   -package com.ruoyi.driver.domain.dto;
  1 +package com.ruoyi.domain.driver.dto;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ... @@ -10,8 +10,8 @@ import lombok.experimental.Accessors;
10 10 @ApiModel
11 11 @Accessors(chain = true)
12 12 @EqualsAndHashCode(callSuper = false)
13   -public class DriverQueryDTO implements java.io.Serializable {
14   - private static final long serialVersionUID = 385279274L;
  13 +public class NewDriverQueryDTO implements java.io.Serializable {
  14 + private static final long serialVersionUID = 852964138L;
15 15  
16 16 /***主键*/
17 17 @ApiModelProperty(value = "主键", example = "1")
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/domain/dto/DriverUpdateDTO.java renamed to Bsth-admin/src/main/java/com/ruoyi/domain/driver/dto/NewDriverUpdateDTO.java
  View file @c43ba5a
1   -package com.ruoyi.driver.domain.dto;
  1 +package com.ruoyi.domain.driver.dto;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ... @@ -10,8 +10,8 @@ import lombok.experimental.Accessors;
10 10 @ApiModel
11 11 @Accessors(chain = true)
12 12 @EqualsAndHashCode(callSuper = false)
13   -public class DriverUpdateDTO implements java.io.Serializable {
14   - private static final long serialVersionUID = 793137831L;
  13 +public class NewDriverUpdateDTO implements java.io.Serializable {
  14 + private static final long serialVersionUID = 530049121L;
15 15  
16 16 /***主键*/
17 17 @ApiModelProperty(value = "主键", example = "1")
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/DriverHealthy.java
  View file @c43ba5a
... ... @@ -25,7 +25,7 @@ public class DriverHealthy {
25 25  
26 26 /***司机ID*/
27 27 @Excel(name = "司机ID")
28   - private String driverId;
  28 + private Long driverId;
29 29  
30 30  
31 31 /***血压舒张值*/
... ... @@ -50,7 +50,7 @@ public class DriverHealthy {
50 50  
51 51 /***创建人员*/
52 52 @Excel(name = "创建人员")
53   - private String createBy;
  53 + private Long createBy;
54 54  
55 55  
56 56 /***创建时间*/
... ... @@ -60,7 +60,7 @@ public class DriverHealthy {
60 60  
61 61 /***修改人员*/
62 62 @Excel(name = "修改人员")
63   - private String updateBy;
  63 + private Long updateBy;
64 64  
65 65  
66 66 /***修改时间*/
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyAddDTO.java
  View file @c43ba5a
... ... @@ -18,7 +18,7 @@ public class DriverHealthyAddDTO implements java.io.Serializable {
18 18 private Long id;
19 19 /***司机ID*/
20 20 @ApiModelProperty(value = "司机ID")
21   - private String driverId;
  21 + private Long driverId;
22 22 /***血压舒张值*/
23 23 @ApiModelProperty(value = "血压舒张值")
24 24 private java.math.BigDecimal systolicPressure;
... ... @@ -33,13 +33,13 @@ public class DriverHealthyAddDTO implements java.io.Serializable {
33 33 private java.math.BigDecimal heartRate;
34 34 /***创建人员*/
35 35 @ApiModelProperty(value = "创建人员")
36   - private String createBy;
  36 + private Long createBy;
37 37 /***创建时间*/
38 38 @ApiModelProperty(value = "创建时间")
39 39 private java.util.Date createTime;
40 40 /***修改人员*/
41 41 @ApiModelProperty(value = "修改人员")
42   - private String updateBy;
  42 + private Long updateBy;
43 43 /***修改时间*/
44 44 @ApiModelProperty(value = "修改时间")
45 45 private java.util.Date updateTime;
... ... @@ -51,18 +51,7 @@ public class DriverHealthyAddDTO implements java.io.Serializable {
51 51 private String operator;
52 52  
53 53 public void clearStrEmpty() {
54   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.driverId)) {
55   - this.driverId = null;
56   - }
57   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)) {
58   - this.createBy = null;
59   - }
60   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)) {
61   - this.updateBy = null;
62   - }
63   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.operator)) {
64   - this.operator = null;
65   - }
  54 +
66 55 }
67 56  
68 57 @Override
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyQueryDTO.java
  View file @c43ba5a
... ... @@ -18,7 +18,7 @@ public class DriverHealthyQueryDTO implements java.io.Serializable {
18 18 private Long id;
19 19 /***司机ID*/
20 20 @ApiModelProperty(value = "司机ID")
21   - private String driverId;
  21 + private Long driverId;
22 22 /***血压舒张值*/
23 23 @ApiModelProperty(value = "血压舒张值")
24 24 private java.math.BigDecimal systolicPressure;
... ... @@ -33,13 +33,13 @@ public class DriverHealthyQueryDTO implements java.io.Serializable {
33 33 private java.math.BigDecimal heartRate;
34 34 /***创建人员*/
35 35 @ApiModelProperty(value = "创建人员")
36   - private String createBy;
  36 + private Long createBy;
37 37 /***创建时间*/
38 38 @ApiModelProperty(value = "创建时间")
39 39 private java.util.Date createTime;
40 40 /***修改人员*/
41 41 @ApiModelProperty(value = "修改人员")
42   - private String updateBy;
  42 + private Long updateBy;
43 43 /***修改时间*/
44 44 @ApiModelProperty(value = "修改时间")
45 45 private java.util.Date updateTime;
... ... @@ -48,15 +48,7 @@ public class DriverHealthyQueryDTO implements java.io.Serializable {
48 48 private Boolean delFlag;
49 49  
50 50 public void clearStrEmpty() {
51   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.driverId)) {
52   - this.driverId = null;
53   - }
54   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)) {
55   - this.createBy = null;
56   - }
57   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)) {
58   - this.updateBy = null;
59   - }
  51 +
60 52 }
61 53  
62 54 @Override
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyUpdateDTO.java
  View file @c43ba5a
... ... @@ -18,7 +18,7 @@ public class DriverHealthyUpdateDTO implements java.io.Serializable {
18 18 private Long id;
19 19 /***司机ID*/
20 20 @ApiModelProperty(value = "司机ID")
21   - private String driverId;
  21 + private Long driverId;
22 22 /***血压舒张值*/
23 23 @ApiModelProperty(value = "血压舒张值")
24 24 private java.math.BigDecimal systolicPressure;
... ... @@ -33,13 +33,13 @@ public class DriverHealthyUpdateDTO implements java.io.Serializable {
33 33 private java.math.BigDecimal heartRate;
34 34 /***创建人员*/
35 35 @ApiModelProperty(value = "创建人员")
36   - private String createBy;
  36 + private Long createBy;
37 37 /***创建时间*/
38 38 @ApiModelProperty(value = "创建时间")
39 39 private java.util.Date createTime;
40 40 /***修改人员*/
41 41 @ApiModelProperty(value = "修改人员")
42   - private String updateBy;
  42 + private Long updateBy;
43 43 /***修改时间*/
44 44 @ApiModelProperty(value = "修改时间")
45 45 private java.util.Date updateTime;
... ... @@ -51,18 +51,6 @@ public class DriverHealthyUpdateDTO implements java.io.Serializable {
51 51 private String operator;
52 52  
53 53 public void clearStrEmpty() {
54   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.driverId)) {
55   - this.driverId = null;
56   - }
57   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)) {
58   - this.createBy = null;
59   - }
60   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)) {
61   - this.updateBy = null;
62   - }
63   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.operator)) {
64   - this.operator = null;
65   - }
66 54 }
67 55  
68 56 @Override
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/dto/DriverHealthyUpdateStatusDTO.java
  View file @c43ba5a
... ... @@ -18,7 +18,7 @@ public class DriverHealthyUpdateStatusDTO implements java.io.Serializable {
18 18 private Long id;
19 19 /***司机ID*/
20 20 @ApiModelProperty(value = "司机ID")
21   - private String driverId;
  21 + private Long driverId;
22 22 /***血压舒张值*/
23 23 @ApiModelProperty(value = "血压舒张值")
24 24 private java.math.BigDecimal systolicPressure;
... ... @@ -33,13 +33,13 @@ public class DriverHealthyUpdateStatusDTO implements java.io.Serializable {
33 33 private java.math.BigDecimal heartRate;
34 34 /***创建人员*/
35 35 @ApiModelProperty(value = "创建人员")
36   - private String createBy;
  36 + private Long createBy;
37 37 /***创建时间*/
38 38 @ApiModelProperty(value = "创建时间")
39 39 private java.util.Date createTime;
40 40 /***修改人员*/
41 41 @ApiModelProperty(value = "修改人员")
42   - private String updateBy;
  42 + private Long updateBy;
43 43 /***修改时间*/
44 44 @ApiModelProperty(value = "修改时间")
45 45 private java.util.Date updateTime;
... ... @@ -51,18 +51,7 @@ public class DriverHealthyUpdateStatusDTO implements java.io.Serializable {
51 51 private String operator;
52 52  
53 53 public void clearStrEmpty() {
54   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.driverId)) {
55   - this.driverId = null;
56   - }
57   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)) {
58   - this.createBy = null;
59   - }
60   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)) {
61   - this.updateBy = null;
62   - }
63   - if (org.apache.commons.lang3.StringUtils.isEmpty(this.operator)) {
64   - this.operator = null;
65   - }
  54 +
66 55 }
67 56  
68 57 @Override
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/healthy/vo/DriverHealthyVO.java
  View file @c43ba5a
... ... @@ -19,7 +19,7 @@ public class DriverHealthyVO implements java.io.Serializable {
19 19 private Long id;
20 20 /***司机ID*/
21 21 @ApiModelProperty(value = "司机ID")
22   - private String driverId;
  22 + private Long driverId;
23 23 @ApiModelProperty(value = "司机名称")
24 24 private String driverName;
25 25 /***血压舒张值*/
... ... @@ -36,13 +36,13 @@ public class DriverHealthyVO implements java.io.Serializable {
36 36 private java.math.BigDecimal heartRate;
37 37 /***创建人员*/
38 38 @ApiModelProperty(value = "创建人员")
39   - private String createBy;
  39 + private Long createBy;
40 40 /***创建时间*/
41 41 @ApiModelProperty(value = "创建时间")
42 42 private java.util.Date createTime;
43 43 /***修改人员*/
44 44 @ApiModelProperty(value = "修改人员")
45   - private String updateBy;
  45 + private Long updateBy;
46 46 /***修改时间*/
47 47 @ApiModelProperty(value = "修改时间")
48 48 private java.util.Date updateTime;
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/domain/vo/DriverVO.java renamed to Bsth-admin/src/main/java/com/ruoyi/domain/driver/vo/NewDriverVO.java
  View file @c43ba5a
1   -package com.ruoyi.driver.domain.vo;
  1 +package com.ruoyi.domain.driver.vo;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ... @@ -12,8 +12,8 @@ import org.apache.commons.lang3.StringUtils;
12 12 @ApiModel
13 13 @Accessors(chain = true)
14 14 @EqualsAndHashCode(callSuper = false)
15   -public class DriverVO implements java.io.Serializable {
16   - private static final long serialVersionUID = 611817920L;
  15 +public class NewDriverVO implements java.io.Serializable {
  16 + private static final long serialVersionUID = 734019433L;
17 17  
18 18 /***主键*/
19 19 @ApiModelProperty(value = "主键", example = "1")
... ... @@ -82,27 +82,31 @@ public class DriverVO implements java.io.Serializable {
82 82 @ApiModelProperty(value = "车队名称")
83 83 private String fleetName;
84 84  
  85 +
85 86 public String getPersonnelNameAndJobCode() {
86   - if (StringUtils.isNotEmpty(this.personnelName) && StringUtils.isNotEmpty(this.jobCode)) {
  87 + if (StringUtils.isNotEmpty(this.getPersonnelName()) && StringUtils.isNotEmpty(this.getJobCode())) {
87 88 StringBuilder builder = new StringBuilder();
88   - builder.append(this.personnelName);
  89 + builder.append(this.getPersonnelName());
89 90 builder.append("(");
90   - builder.append(this.jobCode);
  91 + builder.append(this.getJobCode());
91 92 builder.append(")");
92   -
93 93 return builder.toString();
94   - } else if (StringUtils.isNotEmpty(this.personnelName)) {
95   - return this.personnelName;
96   - } else if (StringUtils.isNotEmpty(this.jobCode)) {
  94 + } else if (StringUtils.isNotEmpty(this.getJobCode())) {
97 95 StringBuilder builder = new StringBuilder();
98   - builder.append("(");
99   - builder.append(this.jobCode);
  96 + builder.append(" (");
  97 + builder.append(this.getJobCode());
100 98 builder.append(")");
101 99 return builder.toString();
  100 + } else if (StringUtils.isNotEmpty(this.getPersonnelName())) {
  101 + StringBuilder builder = new StringBuilder();
  102 + builder.append(this.getPersonnelName());
  103 + builder.append("( )");
  104 + return builder.toString();
102 105 }
103 106 return null;
104 107 }
105 108  
  109 +
106 110 @Override
107 111 public String toString() {
108 112 return com.alibaba.fastjson2.JSON.toJSONString(this);
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
  View file @c43ba5a
... ... @@ -6,16 +6,10 @@ import javax.servlet.http.HttpServletResponse;
6 6  
7 7 import com.baomidou.mybatisplus.core.metadata.IPage;
8 8 import com.ruoyi.common.global.Result;
9   -import com.ruoyi.common.global.ResultCode;
10   -import com.ruoyi.driver.domain.dto.DriverAddDTO;
11   -import com.ruoyi.driver.domain.dto.DriverQueryDTO;
12   -import com.ruoyi.driver.domain.dto.DriverUpdateDTO;
13   -import com.ruoyi.driver.domain.vo.DriverVO;
14 9 import com.ruoyi.pojo.request.DriverRequestVo;
15 10 import com.ruoyi.pojo.request.DriverSignInRequestVo;
16 11 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
17 12 import com.ruoyi.pojo.request.FaceUpdateReqVo;
18   -import com.ruoyi.pojo.response.DriverResponseVo;
19 13 import io.swagger.annotations.Api;
20 14 import io.swagger.annotations.ApiOperation;
21 15 import io.swagger.annotations.ApiParam;
... ... @@ -77,13 +71,6 @@ public class DriverController extends BaseController {
77 71 return getDataTable(list);
78 72 }
79 73  
80   - @PostMapping(value = "list/select")
81   - @ApiOperation("（页面选择）")
82   - public AjaxResult listSelect(DriverQueryDTO request) {
83   - Driver driver = convert(request);
84   - List<Driver> drivers = driverService.selectDriverIdJobCodePersonnelName(driver);
85   - return AjaxResult.success(convert(drivers));
86   - }
87 74  
88 75 /**
89 76 * 获取驾驶员信息列表
... ... @@ -236,56 +223,4 @@ public class DriverController extends BaseController {
236 223 }
237 224  
238 225  
239   - private Driver convert(DriverQueryDTO source) {
240   - return java.util.Optional.ofNullable(source).map(sc -> {
241   - Driver target = new Driver();
242   - BeanUtils.copyProperties(sc, target);
243   - return target;
244   - }).orElse(null);
245   - }
246   -
247   - private Driver convert(DriverUpdateDTO source) {
248   - return java.util.Optional.ofNullable(source).map(sc -> {
249   - Driver target = new Driver();
250   - BeanUtils.copyProperties(sc, target);
251   - return target;
252   - }).orElse(null);
253   - }
254   -
255   -
256   - private Driver convert(DriverAddDTO source) {
257   - return java.util.Optional.ofNullable(source).map(sc -> {
258   - Driver target = new Driver();
259   - BeanUtils.copyProperties(sc, target);
260   - return target;
261   - }).orElseGet(null);
262   - }
263   -
264   - private DriverVO convert(Driver source) {
265   - return java.util.Optional.ofNullable(source).map(sc -> {
266   - DriverVO target = new DriverVO();
267   - BeanUtils.copyProperties(source, target);
268   - return target;
269   - }).orElseGet(null);
270   - }
271   -
272   - private List<DriverVO> convert(List<Driver> sources) {
273   - return java.util.Optional.ofNullable(sources).map(scs -> {
274   - return scs.stream().map(source -> {
275   - return convert(source);
276   - }).collect(java.util.stream.Collectors.toList());
277   - }).orElseGet(null);
278   - }
279   -
280   - private IPage<DriverVO> convert(IPage<Driver> sources) {
281   - return java.util.Optional.ofNullable(sources).map(scs -> {
282   - IPage<DriverVO> target = new com.baomidou.mybatisplus.extension.plugins.pagination.Page();
283   - BeanUtils.copyProperties(scs, target);
284   - List<DriverVO> voNames = convert(scs.getRecords());
285   - target.setRecords(voNames);
286   -
287   - return target;
288   - }).orElseGet(null);
289   - }
290   -
291 226 }
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
  View file @c43ba5a
... ... @@ -157,6 +157,7 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
157 157  
158 158 @Override
159 159 public List<Driver> selectDriverIdJobCodePersonnelName(Driver driver) {
  160 + driver.setParams(null);
160 161 LambdaQueryWrapper<Driver> wrapper = new LambdaQueryWrapper<>(driver);
161 162 wrapper.select(Driver::getId, Driver::getJobCode, Driver::getPersonnelName);
162 163 return list(wrapper);
... ...
Bsth-admin/src/main/resources/application-druid-dev.yml
  View file @c43ba5a
... ... @@ -30,11 +30,11 @@ spring:
30 30 # 测试地址
31 31 # url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
32 32 #url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
33   - # url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
34   - url: jdbc:mysql://127.0.0.1:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
  33 + url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
  34 + # url: jdbc:mysql://127.0.0.1:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
35 35 username: root
36   - # password: guzijian
37   - password: 1
  36 + password: guzijian
  37 + # password: 1
38 38 # 从库数据源
39 39 slave:
40 40 # 从数据源开关/默认关闭
... ...
Bsth-admin/src/main/resources/mapper/driver/NewDriverMapper.xml 0 → 100644
  View file @c43ba5a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.ruoyi.mapper.driver.NewDriverMapper">
  4 +
  5 +
  6 + <insert id="insertSelective" keyColumn="job_code" keyProperty="jobCode" useGeneratedKeys="true"
  7 + parameterType="com.ruoyi.domain.driver.NewDriver">
  8 + INSERT INTO driver <include refid="insertSelectiveColumn"></include>
  9 + <include refid="insertSelectiveValue"></include>
  10 + </insert>
  11 +
  12 + <sql id="columns">
  13 + id
  14 + , job_code , company_code , branche_company_code , personnel_name , papers_code , ic_card_code , personnel_type , posts , card , telphone , ic_rfid , id_rfid , tag_rfid , remark , line_name , line_code , face_sign_in , image , update_time , sign_in_equipment , fleet_name
  15 + </sql>
  16 +
  17 + <sql id="insert_columns">
  18 + id
  19 + , job_code , company_code , branche_company_code , personnel_name , papers_code , ic_card_code , personnel_type , posts , card , telphone , ic_rfid , id_rfid , tag_rfid , remark , line_name , line_code , face_sign_in , image , update_time , sign_in_equipment , fleet_name
  20 + </sql>
  21 +
  22 + <sql id="insert_values">
  23 + #{id}
  24 + ,
  25 + #{jobCode},
  26 + #{companyCode},
  27 + #{brancheCompanyCode},
  28 + #{personnelName},
  29 + #{papersCode},
  30 + #{icCardCode},
  31 + #{personnelType},
  32 + #{posts},
  33 + #{card},
  34 + #{telphone},
  35 + #{icRfid},
  36 + #{idRfid},
  37 + #{tagRfid},
  38 + #{remark},
  39 + #{lineName},
  40 + #{lineCode},
  41 + #{faceSignIn},
  42 + #{image},
  43 + #{updateTime},
  44 + #{signInEquipment},
  45 + #{fleetName}
  46 + </sql>
  47 +
  48 + <sql id="insertSelectiveColumn">
  49 + <trim prefix="(" suffix=")" suffixOverrides=",">
  50 + <if test="null!=id">id,</if>
  51 + <if test="null!=jobCode">job_code,</if>
  52 + <if test="null!=companyCode">company_code,</if>
  53 + <if test="null!=brancheCompanyCode">branche_company_code,</if>
  54 + <if test="null!=personnelName">personnel_name,</if>
  55 + <if test="null!=papersCode">papers_code,</if>
  56 + <if test="null!=icCardCode">ic_card_code,</if>
  57 + <if test="null!=personnelType">personnel_type,</if>
  58 + <if test="null!=posts">posts,</if>
  59 + <if test="null!=card">card,</if>
  60 + <if test="null!=telphone">telphone,</if>
  61 + <if test="null!=icRfid">ic_rfid,</if>
  62 + <if test="null!=idRfid">id_rfid,</if>
  63 + <if test="null!=tagRfid">tag_rfid,</if>
  64 + <if test="null!=remark">remark,</if>
  65 + <if test="null!=lineName">line_name,</if>
  66 + <if test="null!=lineCode">line_code,</if>
  67 + <if test="null!=faceSignIn">face_sign_in,</if>
  68 + <if test="null!=image">image,</if>
  69 + <if test="null!=updateTime">update_time,</if>
  70 + <if test="null!=signInEquipment">sign_in_equipment,</if>
  71 + <if test="null!=fleetName">fleet_name,</if>
  72 + </trim>
  73 + </sql>
  74 +
  75 + <sql id="insertSelectiveValue">
  76 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  77 + <if test="null!=id">#{id,jdbcType=INTEGER},</if>
  78 + <if test="null!=jobCode">#{jobCode,jdbcType=VARCHAR},</if>
  79 + <if test="null!=companyCode">#{companyCode,jdbcType=VARCHAR},</if>
  80 + <if test="null!=brancheCompanyCode">#{brancheCompanyCode,jdbcType=VARCHAR},</if>
  81 + <if test="null!=personnelName">#{personnelName,jdbcType=VARCHAR},</if>
  82 + <if test="null!=papersCode">#{papersCode,jdbcType=VARCHAR},</if>
  83 + <if test="null!=icCardCode">#{icCardCode,jdbcType=VARCHAR},</if>
  84 + <if test="null!=personnelType">#{personnelType,jdbcType=VARCHAR},</if>
  85 + <if test="null!=posts">#{posts,jdbcType=VARCHAR},</if>
  86 + <if test="null!=card">#{card,jdbcType=VARCHAR},</if>
  87 + <if test="null!=telphone">#{telphone,jdbcType=VARCHAR},</if>
  88 + <if test="null!=icRfid">#{icRfid,jdbcType=VARCHAR},</if>
  89 + <if test="null!=idRfid">#{idRfid,jdbcType=VARCHAR},</if>
  90 + <if test="null!=tagRfid">#{tagRfid,jdbcType=VARCHAR},</if>
  91 + <if test="null!=remark">#{remark,jdbcType=VARCHAR},</if>
  92 + <if test="null!=lineName">#{lineName,jdbcType=VARCHAR},</if>
  93 + <if test="null!=lineCode">#{lineCode,jdbcType=VARCHAR},</if>
  94 + <if test="null!=faceSignIn">#{faceSignIn,jdbcType=TINYINT},</if>
  95 + <if test="null!=image">#{image,jdbcType=VARCHAR},</if>
  96 + <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
  97 + <if test="null!=signInEquipment">#{signInEquipment,jdbcType=VARCHAR},</if>
  98 + <if test="null!=fleetName">#{fleetName,jdbcType=VARCHAR},</if>
  99 + </trim>
  100 + </sql>
  101 +
  102 + <sql id="updateByPrimaryKeySelectiveSql">
  103 + <set>
  104 + <if test="null!=id">id = #{id,jdbcType=INTEGER},</if>
  105 + <if test="null!=jobCode">job_code = #{jobCode,jdbcType=VARCHAR},</if>
  106 + <if test="null!=companyCode">company_code = #{companyCode,jdbcType=VARCHAR},</if>
  107 + <if test="null!=brancheCompanyCode">branche_company_code = #{brancheCompanyCode,jdbcType=VARCHAR},</if>
  108 + <if test="null!=personnelName">personnel_name = #{personnelName,jdbcType=VARCHAR},</if>
  109 + <if test="null!=papersCode">papers_code = #{papersCode,jdbcType=VARCHAR},</if>
  110 + <if test="null!=icCardCode">ic_card_code = #{icCardCode,jdbcType=VARCHAR},</if>
  111 + <if test="null!=personnelType">personnel_type = #{personnelType,jdbcType=VARCHAR},</if>
  112 + <if test="null!=posts">posts = #{posts,jdbcType=VARCHAR},</if>
  113 + <if test="null!=card">card = #{card,jdbcType=VARCHAR},</if>
  114 + <if test="null!=telphone">telphone = #{telphone,jdbcType=VARCHAR},</if>
  115 + <if test="null!=icRfid">ic_rfid = #{icRfid,jdbcType=VARCHAR},</if>
  116 + <if test="null!=idRfid">id_rfid = #{idRfid,jdbcType=VARCHAR},</if>
  117 + <if test="null!=tagRfid">tag_rfid = #{tagRfid,jdbcType=VARCHAR},</if>
  118 + <if test="null!=remark">remark = #{remark,jdbcType=VARCHAR},</if>
  119 + <if test="null!=lineName">line_name = #{lineName,jdbcType=VARCHAR},</if>
  120 + <if test="null!=lineCode">line_code = #{lineCode,jdbcType=VARCHAR},</if>
  121 + <if test="null!=faceSignIn">face_sign_in = #{faceSignIn,jdbcType=TINYINT},</if>
  122 + <if test="null!=image">image = #{image,jdbcType=VARCHAR},</if>
  123 + <if test="null!=updateTime">update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
  124 + <if test="null!=signInEquipment">sign_in_equipment = #{signInEquipment,jdbcType=VARCHAR},</if>
  125 + <if test="null!=fleetName">fleet_name = #{fleetName,jdbcType=VARCHAR},</if>
  126 + </set>
  127 + </sql>
  128 +
  129 + <sql id="where">
  130 + <if test="null!=id">AND id = #{id,jdbcType=INTEGER},</if>
  131 + <if test="null!=jobCode">AND job_code = #{jobCode,jdbcType=VARCHAR},</if>
  132 + <if test="null!=companyCode">AND company_code = #{companyCode,jdbcType=VARCHAR},</if>
  133 + <if test="null!=brancheCompanyCode">AND branche_company_code = #{brancheCompanyCode,jdbcType=VARCHAR},</if>
  134 + <if test="null!=personnelName">AND personnel_name = #{personnelName,jdbcType=VARCHAR},</if>
  135 + <if test="null!=papersCode">AND papers_code = #{papersCode,jdbcType=VARCHAR},</if>
  136 + <if test="null!=icCardCode">AND ic_card_code = #{icCardCode,jdbcType=VARCHAR},</if>
  137 + <if test="null!=personnelType">AND personnel_type = #{personnelType,jdbcType=VARCHAR},</if>
  138 + <if test="null!=posts">AND posts = #{posts,jdbcType=VARCHAR},</if>
  139 + <if test="null!=card">AND card = #{card,jdbcType=VARCHAR},</if>
  140 + <if test="null!=telphone">AND telphone = #{telphone,jdbcType=VARCHAR},</if>
  141 + <if test="null!=icRfid">AND ic_rfid = #{icRfid,jdbcType=VARCHAR},</if>
  142 + <if test="null!=idRfid">AND id_rfid = #{idRfid,jdbcType=VARCHAR},</if>
  143 + <if test="null!=tagRfid">AND tag_rfid = #{tagRfid,jdbcType=VARCHAR},</if>
  144 + <if test="null!=remark">AND remark = #{remark,jdbcType=VARCHAR},</if>
  145 + <if test="null!=lineName">AND line_name = #{lineName,jdbcType=VARCHAR},</if>
  146 + <if test="null!=lineCode">AND line_code = #{lineCode,jdbcType=VARCHAR},</if>
  147 + <if test="null!=faceSignIn">AND face_sign_in = #{faceSignIn,jdbcType=TINYINT},</if>
  148 + <if test="null!=image">AND image = #{image,jdbcType=VARCHAR},</if>
  149 + <if test="null!=updateTime">AND update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
  150 + <if test="null!=signInEquipment">AND sign_in_equipment = #{signInEquipment,jdbcType=VARCHAR},</if>
  151 + <if test="null!=fleetName">AND fleet_name = #{fleetName,jdbcType=VARCHAR},</if>
  152 + </sql>
  153 +</mapper>
0 154 \ No newline at end of file
... ...
Bsth-admin/src/main/resources/mapper/driver/healthy/DriverHealthyMapper.xml
  View file @c43ba5a
... ... @@ -3,14 +3,14 @@
3 3 <mapper namespace="com.ruoyi.mapper.driver.healthy.DriverHealthyMapper">
4 4 <resultMap id="BaseResultMap" type="com.ruoyi.domain.driver.healthy.DriverHealthy">
5 5 <id column="id" jdbcType="BIGINT" property="id"/>
6   - <result column="driver_id" jdbcType="VARCHAR" property="driverId"/>
  6 + <result column="driver_id" property="driverId"/>
7 7 <result column="systolic_Pressure" jdbcType="DECIMAL" property="systolicPressure"/>
8 8 <result column="diastolic_Pressure" jdbcType="DECIMAL" property="diastolicPressure"/>
9 9 <result column="Oxygen_Value" jdbcType="DECIMAL" property="oxygenValue"/>
10 10 <result column="heart_Rate" jdbcType="DECIMAL" property="heartRate"/>
11   - <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
  11 + <result column="create_by" property="createBy"/>
12 12 <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
13   - <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
  13 + <result column="update_by" property="updateBy"/>
14 14 <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
15 15 <result column="del_flag" jdbcType="BIT" property="delFlag"/>
16 16 </resultMap>
... ...