guzijian / bsth-alcohol-sign · Commits

Commit 7c8996dabfcf9a5659eda0c8c4b409e3257dba20

Authored by guzijian
1 parent b0cc652f

fix: 修复更新人脸注册bug

Inline Side-by-side
Showing 4 changed files with 25 additions and 28 deletions
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ApplicationResponseVo.java
  View file @7c8996d
... ... @@ -54,7 +54,7 @@ public class ApplicationResponseVo {
54 54 this.apkUrl = apkUrl;
55 55 return this;
56 56 }
57   - public static ApplicationResponseVo applicationResponseVoBuild(){
  57 + public static ApplicationResponseVo ApplicationResponseVoBuild(){
58 58 return new ApplicationResponseVo();
59 59 }
60 60 }
... ...
ruoyi-admin/src/main/java/com/ruoyi/service/AppService.java
  View file @7c8996d
... ... @@ -15,7 +15,6 @@ import org.springframework.http.MediaType;
15 15 import org.springframework.stereotype.Service;
16 16 import org.springframework.web.multipart.MultipartFile;
17 17  
18   -import javax.servlet.ServletOutputStream;
19 18 import javax.servlet.http.HttpServletResponse;
20 19 import java.io.*;
21 20 import java.nio.file.Paths;
... ... @@ -40,10 +39,10 @@ public class AppService {
40 39 VersionUpgrade vu = versionUpgradeMapper.queryLatestVersionNum();
41 40 // 无需更新
42 41 if (!Objects.isNull(vu) && vu.getVersionCode().equals(versionNum)){
43   - return ApplicationResponseVo.applicationResponseVoBuild().appNoUpdate(versionNum);
  42 + return ApplicationResponseVo.ApplicationResponseVoBuild().appNoUpdate(versionNum);
44 43 }
45 44 // 更新判断
46   - return ApplicationResponseVo.applicationResponseVoBuild().appForceUpdate(vu.getVersionCode(),vu.getApkUrl());
  45 + return ApplicationResponseVo.ApplicationResponseVoBuild().appForceUpdate(vu.getVersionCode(),vu.getApkUrl());
47 46 }
48 47  
49 48 public void downloadApk(String url, HttpServletResponse response) throws IOException {
... ...
ruoyi-admin/src/main/java/com/ruoyi/upgrade/service/impl/VersionUpgradeServiceImpl.java
  View file @7c8996d
1 1 package com.ruoyi.upgrade.service.impl;
2 2  
3 3 import java.util.List;
  4 +
4 5 import com.ruoyi.common.utils.DateUtils;
5 6 import com.ruoyi.common.utils.SecurityUtils;
6 7 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -11,88 +12,85 @@ import com.ruoyi.upgrade.service.IVersionUpgradeService;
11 12  
12 13 /**
13 14 * upgradeService业务层处理
14   - *
  15 + *
15 16 * @author ruoyi
16 17 * @date 2023-07-18
17 18 */
18 19 @Service
19   -public class VersionUpgradeServiceImpl implements IVersionUpgradeService
20   -{
  20 +public class VersionUpgradeServiceImpl implements IVersionUpgradeService {
21 21 @Autowired
22 22 private VersionUpgradeMapper versionUpgradeMapper;
23 23  
24 24 /**
25 25 * 查询upgrade
26   - *
  26 + *
27 27 * @param id upgrade主键
28 28 * @return upgrade
29 29 */
30 30 @Override
31   - public VersionUpgrade selectVersionUpgradeById(String id)
32   - {
  31 + public VersionUpgrade selectVersionUpgradeById(String id) {
33 32 return versionUpgradeMapper.selectVersionUpgradeById(id);
34 33 }
35 34  
36 35 /**
37 36 * 查询upgrade列表
38   - *
  37 + *
39 38 * @param versionUpgrade upgrade
40 39 * @return upgrade
41 40 */
42 41 @Override
43   - public List<VersionUpgrade> selectVersionUpgradeList(VersionUpgrade versionUpgrade)
44   - {
  42 + public List<VersionUpgrade> selectVersionUpgradeList(VersionUpgrade versionUpgrade) {
45 43 return versionUpgradeMapper.selectVersionUpgradeList(versionUpgrade);
46 44 }
47 45  
48 46 /**
49 47 * 新增upgrade
50   - *
  48 + *
51 49 * @param versionUpgrade upgrade
52 50 * @return 结果
53 51 */
54 52 @Override
55   - public int insertVersionUpgrade(VersionUpgrade versionUpgrade)
56   - {
  53 + public int insertVersionUpgrade(VersionUpgrade versionUpgrade) {
57 54 versionUpgrade.setCreateTime(DateUtils.getNowDate());
58   - versionUpgrade.setVersionCode(versionUpgrade.getVersionId() + "." + versionUpgrade.getVersionId());
  55 + String[] split = versionUpgrade.getVersionCode().split(".");
  56 + if (split.length == 2){
  57 + versionUpgrade.setVersionId(Integer.parseInt(split[0]));
  58 + versionUpgrade.setVersionMini(Integer.parseInt(split[1]));
  59 + }
59 60 return versionUpgradeMapper.insertVersionUpgrade(versionUpgrade);
60 61 }
61 62  
62 63 /**
63 64 * 修改upgrade
64   - *
  65 + *
65 66 * @param versionUpgrade upgrade
66 67 * @return 结果
67 68 */
68 69 @Override
69   - public int updateVersionUpgrade(VersionUpgrade versionUpgrade)
70   - {
  70 + public int updateVersionUpgrade(VersionUpgrade versionUpgrade) {
71 71 versionUpgrade.setUpdateTime(DateUtils.getNowDate());
72 72 return versionUpgradeMapper.updateVersionUpgrade(versionUpgrade);
73 73 }
74 74  
75 75 /**
76 76 * 批量删除upgrade
77   - *
  77 + *
78 78 * @param ids 需要删除的upgrade主键
79 79 * @return 结果
80 80 */
81 81 @Override
82   - public int deleteVersionUpgradeByIds(String[] ids)
83   - {
  82 + public int deleteVersionUpgradeByIds(String[] ids) {
84 83 return versionUpgradeMapper.deleteVersionUpgradeByIds(ids);
85 84 }
86 85  
87 86 /**
88 87 * 删除upgrade信息
89   - *
  88 + *
90 89 * @param id upgrade主键
91 90 * @return 结果
92 91 */
93 92 @Override
94   - public int deleteVersionUpgradeById(String id)
95   - {
  93 + public int deleteVersionUpgradeById(String id) {
96 94 return versionUpgradeMapper.deleteVersionUpgradeById(id);
97 95 }
98 96 }
... ...
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
  View file @7c8996d
... ... @@ -237,12 +237,12 @@
237 237 HAVING COUNT(*) = #{count}
238 238 );
239 239 update driver set face_sign_in = 2
240   - WHERE face_sign_in != 1 and job_code in (
  240 + WHERE face_sign_in != 1 and job_code not in (
241 241 SELECT job_code
242 242 FROM driver_face_device_id,equipment
243 243 WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
244 244 GROUP BY job_code
245   - HAVING COUNT(*) != #{count}
  245 + HAVING COUNT(*) = #{count}
246 246 );
247 247 </update>
248 248 <insert id="saveDriverScheduling">
... ...