feat: 修改应用更新逻辑，维护两个应用版本

guzijian
1 parent 62e6c99d
Showing 8 changed files with 134 additions and 38 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/ApplicationUpdateController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/AppService.java
ruoyi-admin/src/main/java/com/ruoyi/upgrade/mapper/VersionUpgradeMapper.java
ruoyi-admin/src/main/resources/mapper/upgrade/VersionUpgradeMapper.xml
@@ -33,8 +33,8 @@ public class ApplicationUpdateController {
      */
     @GetMapping("/version/check/{currentVersion}")
     @ApiOperation("校验版本号")
-    public AjaxResult checkVersionNum(@PathVariable("currentVersion") Integer currentVersion) {
-        return AjaxResult.success(appService.checkVersionNum(currentVersion));
+    public AjaxResult checkVersionNum(@PathVariable("currentVersion") Integer currentVersion, @RequestParam(value = "deviceId", required = false) String deviceId) {
+        return AjaxResult.success(appService.checkVersionNum(currentVersion,deviceId));
     }
     /**
@@ -61,6 +61,18 @@ public class ApplicationUpdateController {
         }
     }
+
+    @PostMapping("/uploadApk/other")
+    @ApiOperation("上传apk文件")
+    public AjaxResult uploadApkOther(MultipartFile file) {
+        try {
+            return appService.uploadApkOther(file);
+        } catch (Exception e) {
+            return AjaxResult.error("上传失败,请重试，再次失败请联系管理员，失败原因:" + e.getMessage());
+        }
+    }
+
+
     @GetMapping("/checkDeviceHeart")
     @ApiOperation("设备心跳检测")
     public Result<?> checkAppHeart(@Validated @ApiParam @ModelAttribute HeartPackageVo vo) {
@@ -357,7 +357,7 @@ public class DriverServiceImpl implements IDriverService {
         return vos;
     }
-    private boolean doCheckDevice(String deviceId) {
+    public static boolean doCheckDevice(String deviceId) {
         if (StringUtil.isEmpty(deviceId)){
             return true;
         }
@@ -77,16 +77,16 @@ public class SignInController extends BaseController {
         return success(signInService.selectSignInById(id));
     }
-//    /**
-//     * 新增签到
-//     */
-////    @PreAuthorize("@ss.hasPermi('in:in:add')")
-//    @Log(title = "签到", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    @ApiOperation("新增签到（通过后台管理页面）")
-//    public AjaxResult add(@ApiParam @RequestBody SignIn signIn) {
-//        return signInService.insertSignIn(signIn);
-//    }
+    /**
+     * 补签
+     */
+//    @PreAuthorize("@ss.hasPermi('in:in:add')")
+    @Log(title = "补签", businessType = BusinessType.INSERT)
+    @PutMapping("/supplementarySignature")
+    @ApiOperation("补签（通过后台管理页面）")
+    public AjaxResult supplementarySignature(@ApiParam @RequestBody SignIn signIn) {
+        return signInService.supplementarySignature(signIn);
+    }
     /**
@@ -68,4 +68,6 @@ public interface ISignInService
     String repairSignRecord(HttpServletRequest request);
     String repairAllSignRecord(HttpServletRequest request,String date);
+
+    AjaxResult supplementarySignature(SignIn signIn);
 }
@@ -19,12 +19,14 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
@@ -72,6 +74,9 @@ public class SignInServiceImpl implements ISignInService {
     @Autowired
     private IErrorJobcodeService errorJobcodeService;
+    @Autowired
+    private DriverSchedulingMapper schedulingMapper;
+
     @Resource
     private SchedulingCache schedulingCache;
     @Autowired
@@ -161,17 +166,7 @@ public class SignInServiceImpl implements ISignInService {
         GlobalIndex globalIndex = new GlobalIndex();
         long now = signIn.getCreateTime().getTime();
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
-        // 签到检查
-        if (checkSignIn(now, dto, globalIndex, signIn, driver)) {
-            signIn.setStatus(SIGN_IN_SUCCESS);
-            signIn.setExType(SIGN_NO_EX_NUM);
-            signIn.setRemark("正常");
-        } else {
-            signIn.setStatus(SIGN_IN_FAIL);
-            signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
-        }
-        // base64转图片
-        signIn.setIp(IpUtils.getIpAddr());
+        handleSignBody(signIn, driver, globalIndex, now, dto);
         uploadImage(signIn, vo);
         signInMapper.insertSignIn(signIn);
@@ -185,6 +180,20 @@ public class SignInServiceImpl implements ISignInService {
         return handleAjaxResult(signIn, driver, vo);
     }
+    private void handleSignBody(SignIn signIn, Driver driver, GlobalIndex globalIndex, long now, List<DriverScheduling> dto) {
+        // 签到检查
+        if (checkSignIn(now, dto, globalIndex, signIn, driver)) {
+            signIn.setStatus(SIGN_IN_SUCCESS);
+            signIn.setExType(SIGN_NO_EX_NUM);
+            signIn.setRemark("正常");
+        } else {
+            signIn.setStatus(SIGN_IN_FAIL);
+            signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
+        }
+        // base64转图片
+        signIn.setIp(IpUtils.getIpAddr());
+    }
+
     private AjaxResult handleAjaxResult(SignIn signIn, Driver driver, SignInResponseVo vo) {
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
@@ -250,6 +259,31 @@ public class SignInServiceImpl implements ISignInService {
         return null;
     }
+    @Override
+    public AjaxResult supplementarySignature(SignIn signIn) {
+        signIn.setRemark("");
+        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        if (Objects.isNull(driver)) return AjaxResult.warn("这个工号的员工不存在！");
+        GlobalIndex globalIndex = new GlobalIndex();
+        long now = signIn.getCreateTime().getTime();
+        List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
+        handleSignBody(signIn, driver, globalIndex, now, dto);
+        signIn.setUpdateBy(SecurityUtils.getUsername());
+
+        signInMapper.insertSignIn(signIn);
+        // 更新考勤
+        if (CollectionUtil.isNotEmpty(dto)) {
+            schedulingMapper.updateRoster(dto.get(globalIndex.getIndex()), signIn.getId(), signIn.getExType(), signIn.getCreateTime(), signIn.getRemark(), signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+            // 更新缓存
+            nowSchedulingCache.updateCacheByJobCode(ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex(), signIn);
+        }
+
+        // 异常保存到异常异常中
+        threadJobService.asyncInsertExceptionRecord(signIn, driver, dto, globalIndex);
+
+        return AjaxResult.success("补签成功");
+    }
+
     private String handleDate(String dateString) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         // 解析字符串日期为 LocalDate 对象
@@ -490,19 +524,19 @@ public class SignInServiceImpl implements ISignInService {
                     // 给出签到范围
                     // 上一次无记|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)) {
-                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(lastClosestTimestamp.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(lastClosestTimestamp.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
                     // 上一次无记无|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
                     else if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getIndex().equals(currentScheduling.getIndex())) {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
                     // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
                     else {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
@@ -512,20 +546,20 @@ public class SignInServiceImpl implements ISignInService {
                     DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到异常
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_IN)) {
-                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(lastClosestTimestamp.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(lastClosestTimestamp.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
                     // 当前无记|签退 ， type：签退|签到  ——> 签退异常
                     else {
-                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm",new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
+                        signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
                 }
                 // 签退|签到 当前有记录
                 if (!Objects.isNull(currentScheduling.getSignInId())) {
-                    String prompt =  "请在" + ConstDateUtil.formatDate("HH:mm",new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
+                    String prompt = "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。";
                     signIn.setRemark((currentScheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
                     globalIndex.setIndex(currentScheduling.getIndex());
                     result = false;
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.driver.service.impl.DriverServiceImpl;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
@@ -24,8 +25,6 @@ import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Objects;
-import static com.ruoyi.common.ConstEquipmentProperties.DEVICE_ONLINE;
-
 /**
  * 应用service
  */
@@ -43,15 +42,35 @@ public class AppService {
     @Autowired
     private VersionUpgradeMapper versionUpgradeMapper;
-    public ApplicationResponseVo checkVersionNum(Integer versionNum) {
+    public ApplicationResponseVo checkVersionNum(Integer versionNum, String deviceId) {
+        boolean result = DriverServiceImpl.doCheckDevice(deviceId);
+        if (result) {
+            return getApplicationResponseVoByDeviceId(versionNum);
+        } else {
+            return getApplicationResponseVo(versionNum);
+        }
+    }
+
+    private ApplicationResponseVo getApplicationResponseVoByDeviceId(Integer versionNum) {
+        // 比对版本  需要更新 判断是否需要强制更新
+        VersionUpgrade vu = versionUpgradeMapper.queryLatestVersionNum(1);
+        // 无需更新
+        if (!Objects.isNull(vu) && vu.getVersionCode().equals(versionNum)) {
+            return ApplicationResponseVo.ApplicationResponseVoBuild().appNoUpdate(versionNum);
+        }
+        // 更新判断
+        return ApplicationResponseVo.ApplicationResponseVoBuild().appForceUpdate(vu.getVersionCode(), vu.getApkUrl());
+    }
+
+    private ApplicationResponseVo getApplicationResponseVo(Integer versionNum) {
         // 比对版本  需要更新 判断是否需要强制更新
-        VersionUpgrade vu = versionUpgradeMapper.queryLatestVersionNum();
+        VersionUpgrade vu = versionUpgradeMapper.queryLatestVersionNum(2);
         // 无需更新
-        if (!Objects.isNull(vu) && vu.getVersionCode().equals(versionNum)){
+        if (!Objects.isNull(vu) && vu.getVersionCode().equals(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 {
@@ -86,7 +105,7 @@ public class AppService {
     private void checkFile(MultipartFile file) {
-        if (StringUtils.isEmpty(file.getOriginalFilename()) ){
+        if (StringUtils.isEmpty(file.getOriginalFilename())) {
             throw new RuntimeException("不是apk文件请重新上传");
         }
         if (!file.getOriginalFilename().endsWith(".apk")) {
@@ -101,4 +120,26 @@ public class AppService {
         equipment.setRemark("版本号：" + vo.getVersionNum());
         equipmentMapper.updateEquipmentByDeviceId(equipment);
     }
+
+    public AjaxResult uploadApkOther(MultipartFile file)  throws IOException {
+        // 校验文件
+        checkFile(file);
+        // 上传文件路径
+        String filePath = RuoYiConfig.getUploadPath() + apkPath + "/other";
+        // 上传并返回新文件名称
+        String fileName = "app.apk";
+        // 获取相对路径
+        String absPath = FileUploadUtils.getAbsoluteFile(filePath, fileName).getAbsolutePath();
+        // 上传文件
+        file.transferTo(Paths.get(absPath));
+        fileName = FileUploadUtils.getPathFileName(filePath, fileName);
+        // 返回url
+        String url = serverConfig.getUrl() + fileName;
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("url", url);
+        ajax.put("fileName", fileName);
+        ajax.put("newFileName", FileUtils.getName(fileName));
+        ajax.put("originalFilename", file.getOriginalFilename());
+        return ajax;
+    }
 }
@@ -2,6 +2,7 @@ package com.ruoyi.upgrade.mapper;
 import java.util.List;
 import com.ruoyi.upgrade.domain.VersionUpgrade;
+import org.apache.ibatis.annotations.Param;
 /**
  * upgradeMapper接口
@@ -59,5 +60,10 @@ public interface VersionUpgradeMapper
      */
     public int deleteVersionUpgradeByIds(String[] ids);
-    VersionUpgrade queryLatestVersionNum();
+    /**
+     * 获取appurl
+     * @param appType
+     * @return
+     */
+    VersionUpgrade queryLatestVersionNum(@Param("appType") Integer appType);
 }
@@ -42,6 +42,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </select>
     <select id="queryLatestVersionNum" resultType="com.ruoyi.upgrade.domain.VersionUpgrade">
         <include refid="selectVersionUpgradeVo"></include>
+        where app_id = #{appType}
         order by version_code desc
         limit 1
     </select>