guzijian / bsth-alcohol-sign · Commits

Commit ee908e27642eaf5cc8b0f98f72fd6825c8c597b5

Authored by liujun001
1 parent f869756e

设备和场地

Inline Side-by-side
Showing 21 changed files with 338 additions and 96 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
  View file @ee908e2
... ... @@ -134,7 +134,9 @@ public class DssEquipmentController extends BaseController {
134 134 sysDictData.setStatus(Constants.ENABLE_STR);
135 135  
136 136 List<SysDictData> list = sysDictDataService.queryDictDateList(sysDictData, keys);
137   - EquipmentConfigVo configVo = combitionEquipmentConfigVo(list);
  137 + Equipment equipment = equipmentService.getOneByDeviceId(device);
  138 +
  139 + EquipmentConfigVo configVo = combitionEquipmentConfigVo(list,equipment);
138 140 return ResponseResult.success(configVo);
139 141 }
140 142  
... ... @@ -179,7 +181,7 @@ public class DssEquipmentController extends BaseController {
179 181 return heartbeat;
180 182 }
181 183  
182   - private EquipmentConfigVo combitionEquipmentConfigVo(List<SysDictData> sysDictDatas) {
  184 + private EquipmentConfigVo combitionEquipmentConfigVo(List<SysDictData> sysDictDatas, Equipment equipment) {
183 185 if (CollectionUtils.isEmpty(sysDictDatas)) {
184 186 return null;
185 187 }
... ... @@ -198,15 +200,15 @@ public class DssEquipmentController extends BaseController {
198 200 } else if (StringUtils.equals(sysDictData.getDiscKey(), "timespan")) {
199 201 equimentVideoParamVo.setTimespan(Convert.toInt(sysDictData.getDictValue()));
200 202 } else if (StringUtils.equals(sysDictData.getDiscKey(), "url")) {
201   - equimentVideoParamVo.setUrl(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
  203 + equimentVideoParamVo.setUrl(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
202 204 } else if (StringUtils.equals(sysDictData.getDiscKey(), "saveday")) {
203 205 equimentVideoParamVo.setSaveday(Convert.toInt(sysDictData.getDictValue()));
204 206 } else if (StringUtils.equals(sysDictData.getDiscKey(), "videoTimeSlot")) {
205   - equimentVideoParamVo.setVideoTimeSlot(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
  207 + equimentVideoParamVo.setVideoTimeSlot(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
206 208 }
207 209 } else if (Objects.equals(sysDictData.getDictType(), "addressParam") && Objects.nonNull(sysDictData.getDictValue())) {
208 210 if (StringUtils.equals(sysDictData.getDiscKey(), "upgradeAddress")) {
209   - equimentAddressParamVo.setUpgradeAddress(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
  211 + equimentAddressParamVo.setUpgradeAddress(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
210 212 } else if (StringUtils.equals(sysDictData.getDiscKey(), "integer")) {
211 213 equimentAddressParamVo.setInteger(Convert.toInt(sysDictData.getDictValue()));
212 214 }
... ... @@ -215,6 +217,10 @@ public class DssEquipmentController extends BaseController {
215 217  
216 218 configVo.setAddressParam(equimentAddressParamVo);
217 219 configVo.setVideoParam(equimentVideoParamVo);
  220 +
  221 + int moodCheck = Objects.isNull(equipment) ? null : StringUtils.endsWith(equipment.getPromise(), ",4") || StringUtils.startsWith(equipment.getPromise(), "4,")
  222 + || StringUtils.indexOf(equipment.getPromise(), ",4,") > -1 ? 1 : 0;
  223 + configVo.setMoodCheck(moodCheck);
218 224 return configVo;
219 225 }
220 226  
... ... @@ -223,8 +229,8 @@ public class DssEquipmentController extends BaseController {
223 229 BeanUtils.copyProperties(dto, selfCheck);
224 230 if (CollectionUtils.isNotEmpty(dto.getCameras())) {
225 231 selfCheck.setCameras(JSON.toJSONString(dto.getCameras()));
226   - Optional<EquipmentSelfcheckCamerasDto> optional = dto.getCameras().stream().filter(c->Objects.equals(c.getStatus(),1)).findFirst();
227   - selfCheck.setCamerasSaveExceptionFlag(optional.isPresent());
  232 + Optional<EquipmentSelfcheckCamerasDto> optional = dto.getCameras().stream().filter(c -> Objects.equals(c.getStatus(), 1)).findFirst();
  233 + selfCheck.setCamerasSaveExceptionFlag(optional.isPresent());
228 234 }
229 235  
230 236 return selfCheck;
... ...
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
  View file @ee908e2
1 1 package com.ruoyi.controller.dss;
2 2  
3 3  
  4 +import cn.hutool.core.convert.Convert;
4 5 import com.ruoyi.common.TipEnum;
5 6 import com.ruoyi.common.core.controller.BaseController;
6 7 import com.ruoyi.common.core.domain.ResponseResult;
... ... @@ -9,8 +10,10 @@ import com.ruoyi.domain.driver.dss.syn.DrivePosEnum;
9 10 import com.ruoyi.domain.driver.dss.syn.dto.DssDriveQueryDTO;
10 11 import com.ruoyi.domain.driver.dss.syn.res.dto.FaceCheckDTO;
11 12 import com.ruoyi.domain.driver.dss.syn.res.dto.FaceRegisterDTO;
  13 +import com.ruoyi.domain.driver.dss.syn.res.dto.ReqDataDTO;
12 14 import com.ruoyi.domain.driver.dss.syn.res.dto.ResDataDriveDTO;
13 15 import com.ruoyi.domain.driver.dss.syn.res.vo.FaceCheckVo;
  16 +import com.ruoyi.domain.driver.dss.syn.res.vo.ReqDataVo;
14 17 import com.ruoyi.domain.driver.dss.syn.vo.DssDriveVo;
15 18 import com.ruoyi.service.driver.NewDriverService;
16 19 import com.ruoyi.service.dss.FaceService;
... ... @@ -18,6 +21,7 @@ import io.swagger.annotations.Api;
18 21 import io.swagger.annotations.ApiOperation;
19 22 import lombok.extern.slf4j.Slf4j;
20 23 import org.apache.commons.collections4.CollectionUtils;
  24 +import org.apache.commons.lang3.StringUtils;
21 25 import org.springframework.beans.factory.annotation.Autowired;
22 26 import org.springframework.validation.BindingResult;
23 27 import org.springframework.web.bind.annotation.PostMapping;
... ... @@ -36,7 +40,7 @@ import java.util.stream.Collectors;
36 40  
37 41 @Slf4j
38 42 @RestController
39   -@RequestMapping("/dss/Driver")
  43 +@RequestMapping("/dss")
40 44 @Api(tags = "【蓝斯一期】人脸信息")
41 45 public class DssFaceController extends BaseController {
42 46  
... ... @@ -45,7 +49,19 @@ public class DssFaceController extends BaseController {
45 49 @Autowired
46 50 private FaceService faceService;
47 51  
48   - @PostMapping("/syn/reqData")
  52 + @ApiOperation(value = "05.终端同步人脸数据")
  53 + @PostMapping(value = "/face/syn/reqData")
  54 + public ResponseResult<List<ReqDataVo>> reqData(@Valid @RequestBody ReqDataDTO dto, BindingResult bindingResult) {
  55 + if (bindingResult.hasErrors()) {
  56 + return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
  57 + }
  58 +
  59 + List<NewDriver> drivers = newDriverService.list();
  60 + List<ReqDataVo> vos = convertReqDataVo(drivers);
  61 + return ResponseResult.success(vos);
  62 + }
  63 +
  64 + @PostMapping("/Driver/syn/reqData")
49 65 @ApiOperation("获取数据库人员信息")
50 66 public List<DssDriveVo> queryDriver(@Valid @RequestBody DssDriveQueryDTO dto, BindingResult bindingResult) {
51 67  
... ... @@ -54,29 +70,29 @@ public class DssFaceController extends BaseController {
54 70 }
55 71  
56 72 @ApiOperation("终端同步人脸数据结果上报")
57   - @PostMapping(value = "/syn/resData")
  73 + @PostMapping(value = "/face/syn/resData")
58 74 public ResponseResult<Object> insertDriver(@Valid @RequestBody ResDataDriveDTO dto, BindingResult bindingResult) {
59 75 if (bindingResult.hasErrors()) {
60 76 return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
61 77 }
62 78 NewDriver newDriver = convertNewDriver(dto);
63 79 TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
64   - return new ResponseResult<>(errorTipEnum.getCode(),errorTipEnum.getMsg());
  80 + return new ResponseResult<>(errorTipEnum.getCode(), errorTipEnum.getMsg());
65 81 }
66 82  
67 83 @ApiOperation(("人脸注册"))
68   - @PostMapping(value = "FaceRegister")
  84 + @PostMapping(value = "/Driver/FaceRegister")
69 85 public ResponseResult<Object> faceRegister(@Valid @RequestBody FaceRegisterDTO dto, BindingResult bindingResult) {
70 86 if (bindingResult.hasErrors()) {
71 87 return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
72 88 }
73 89 NewDriver newDriver = convertFaceRegister(dto);
74 90 TipEnum errorTipEnum = newDriverService.faceRegister(newDriver);
75   - return new ResponseResult<>(errorTipEnum.getCode(),errorTipEnum.getMsg());
  91 + return new ResponseResult<>(errorTipEnum.getCode(), errorTipEnum.getMsg());
76 92 }
77 93  
78 94 @ApiOperation("人脸校验")
79   - @PostMapping(value = "FaceCheck")
  95 + @PostMapping(value = "/Driver/FaceCheck")
80 96 public ResponseResult<FaceCheckVo> faceCheck(@Valid @RequestBody FaceCheckDTO dto, BindingResult bindingResult) {
81 97 if (bindingResult.hasErrors()) {
82 98 return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
... ... @@ -118,8 +134,8 @@ public class DssFaceController extends BaseController {
118 134 private NewDriver convertNewDriver(ResDataDriveDTO dto) {
119 135 NewDriver newDriver = new NewDriver();
120 136 newDriver.setJobCode(dto.getStaffId());
121   -// newDriver.setPersonnelName(dto.getStaffName());
122   -// newDriver.setIcCardCode(dto.getIcCardNo());
  137 + newDriver.setPersonnelName(dto.getStaffName());
  138 + newDriver.setIcCardCode(dto.getIcCardNo());
123 139 newDriver.setImage(dto.getFacePhotoPath());
124 140 newDriver.setFaceFeature(dto.getFaceFeature());
125 141 newDriver.setBlueTooth(dto.getBlueTooth());
... ... @@ -127,7 +143,7 @@ public class DssFaceController extends BaseController {
127 143 newDriver.setSyncontent((dto.getSynContent()));
128 144 newDriver.setCsn(dto.getCsn());
129 145  
130   - return null;
  146 + return newDriver;
131 147 }
132 148  
133 149 private NewDriver convertFaceRegister(FaceRegisterDTO dto) {
... ... @@ -153,6 +169,100 @@ public class DssFaceController extends BaseController {
153 169 return faceCheckVo;
154 170 }
155 171  
  172 + private List<ReqDataVo> convertReqDataVo(List<NewDriver> drivers){
  173 + if(CollectionUtils.isEmpty(drivers)){
  174 + return Collections.emptyList();
  175 + }
  176 + return drivers.stream().map(d->{
  177 + ReqDataVo vo = new ReqDataVo();
  178 + vo.setVersionNo(Convert.toStr(d.getImageVersion()));
  179 + vo.setStaffId(Convert.toStr(d.getId()));
  180 + vo.setStaffName(d.getPersonnelName());
  181 + vo.setIcCardNo(d.getIcCardCode());
  182 + vo.setFacePhotoPath(d.getImage());
  183 + vo.setFaceFeature(vo.getFaceFeature());
  184 + vo.setStaffCode(d.getJobCode());
  185 +// vo.setSynState(d.getS)
  186 + vo.setSynContent(d.getSyncontent());
  187 +
  188 + vo.setStaffTypeItem(switchPostion(d.getPosts()));
  189 +
  190 + return vo;
  191 + }).collect(Collectors.toList());
  192 + }
  193 +
  194 + private Set<Integer> switchPostion(String post){
  195 +
  196 + Set<Integer> postSet = new LinkedHashSet<>();
  197 + if(StringUtils.indexOf(post,"驾驶员") > -1){
  198 + postSet.add(2);
  199 + }
  200 +
  201 + if(StringUtils.indexOf(post,"集调中心") > -1){
  202 + postSet.add(3);
  203 + }
  204 +
  205 + if(StringUtils.indexOf(post,"稽查") > -1){
  206 + postSet.add(3);
  207 + }
  208 +
  209 + if(StringUtils.indexOf(post,"行管员") > -1){
  210 + postSet.add(3);
  211 + }
  212 +
  213 + if(StringUtils.indexOf(post,"副队长") > -1){
  214 + postSet.add(3);
  215 + }
  216 +
  217 + if(StringUtils.indexOf(post,"调度") > -1){
  218 + postSet.add(3);
  219 + }
  220 +
  221 + if(StringUtils.indexOf(post,"科员") > -1){
  222 + postSet.add(3);
  223 + }
  224 +
  225 + if(StringUtils.indexOf(post,"队长") > -1){
  226 + postSet.add(3);
  227 + }
  228 +
  229 + if(StringUtils.indexOf(post,"车队支部书记") > -1){
  230 + postSet.add(3);
  231 + }
  232 +
  233 +
  234 + if(StringUtils.indexOf(post,"部门副经理") > -1){
  235 + postSet.add(3);
  236 + }
  237 +
  238 + if(StringUtils.indexOf(post,"副总经理") > -1){
  239 + postSet.add(3);
  240 + }
  241 +
  242 +
  243 + if(StringUtils.indexOf(post,"部门经理") > -1){
  244 + postSet.add(3);
  245 + }
  246 +
  247 + if(StringUtils.indexOf(post,"办公室主任") > -1){
  248 + postSet.add(3);
  249 + }
  250 +
  251 + if(StringUtils.indexOf(post,"办公室副主任") > -1){
  252 + postSet.add(3);
  253 + }
  254 +
  255 + if(StringUtils.indexOf(post,"工会副主席") > -1){
  256 + postSet.add(3);
  257 + }
  258 +
  259 +
  260 + if(CollectionUtils.isEmpty(postSet)){
  261 + postSet.add(1);
  262 + }
  263 +
  264 + return postSet;
  265 + }
156 266  
157 267  
158 268 }
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java
  View file @ee908e2
... ... @@ -18,101 +18,98 @@ import lombok.extern.slf4j.Slf4j;
18 18 public class NewDriver {
19 19 /***主键*/
20 20 @Excel(name = "主键")
21   - private Integer id;
  21 + private java.lang.Integer id;
22 22  
23 23  
24 24 /***工号*/
25 25 @TableId(value = "job_code", type = IdType.AUTO)
26 26 @Excel(name = "工号")
27   - private String jobCode;
  27 + private java.lang.String jobCode;
28 28  
29 29  
30 30 /***公司编码*/
31 31 @Excel(name = "公司编码")
32   - private String companyCode;
  32 + private java.lang.String companyCode;
33 33  
34 34  
35 35 /***分公司编码*/
36 36 @Excel(name = "分公司编码")
37   - private String brancheCompanyCode;
  37 + private java.lang.String brancheCompanyCode;
38 38  
39 39  
40 40 /***姓名*/
41 41 @Excel(name = "姓名")
42   - private String personnelName;
  42 + private java.lang.String personnelName;
43 43  
44 44  
45 45 /***运营服务证书号*/
46 46 @Excel(name = "运营服务证书号")
47   - private String papersCode;
  47 + private java.lang.String papersCode;
48 48  
49 49  
50 50 /***一卡通工作卡号*/
51 51 @Excel(name = "一卡通工作卡号")
52   - private String icCardCode;
  52 + private java.lang.String icCardCode;
53 53  
54 54  
55 55 /***性别*/
56 56 @Excel(name = "性别")
57   - private String personnelType;
  57 + private java.lang.String personnelType;
58 58  
59 59  
60 60 /***所属岗位/工种*/
61 61 @Excel(name = "所属岗位/工种")
62   - private String posts;
  62 + private java.lang.String posts;
63 63  
64 64  
65 65 /***身份证*/
66 66 @Excel(name = "身份证")
67   - private String card;
  67 + private java.lang.String card;
68 68  
69 69  
70 70 /***联系电话*/
71 71 @Excel(name = "联系电话")
72   - private String telphone;
  72 + private java.lang.String telphone;
73 73  
74 74  
75 75 /***RFID 人卡IC号*/
76 76 @Excel(name = "RFID 人卡IC号")
77   - private String icRfid;
  77 + private java.lang.String icRfid;
78 78  
79 79  
80 80 /***RFID 人卡ID号（10进制）*/
81 81 @Excel(name = "RFID 人卡ID号（10进制）")
82   - private String idRfid;
  82 + private java.lang.String idRfid;
83 83  
84 84  
85 85 /***RFID 标签号*/
86 86 @Excel(name = "RFID 标签号")
87   - private String tagRfid;
  87 + private java.lang.String tagRfid;
88 88  
89 89  
90 90 /***备注*/
91 91 @Excel(name = "备注")
92   - private String remark;
  92 + private java.lang.String remark;
93 93  
94 94  
95 95 /***线路名称*/
96 96 @Excel(name = "线路名称")
97   - private String lineName;
  97 + private java.lang.String lineName;
98 98  
99 99  
100 100 /***线路编码*/
101 101 @Excel(name = "线路编码")
102   - private String lineCode;
  102 + private java.lang.String lineCode;
103 103  
104 104  
105 105 /***是否进行人脸注册 1 注册 2 未注册*/
106 106 @Excel(name = "是否进行人脸注册 1 注册 2 未注册")
107   - private Integer faceSignIn;
  107 + private java.lang.Integer faceSignIn;
108 108  
109 109  
110 110 /***头像*/
111 111 @Excel(name = "头像")
112   - private String image;
113   -
114   - @TableField(exist = false)
115   - private float imageScore;
  112 + private java.lang.String image;
116 113  
117 114  
118 115 /***更新日期*/
... ... @@ -122,12 +119,12 @@ public class NewDriver {
122 119  
123 120 /***注册设备列表*/
124 121 @Excel(name = "注册设备列表")
125   - private String signInEquipment;
  122 + private java.lang.String signInEquipment;
126 123  
127 124  
128 125 /***车队名称*/
129 126 @Excel(name = "车队名称")
130   - private String fleetName;
  127 + private java.lang.String fleetName;
131 128  
132 129  
133 130 /***人脸识别特征*/
... ... @@ -142,6 +139,7 @@ public class NewDriver {
142 139  
143 140 /***同步结果状态;0成功，1失败*/
144 141 @Excel(name = "同步结果状态;0成功，1失败")
  142 + @TableField(value = "`integer`")
145 143 private java.lang.Integer integer;
146 144  
147 145  
... ... @@ -155,6 +153,14 @@ public class NewDriver {
155 153 private java.lang.String csn;
156 154  
157 155  
  156 + /***图片版本号*/
  157 + @Excel(name = "图片版本号")
  158 + private java.lang.Integer imageVersion;
  159 +
  160 + @TableField(exist = false)
  161 + private float imageScore;
  162 +
  163 +
158 164 @Override
159 165 public String toString() {
160 166 return com.alibaba.fastjson2.JSON.toJSONString(this);
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/dto/LoginDriverDTO.java
  View file @ee908e2
... ... @@ -8,7 +8,7 @@ import lombok.Data;
8 8 import lombok.EqualsAndHashCode;
9 9 import lombok.experimental.Accessors;
10 10  
11   -import javax.validation.constraints.NotNull;
  11 +import javax.validation.constraints.NotEmpty;
12 12 import java.util.Date;
13 13  
14 14 /**
... ... @@ -22,15 +22,15 @@ import java.util.Date;
22 22 public class LoginDriverDTO implements java.io.Serializable {
23 23  
24 24 private static final long serialVersionUID = -1677262685203673206L;
25   - @NotNull(message = "设备上线号不能为空")
  25 + @NotEmpty(message = "设备上线号不能为空")
26 26 @ApiModelProperty(value = "设备上线号", required = true)
27 27 private String device;
28 28  
29   - @NotNull(message = "登录校验类型不能为空")
  29 + @NotEmpty(message = "登录校验类型不能为空")
30 30 @ApiModelProperty(value = "登录校验类型;0:卡号登录，1:人脸登录", required = true)
31 31 private String authType;
32 32  
33   - @NotNull(message = "登录校验信息 不能为空")
  33 + @NotEmpty(message = "登录校验信息 不能为空")
34 34 @ApiModelProperty(value = "登录校验类型; 登录校验信息 卡号或人脸图片数据，图片数据格式为BASE64", required = true)
35 35 private String authValue;
36 36  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/FaceRegisterDTO.java
  View file @ee908e2
... ... @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
10 10 import lombok.NoArgsConstructor;
11 11 import lombok.experimental.Accessors;
12 12  
13   -import javax.validation.constraints.NotNull;
  13 +import javax.validation.constraints.NotEmpty;
14 14 import java.util.Date;
15 15  
16 16 /**
... ... @@ -26,17 +26,17 @@ import java.util.Date;
26 26 public class FaceRegisterDTO implements java.io.Serializable {
27 27  
28 28 private static final long serialVersionUID = 228485023686482474L;
29   - @NotNull(message = "设备上线号 不能为空")
  29 + @NotEmpty(message = "设备上线号 不能为空")
30 30 @ApiModelProperty(value = "设备上线号", required = true)
31 31 private String device;
32   - @NotNull(message = "IC卡号 不能为空")
  32 + @NotEmpty(message = "IC卡号 不能为空")
33 33 @ApiModelProperty(value = "IC卡号", required = true)
34 34 private String driverCode;
35 35  
36 36 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
37 37 @ApiModelProperty(value = "时间")
38 38 private Date regTime;
39   - @NotNull(message = "人脸图片数据 不能为空")
  39 + @NotEmpty(message = "人脸图片数据 不能为空")
40 40 @ApiModelProperty(value = "人脸图片数据", required = true)
41 41 private String faceValue;
42 42  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/ReqDataDTO.java 0 → 100644
  View file @ee908e2
  1 +package com.ruoyi.domain.driver.dss.syn.res.dto;
  2 +
  3 +import com.alibaba.fastjson2.JSON;
  4 +import io.swagger.annotations.ApiModel;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +import lombok.AllArgsConstructor;
  7 +import lombok.Data;
  8 +import lombok.EqualsAndHashCode;
  9 +import lombok.NoArgsConstructor;
  10 +import lombok.experimental.Accessors;
  11 +
  12 +import javax.validation.constraints.NotEmpty;
  13 +
  14 +/**
  15 + * @author liujun
  16 + * @date 2024年07月29日 16:56
  17 + */
  18 +@Data
  19 +@NoArgsConstructor
  20 +@AllArgsConstructor
  21 +@Accessors(chain = true)
  22 +@ApiModel(value = "终端同步人脸数据 DTO")
  23 +@EqualsAndHashCode(callSuper = false)
  24 +public class ReqDataDTO implements java.io.Serializable {
  25 +
  26 + private static final long serialVersionUID = 7218144455404373395L;
  27 +
  28 + @NotEmpty(message = "设备号不能为空")
  29 + @ApiModelProperty(value = "设备上线号", required = true)
  30 + private String device;
  31 + @NotEmpty(message = "设备ID不能为空")
  32 + @ApiModelProperty(value = "设备ID", required = true)
  33 + private String deviceId;
  34 + @ApiModelProperty(value = "终端人脸数据版本 null终端无记录", required = true)
  35 + private String versionNo;
  36 +
  37 + @Override
  38 + public String toString() {
  39 + return JSON.toJSONString(this);
  40 + }
  41 +}
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/ResDataDriveDTO.java
  View file @ee908e2
... ... @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
9 9 import lombok.NoArgsConstructor;
10 10 import lombok.experimental.Accessors;
11 11  
  12 +import javax.validation.constraints.NotEmpty;
12 13 import javax.validation.constraints.NotNull;
13 14 import java.util.Set;
14 15  
... ... @@ -25,19 +26,19 @@ import java.util.Set;
25 26 public class ResDataDriveDTO implements java.io.Serializable {
26 27  
27 28 private static final long serialVersionUID = -815323242596921313L;
28   - @NotNull(message = "服务器人脸信息版本号不能为空")
  29 + @NotEmpty(message = "服务器人脸信息版本号不能为空")
29 30 @ApiModelProperty(value = "服务器人脸信息版本号", required = true)
30 31 private String versionNo;
31 32  
32   - @NotNull(message = "设备上线号不能为空")
  33 + @NotEmpty(message = "设备上线号不能为空")
33 34 @ApiModelProperty(value = "设备上线号", required = true)
34 35 private String device;
35 36  
36   - @NotNull(message = "设备ID不能为空")
  37 + @NotEmpty(message = "设备ID不能为空")
37 38 @ApiModelProperty(value = "设备ID", required = true)
38 39 private String deviceId;
39 40  
40   - @NotNull(message = "员工id不能为空")
  41 + @NotEmpty(message = "员工id不能为空")
41 42 @ApiModelProperty(value = "员工id", required = true)
42 43 private String staffId;
43 44 @ApiModelProperty(value = "员工姓名")
... ... @@ -57,11 +58,11 @@ public class ResDataDriveDTO implements java.io.Serializable {
57 58 @ApiModelProperty(value = "同步结果状态;0成功，1失败", required = true, example = "1")
58 59 private Integer integer;
59 60  
60   - @NotNull(message = "同步内容不能为空")
  61 + @NotEmpty(message = "同步内容不能为空")
61 62 @ApiModelProperty(value = "同步内容", required = true)
62 63 private String synContent;
63 64  
64   - @NotNull(message = "物理卡号不能为空")
  65 + @NotEmpty(message = "物理卡号不能为空")
65 66 @ApiModelProperty(value = "物理卡号", required = true)
66 67 private String csn;
67 68  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/vo/ReqDataVo.java 0 → 100644
  View file @ee908e2
  1 +package com.ruoyi.domain.driver.dss.syn.res.vo;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +import lombok.AllArgsConstructor;
  6 +import lombok.Data;
  7 +import lombok.EqualsAndHashCode;
  8 +import lombok.NoArgsConstructor;
  9 +import lombok.experimental.Accessors;
  10 +
  11 +import java.util.Set;
  12 +
  13 +/**
  14 + * @author liujun
  15 + * @date 2024年07月29日 17:01
  16 + */
  17 +@Data
  18 +@NoArgsConstructor
  19 +@AllArgsConstructor
  20 +@Accessors(chain = true)
  21 +@ApiModel(value = "终端同步人脸数据 Vo")
  22 +@EqualsAndHashCode(callSuper = false)
  23 +public class ReqDataVo implements java.io.Serializable {
  24 +
  25 + private static final long serialVersionUID = -4791224929481921281L;
  26 + @ApiModelProperty(value = "服务器人脸信息版本号")
  27 + private String versionNo;
  28 + @ApiModelProperty(value = "员工id")
  29 + private String staffId;
  30 + @ApiModelProperty(value = "员工姓名")
  31 + private String staffName;
  32 + @ApiModelProperty(value = "IC卡号")
  33 + private String icCardNo;
  34 + @ApiModelProperty(value = "原始图片地址")
  35 + private String facePhotoPath;
  36 + @ApiModelProperty(value = "解析后的访问图片地址")
  37 + private String cropFacePhotoUrl;
  38 + @ApiModelProperty(value = "人脸识别特征值")
  39 + private String faceFeature;
  40 + @ApiModelProperty(value = "手环mac地址")
  41 + private String blueTooth;
  42 + @ApiModelProperty(value = "工号")
  43 + private String staffCode;
  44 + @ApiModelProperty(value = "同步状态")
  45 + private Integer synState;
  46 + @ApiModelProperty(value = "同步内容")
  47 + private String synContent;
  48 + @ApiModelProperty(value = "物理卡号")
  49 + private String csn;
  50 + @ApiModelProperty(value = "角色类型 1:员工 2:驾驶员 3管理员 4移车员")
  51 + private Set<Integer> staffTypeItem;
  52 +}
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/car/info/dto/GetPlatesDTO.java
  View file @ee908e2
... ... @@ -7,7 +7,7 @@ import lombok.Data;
7 7 import lombok.EqualsAndHashCode;
8 8 import lombok.experimental.Accessors;
9 9  
10   -import javax.validation.constraints.NotNull;
  10 +import javax.validation.constraints.NotEmpty;
11 11  
12 12 /**
13 13 * @author liujun
... ... @@ -25,7 +25,7 @@ public class GetPlatesDTO implements java.io.Serializable {
25 25 @ApiModelProperty(value = "模糊查询参数，null返回data=nul")
26 26 private String plate;
27 27  
28   - @NotNull(message = "设备上线号不能为空")
  28 + @NotEmpty(message = "设备上线号不能为空")
29 29 @ApiModelProperty(value = "设备上线号", required = true)
30 30 private String device;
31 31  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/EquipmentAuthDTO.java
  View file @ee908e2
... ... @@ -7,7 +7,7 @@ import lombok.Data;
7 7 import lombok.EqualsAndHashCode;
8 8 import lombok.experimental.Accessors;
9 9  
10   -import javax.validation.constraints.NotNull;
  10 +import javax.validation.constraints.NotEmpty;
11 11 import java.util.Date;
12 12  
13 13 /**
... ... @@ -19,7 +19,8 @@ import java.util.Date;
19 19 @Accessors(chain = true)
20 20 @EqualsAndHashCode(callSuper = false)
21 21 public class EquipmentAuthDTO {
22   - @NotNull(message = "设备号不能为空")
  22 +
  23 + @NotEmpty(message = "设备号不能为空")
23 24 @ApiModelProperty(value = "设备上线号", required = true)
24 25 private String device;
25 26 @ApiModelProperty(value = "获取token设备时间", required = true)
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/EquipmentSelfcheckDto.java
  View file @ee908e2
... ... @@ -9,6 +9,7 @@ import lombok.Data;
9 9 import lombok.EqualsAndHashCode;
10 10 import lombok.experimental.Accessors;
11 11  
  12 +import javax.validation.constraints.NotEmpty;
12 13 import javax.validation.constraints.NotNull;
13 14 import java.util.Date;
14 15 import java.util.List;
... ... @@ -25,11 +26,11 @@ public class EquipmentSelfcheckDto implements java.io.Serializable {
25 26  
26 27 private static final long serialVersionUID = 1874941263694729359L;
27 28  
28   - @NotNull(message = "设备上线号不能为空")
  29 + @NotEmpty(message = "设备上线号不能为空")
29 30 @ApiModelProperty(value = "设备上线号", required = true)
30 31 private String device;
31 32  
32   - @NotNull(message = "设备应用版本号不能为空")
  33 + @NotEmpty(message = "设备应用版本号不能为空")
33 34 @ApiModelProperty(value = "设备应用版本号", required = true)
34 35 @JsonProperty("app_version")
35 36 private String appVersion;
... ... @@ -58,7 +59,7 @@ public class EquipmentSelfcheckDto implements java.io.Serializable {
58 59 private Date time;
59 60  
60 61 @ApiModelProperty(value = "设备类型")
61   - private String deviceTyp;
  62 + private String deviceType;
62 63  
63 64 @ApiModelProperty(value = "是否拥有钥匙柜外设:null/0:否，1:是", example = "1")
64 65 private Integer isKeybox;
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/ExKeysDTO.java
  View file @ee908e2
... ... @@ -7,6 +7,7 @@ import lombok.Data;
7 7 import lombok.EqualsAndHashCode;
8 8 import lombok.experimental.Accessors;
9 9  
  10 +import javax.validation.constraints.NotEmpty;
10 11 import javax.validation.constraints.NotNull;
11 12  
12 13 /**
... ... @@ -20,7 +21,7 @@ import javax.validation.constraints.NotNull;
20 21 public class ExKeysDTO implements java.io.Serializable {
21 22  
22 23 private static final long serialVersionUID = -6900289229012374739L;
23   - @NotNull(message = "设备号不能为空")
  24 + @NotEmpty(message = "设备号不能为空")
24 25 @ApiModelProperty(value = "设备上线号", required = true)
25 26 private String device;
26 27 @NotNull(message = "钥匙位号不能为空")
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/HeartbeatDTO.java
  View file @ee908e2
... ... @@ -8,6 +8,7 @@ import lombok.Data;
8 8 import lombok.EqualsAndHashCode;
9 9 import lombok.experimental.Accessors;
10 10  
  11 +import javax.validation.constraints.NotEmpty;
11 12 import javax.validation.constraints.NotNull;
12 13 import java.util.Date;
13 14 import java.util.List;
... ... @@ -25,7 +26,7 @@ public class HeartbeatDTO implements java.io.Serializable {
25 26  
26 27 private static final long serialVersionUID = 5168784920496912635L;
27 28  
28   - @NotNull(message = "设备号不能为空")
  29 + @NotEmpty(message = "设备号不能为空")
29 30 @ApiModelProperty(value = "设备上线号", required = true)
30 31 private String device;
31 32  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/vo/EquipmentConfigVo.java
  View file @ee908e2
... ... @@ -24,8 +24,22 @@ import java.math.BigDecimal;
24 24 public class EquipmentConfigVo implements java.io.Serializable {
25 25  
26 26 private static final long serialVersionUID = -3893021736941993364L;
  27 + @ApiModelProperty(value = "是否开启")
27 28 private Integer promiseSwitch;
28 29  
  30 + @ApiModelProperty(value = "是否开启健康检测 0：不开启 1：开启",example = "1")
  31 + private Integer healthCheck;
  32 +
  33 + @ApiModelProperty(value = "是否开启情绪检测 0：不开启 1：开启",example = "1")
  34 + private Integer moodCheck;
  35 +
  36 + @ApiModelProperty(value = "是否开启安全考试 0：不开启 1：开启",example = "1")
  37 + private Integer safetyExam;
  38 +
  39 + @ApiModelProperty(value = "开启体温检测 0：不开启 1：开启",example = "1")
  40 + private Integer temperatureSwitch;
  41 +
  42 +
29 43 @ApiModelProperty(value = "饮酒限制值")
30 44 private BigDecimal drinking;
31 45 @ApiModelProperty(value = "醉酒限制值")
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/location/dto/WorkPlateV2DTO.java
  View file @ee908e2
... ... @@ -8,6 +8,7 @@ import lombok.Data;
8 8 import lombok.EqualsAndHashCode;
9 9 import lombok.experimental.Accessors;
10 10  
  11 +import javax.validation.constraints.NotEmpty;
11 12 import javax.validation.constraints.NotNull;
12 13 import java.util.Date;
13 14  
... ... @@ -20,16 +21,16 @@ import java.util.Date;
20 21 @Accessors(chain = true)
21 22 @EqualsAndHashCode(callSuper = false)
22 23 public class WorkPlateV2DTO {
23   - @NotNull(message = "设备上线号不能为空")
  24 + @NotEmpty(message = "设备上线号不能为空")
24 25 @ApiModelProperty(value = "设备上线号", required = true)
25 26 private String device;
26   - @NotNull(message = "设备类型不能为空")
  27 + @NotEmpty(message = "设备类型不能为空")
27 28 @ApiModelProperty(value = "设备类型上线号", required = true)
28 29 private String deviceType;
29   - @NotNull(message = "卡号不能为空")
  30 + @NotEmpty(message = "卡号不能为空")
30 31 @ApiModelProperty(value = "卡号", required = true)
31 32 private String driverCode;
32   - @NotNull(message = "工号不能为空")
  33 + @NotEmpty(message = "工号不能为空")
33 34 @ApiModelProperty(value = "工号", required = true)
34 35 private String staffCode;
35 36  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignDTO.java
  View file @ee908e2
... ... @@ -8,6 +8,7 @@ import lombok.Data;
8 8 import lombok.EqualsAndHashCode;
9 9 import lombok.experimental.Accessors;
10 10  
  11 +import javax.validation.constraints.NotEmpty;
11 12 import javax.validation.constraints.NotNull;
12 13 import java.math.BigDecimal;
13 14 import java.util.Date;
... ... @@ -21,19 +22,19 @@ import java.util.Date;
21 22 @Accessors(chain = true)
22 23 @EqualsAndHashCode(callSuper = false)
23 24 public class DssSignDTO {
24   - @NotNull(message = "设备上线号 不能为空")
  25 + @NotEmpty(message = "设备上线号 不能为空")
25 26 @ApiModelProperty(value = "设备上线号", required = true)
26 27 private String device;
27 28  
28   - @NotNull(message = "设备类型 不能为空")
  29 + @NotEmpty(message = "设备类型 不能为空")
29 30 @ApiModelProperty(value = "设备类型", required = true)
30 31 private String deviceType;
31 32  
32   - @NotNull(message = "司机卡号 不能为空")
  33 + @NotEmpty(message = "司机卡号 不能为空")
33 34 @ApiModelProperty(value = "司机卡号", required = true)
34 35 private String driverCode;
35 36  
36   - @NotNull(message = "司机工号 不能为空")
  37 + @NotEmpty(message = "司机工号 不能为空")
37 38 @ApiModelProperty(value = "司机工号", required = true)
38 39 private String staffCode;
39 40  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignOutDTO.java
  View file @ee908e2
... ... @@ -8,6 +8,7 @@ import lombok.Data;
8 8 import lombok.EqualsAndHashCode;
9 9 import lombok.experimental.Accessors;
10 10  
  11 +import javax.validation.constraints.NotEmpty;
11 12 import javax.validation.constraints.NotNull;
12 13 import java.util.Date;
13 14  
... ... @@ -24,10 +25,10 @@ public class DssSignOutDTO implements java.io.Serializable {
24 25  
25 26 private static final long serialVersionUID = 3995970715143952495L;
26 27  
27   - @NotNull(message = "签退设备上线号 不能为空")
  28 + @NotEmpty(message = "签退设备上线号 不能为空")
28 29 @ApiModelProperty(value = "设备上线号", required = true)
29 30 private String device;
30   - @NotNull(message = "签退卡号 不能为空")
  31 + @NotEmpty(message = "签退卡号 不能为空")
31 32 @ApiModelProperty(value = "卡号")
32 33 private String driverCode;
33 34  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/equipment/self/check/LingangEquimentSelfCheck.java
  View file @ee908e2
1 1 package com.ruoyi.domain.equipment.self.check;
2 2  
3   -import lombok.Data;
4 3 import com.baomidou.mybatisplus.annotation.IdType;
5 4 import com.baomidou.mybatisplus.annotation.TableField;
6 5 import com.baomidou.mybatisplus.annotation.TableId;
7 6 import com.baomidou.mybatisplus.annotation.TableName;
8   -import org.apache.commons.lang3.StringUtils;
  7 +import com.ruoyi.common.annotation.Excel;
  8 +import lombok.AllArgsConstructor;
  9 +import lombok.Data;
9 10 import lombok.EqualsAndHashCode;
  11 +import lombok.NoArgsConstructor;
10 12 import lombok.experimental.Accessors;
11 13 import lombok.extern.slf4j.Slf4j;
12   -import lombok.NoArgsConstructor;
13   -import lombok.AllArgsConstructor;
14   -import com.ruoyi.common.annotation.Excel;
15 14  
16 15  
17 16 @Data
... ... @@ -69,6 +68,7 @@ public class LingangEquimentSelfCheck {
69 68  
70 69 /***锁控状态 1正常，2故障，null/3未检测到*/
71 70 @Excel(name = "锁控状态 1正常，2故障，null/3未检测到")
  71 + @TableField(value = "`lock`")
72 72 private java.lang.Integer lock;
73 73  
74 74  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/box/dto/KeyBoxQueryDTO.java
  View file @ee908e2
... ... @@ -7,7 +7,7 @@ import lombok.Data;
7 7 import lombok.EqualsAndHashCode;
8 8 import lombok.experimental.Accessors;
9 9  
10   -import javax.validation.constraints.NotNull;
  10 +import javax.validation.constraints.NotEmpty;
11 11  
12 12 /**
13 13 * @author liujun
... ... @@ -20,27 +20,27 @@ import javax.validation.constraints.NotNull;
20 20 public class KeyBoxQueryDTO implements java.io.Serializable {
21 21  
22 22 private static final long serialVersionUID = -1865377310922939750L;
23   - @NotNull(message = "设备号 不能为空")
  23 + @NotEmpty(message = "设备号 不能为空")
24 24 @ApiModelProperty(value = "设备号", required = true)
25 25 private String device;
26 26  
27   - @NotNull(message = "设备类型 不能为空")
  27 + @NotEmpty(message = "设备类型 不能为空")
28 28 @ApiModelProperty(value = "设备类型", required = true)
29 29 private String deviceType;
30 30  
31   - @NotNull(message = " 司机卡号不能为空")
  31 + @NotEmpty(message = " 司机卡号不能为空")
32 32 @ApiModelProperty(value = "司机卡号", required = true)
33 33 private String driverCode;
34 34  
35   - @NotNull(message = "工号 不能为空")
  35 + @NotEmpty(message = "工号 不能为空")
36 36 @ApiModelProperty(value = "工号", required = true)
37 37 private String staffCode;
38 38  
39   - @NotNull(message = "时间 不能为空")
  39 + @NotEmpty(message = "时间 不能为空")
40 40 @ApiModelProperty(value = "时间", required = true)
41 41 private String time;
42 42  
43   - @NotNull(message = " 类型 不能为空")
  43 + @NotEmpty(message = " 类型 不能为空")
44 44 @ApiModelProperty(value = "类型：0签到上报获取，1签退归还获取", required = true)
45 45 private String eventType;
46 46  
... ...
Bsth-admin/src/main/java/com/ruoyi/expand/domain/DriverSchedulingExpand.java
  View file @ee908e2
1 1 package com.ruoyi.expand.domain;
2 2  
3   -import java.util.Date;
4 3 import com.fasterxml.jackson.annotation.JsonFormat;
5   -import lombok.ToString;
6   -import org.apache.commons.lang3.builder.ToStringBuilder;
7   -import org.apache.commons.lang3.builder.ToStringStyle;
8 4 import com.ruoyi.common.annotation.Excel;
9 5 import com.ruoyi.common.core.domain.BaseEntity;
  6 +import lombok.ToString;
10 7  
11 8 import javax.validation.constraints.NotBlank;
12 9 import javax.validation.constraints.NotNull;
  10 +import java.util.Date;
13 11  
14 12 /**
15 13 * 跟班设置对象 driver_scheduling_expand
... ...
Bsth-admin/src/main/resources/mapper/driver/NewDriverMapper.xml
  View file @ee908e2
... ... @@ -2,8 +2,8 @@
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="com.ruoyi.mapper.driver.NewDriverMapper">
4 4 <resultMap id="BaseResultMap" type="com.ruoyi.domain.driver.NewDriver">
5   - <id column="id" jdbcType="INTEGER" property="id"/>
6   - <result column="job_code" jdbcType="VARCHAR" property="jobCode"/>
  5 + <id column="job_code" jdbcType="VARCHAR" property="jobCode"/>
  6 + <result column="id" jdbcType="INTEGER" property="id"/>
7 7 <result column="company_code" jdbcType="VARCHAR" property="companyCode"/>
8 8 <result column="branche_company_code" jdbcType="VARCHAR" property="brancheCompanyCode"/>
9 9 <result column="personnel_name" jdbcType="VARCHAR" property="personnelName"/>
... ... @@ -29,22 +29,24 @@
29 29 <result column="integer" jdbcType="INTEGER" property="integer"/>
30 30 <result column="synContent" jdbcType="VARCHAR" property="syncontent"/>
31 31 <result column="csn" jdbcType="VARCHAR" property="csn"/>
  32 + <result column="image_version" jdbcType="INTEGER" property="imageVersion"/>
32 33 </resultMap>
33 34  
34 35 <insert id="insertSelective" keyColumn="job_code" keyProperty="jobCode" useGeneratedKeys="true"
35 36 parameterType="com.ruoyi.domain.driver.NewDriver">
36   - INSERT INTO driver <include refid="insertSelectiveColumn"></include>
  37 + INSERT INTO driver
  38 + <include refid="insertSelectiveColumn"></include>
37 39 <include refid="insertSelectiveValue"></include>
38 40 </insert>
39 41  
40 42 <sql id="columns">
41 43 id
42   - , 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 , face_Feature , blue_Tooth , integer , synContent , csn
  44 + , 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 , face_Feature , blue_Tooth , integer , synContent , csn , image_version
43 45 </sql>
44 46  
45 47 <sql id="insert_columns">
46 48 id
47   - , 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 , face_Feature , blue_Tooth , integer , synContent , csn
  49 + , 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 , face_Feature , blue_Tooth , integer , synContent , csn , image_version
48 50 </sql>
49 51  
50 52 <sql id="insert_values">
... ... @@ -75,7 +77,8 @@
75 77 #{blueTooth},
76 78 #{integer},
77 79 #{syncontent},
78   - #{csn}
  80 + #{csn},
  81 + #{imageVersion}
79 82 </sql>
80 83  
81 84 <sql id="insertSelectiveColumn">
... ... @@ -107,6 +110,7 @@
107 110 <if test="null!=integer">integer,</if>
108 111 <if test="null!=syncontent">synContent,</if>
109 112 <if test="null!=csn">csn,</if>
  113 + <if test="null!=imageVersion">image_version,</if>
110 114 </trim>
111 115 </sql>
112 116  
... ... @@ -139,6 +143,7 @@
139 143 <if test="null!=integer">#{integer,jdbcType=INTEGER},</if>
140 144 <if test="null!=syncontent">#{syncontent,jdbcType=VARCHAR},</if>
141 145 <if test="null!=csn">#{csn,jdbcType=VARCHAR},</if>
  146 + <if test="null!=imageVersion">#{imageVersion,jdbcType=INTEGER},</if>
142 147 </trim>
143 148 </sql>
144 149  
... ... @@ -171,6 +176,7 @@
171 176 <if test="null!=integer">integer = #{integer,jdbcType=INTEGER},</if>
172 177 <if test="null!=syncontent">synContent = #{syncontent,jdbcType=VARCHAR},</if>
173 178 <if test="null!=csn">csn = #{csn,jdbcType=VARCHAR},</if>
  179 + <if test="null!=imageVersion">image_version = #{imageVersion,jdbcType=INTEGER},</if>
174 180 </set>
175 181 </sql>
176 182  
... ... @@ -202,5 +208,6 @@
202 208 <if test="null!=integer">AND integer = #{integer,jdbcType=INTEGER},</if>
203 209 <if test="null!=syncontent">AND synContent = #{syncontent,jdbcType=VARCHAR},</if>
204 210 <if test="null!=csn">AND csn = #{csn,jdbcType=VARCHAR},</if>
  211 + <if test="null!=imageVersion">AND image_version = #{imageVersion,jdbcType=INTEGER},</if>
205 212 </sql>
206 213 </mapper>
207 214 \ No newline at end of file
... ...