fix: 修复更新人脸注册bug

guzijian
1 parent b0cc652f
Showing 4 changed files with 25 additions and 28 deletions
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ApplicationResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/AppService.java
ruoyi-admin/src/main/java/com/ruoyi/upgrade/service/impl/VersionUpgradeServiceImpl.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -54,7 +54,7 @@ public class ApplicationResponseVo {
         this.apkUrl = apkUrl;
         return this;
     }
-    public static ApplicationResponseVo applicationResponseVoBuild(){
+    public static ApplicationResponseVo ApplicationResponseVoBuild(){
         return new ApplicationResponseVo();
     }
 }
@@ -15,7 +15,6 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.nio.file.Paths;
@@ -40,10 +39,10 @@ public class AppService {
         VersionUpgrade vu = versionUpgradeMapper.queryLatestVersionNum();
         // 无需更新
         if (!Objects.isNull(vu) && vu.getVersionCode().equals(versionNum)){
-            return ApplicationResponseVo.applicationResponseVoBuild().appNoUpdate(versionNum);
+            return ApplicationResponseVo.ApplicationResponseVoBuild().appNoUpdate(versionNum);
         }
         // 更新判断
-        return ApplicationResponseVo.applicationResponseVoBuild().appForceUpdate(vu.getVersionCode(),vu.getApkUrl());
+        return ApplicationResponseVo.ApplicationResponseVoBuild().appForceUpdate(vu.getVersionCode(),vu.getApkUrl());
     }
     public void downloadApk(String url, HttpServletResponse response) throws IOException {
 package com.ruoyi.upgrade.service.impl;
 import java.util.List;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,88 +12,85 @@ import com.ruoyi.upgrade.service.IVersionUpgradeService;
 /**
  * upgradeService业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-07-18
  */
 @Service
-public class VersionUpgradeServiceImpl implements IVersionUpgradeService 
-{
+public class VersionUpgradeServiceImpl implements IVersionUpgradeService {
     @Autowired
     private VersionUpgradeMapper versionUpgradeMapper;
     /**
      * 查询upgrade
-     * 
+     *
      * @param id upgrade主键
      * @return upgrade
      */
     @Override
-    public VersionUpgrade selectVersionUpgradeById(String id)
-    {
+    public VersionUpgrade selectVersionUpgradeById(String id) {
         return versionUpgradeMapper.selectVersionUpgradeById(id);
     }
     /**
      * 查询upgrade列表
-     * 
+     *
      * @param versionUpgrade upgrade
      * @return upgrade
      */
     @Override
-    public List<VersionUpgrade> selectVersionUpgradeList(VersionUpgrade versionUpgrade)
-    {
+    public List<VersionUpgrade> selectVersionUpgradeList(VersionUpgrade versionUpgrade) {
         return versionUpgradeMapper.selectVersionUpgradeList(versionUpgrade);
     }
     /**
      * 新增upgrade
-     * 
+     *
      * @param versionUpgrade upgrade
      * @return 结果
      */
     @Override
-    public int insertVersionUpgrade(VersionUpgrade versionUpgrade)
-    {
+    public int insertVersionUpgrade(VersionUpgrade versionUpgrade) {
         versionUpgrade.setCreateTime(DateUtils.getNowDate());
-        versionUpgrade.setVersionCode(versionUpgrade.getVersionId() + "." + versionUpgrade.getVersionId());
+        String[] split = versionUpgrade.getVersionCode().split(".");
+        if (split.length == 2){
+            versionUpgrade.setVersionId(Integer.parseInt(split[0]));
+            versionUpgrade.setVersionMini(Integer.parseInt(split[1]));
+        }
         return versionUpgradeMapper.insertVersionUpgrade(versionUpgrade);
     }
     /**
      * 修改upgrade
-     * 
+     *
      * @param versionUpgrade upgrade
      * @return 结果
      */
     @Override
-    public int updateVersionUpgrade(VersionUpgrade versionUpgrade)
-    {
+    public int updateVersionUpgrade(VersionUpgrade versionUpgrade) {
         versionUpgrade.setUpdateTime(DateUtils.getNowDate());
         return versionUpgradeMapper.updateVersionUpgrade(versionUpgrade);
     }
     /**
      * 批量删除upgrade
-     * 
+     *
      * @param ids 需要删除的upgrade主键
      * @return 结果
      */
     @Override
-    public int deleteVersionUpgradeByIds(String[] ids)
-    {
+    public int deleteVersionUpgradeByIds(String[] ids) {
         return versionUpgradeMapper.deleteVersionUpgradeByIds(ids);
     }
     /**
      * 删除upgrade信息
-     * 
+     *
      * @param id upgrade主键
      * @return 结果
      */
     @Override
-    public int deleteVersionUpgradeById(String id)
-    {
+    public int deleteVersionUpgradeById(String id) {
         return versionUpgradeMapper.deleteVersionUpgradeById(id);
     }
 }
@@ -237,12 +237,12 @@
             HAVING COUNT(*) = #{count}
         );
         update driver set face_sign_in = 2
-        WHERE face_sign_in != 1 and job_code in (
+        WHERE face_sign_in != 1 and job_code not in (
             SELECT job_code
             FROM driver_face_device_id,equipment
             WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
             GROUP BY job_code
-            HAVING COUNT(*) != #{count}
+            HAVING COUNT(*) = #{count}
         );
     </update>
     <insert id="saveDriverScheduling">