优化签到

liujun001
1 parent 9446240e
Showing 5 changed files with 53 additions and 74 deletions
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -101,36 +101,6 @@ public class SignInController extends BaseController {
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
     public AjaxResult addSignIn(@ApiParam @RequestBody @Validated SignIn signIn) throws FileUploadException, IOException {
-//        String key = MessageFormat.format("sign:assignment:{0}", signIn.getJobCode());
-//        if (redisCache.hasKey(key)) {
-//            log.info(" sing method  old sign :[{}]", signIn);
-//            return signInService.addSignIn(signIn);
-//        }
-//
-//        Integer num = RandomUtils.nextInt(0, 10);
-//        if (num < 6) {
-//            redisCache.setCacheObject(key, num, 5, TimeUnit.MINUTES);
-//            log.info("[{}] sing method 走新的签到方式 :[{}] ", num, signIn);
-//            key = StringUtils.join(REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW, ConstDateUtil.FAST_YYYY_MM_DD.format(new Date()), ":", signIn.getJobCode());
-//            Integer count = redisCache.getCacheObject(key);
-//            try {
-//                return signInServiceV1.addsignInV1(signIn);
-//            } catch (Exception e) {
-//                if (Objects.isNull(count) || count < 1) {
-//                    count = 0;
-//                } else {
-//                    count = count - 1;
-//                }
-//                if (redisCache.hasKey(key)) {
-//                    redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
-//                }
-//                log.error("[{}] sing method 走新的签到方式，签到失败 :[{}]", num, signIn, e);
-//            }
-//
-//        }
-//
-//        log.info("[{}] sing method  old sign :[{}]", num, signIn);
-//        return signInService.addSignIn(signIn);
         return signInServiceV1.addsignInV1(signIn);
     }
@@ -96,6 +96,9 @@ public class SignIn extends BaseEntity {
     @ApiModelProperty("异常类型")
     private Integer exType;
+    @ApiModelProperty("异常类型")
+    private Integer exType1;
+
     @Override
     public String toString() {
         String image = this.getImage();
@@ -156,7 +156,9 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     }
     private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
-
+        signIn.setExType1(signIn.getExType());
+        Integer type = Objects.isNull(signIn.getExType()) ? 0 : signIn.getExType() > 0 ? 1 : 0;
+        signIn.setExType(type);
         signInMapper.insertSignIn(signIn);
         // 更新考勤
         if (Objects.nonNull(calDriverScheduling)) {
@@ -253,6 +255,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     }
     private int switchAndChooseTime(SignIn signIn, DriverScheduling scheduling, long dateTime) {
+        long time = new Date().getTime();
         if (Objects.equals(2, signIn.getType())) {
             Date zdsj = new Date(scheduling.getZdsjT());
@@ -261,26 +264,41 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             String dzsjHHMM = HHMM.format(date1);
             Calendar calendar = new GregorianCalendar();
-            calendar.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(zdsj, 1));
+            calendar.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(date1, 1));
             calendar.set(Calendar.SECOND, 0);
             calendar.set(Calendar.MILLISECOND, 0);
-            Date date = Math.abs(calendar.getTime().getTime()-dateTime)>Math.abs(zdsj.getTime()-dateTime)?zdsj:calendar.getTime();
+            Calendar calendar1 = new GregorianCalendar();
+            calendar1.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(zdsj, -1));
+            calendar1.set(Calendar.SECOND, 0);
+            calendar1.set(Calendar.MILLISECOND, 999);
+
+            boolean flag = Math.abs(calendar.getTime().getTime() - time) > Math.abs(calendar1.getTime().getTime() - time) ? Boolean.FALSE:Boolean.TRUE;
             String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_OUT_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
-            return switchAndChooseTime(signIn, dateTime, date, 80, remark);
+            return switchAndChooseTime(signIn, dateTime, calendar1.getTime(), calendar.getTime(), remark,flag);
         } else {
             Date fcsj = new Date(scheduling.getFcsjT());
-            String fcsjHHMM = HHMM.format(org.apache.commons.lang3.time.DateUtils.addMinutes(fcsj, -60));
+            Date date1 = org.apache.commons.lang3.time.DateUtils.addMinutes(fcsj, -60);
+
+            String fcsjHHMM = HHMM.format(date1);
             String dzsjHHMM = HHMM.format(fcsj);
+
             Calendar calendar = new GregorianCalendar();
             calendar.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(fcsj, 1));
             calendar.set(Calendar.SECOND, 0);
             calendar.set(Calendar.MILLISECOND, 0);
+            Calendar calendar1 = new GregorianCalendar();
+            calendar1.setTime(org.apache.commons.lang3.time.DateUtils.addMinutes(date1, 0));
+            calendar1.set(Calendar.SECOND, 0);
+            calendar1.set(Calendar.MILLISECOND, 0);
+
+            boolean flag = Math.abs(calendar.getTime().getTime() - time) > Math.abs(calendar1.getTime().getTime() - time) ? Boolean.FALSE:Boolean.TRUE;
             String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_IN_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
-            return switchAndChooseTime(signIn, dateTime, calendar.getTime(), -60, remark);
+
+            return switchAndChooseTime(signIn, dateTime, calendar1.getTime(), calendar.getTime(), remark,flag);
         }
     }
@@ -309,39 +327,23 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
      * @author liujun
      * @date 2024/9/20 17:14
      */
-    private int switchAndChooseTime(SignIn signIn, long dateTime, Date date, Integer value, String remark) {
-        long time1 = date.getTime();
-        date = org.apache.commons.lang3.time.DateUtils.addMinutes(date, value);
-        long time = date.getTime();
-
-        if (value < 0) {
-            if (dateTime < time) {
-                signIn.setExType(20);
-                signIn.setRemark(remark);
-                signIn.setStatus(2);
-
-                return 1;
-            } else if (dateTime > time1) {
-                signIn.setExType(30);
-                signIn.setRemark(remark);
-                signIn.setStatus(2);
-
-                return 2;
-            }
-        } else if (value > 0) {
-            if (dateTime < time1) {
-                signIn.setExType(20);
-                signIn.setRemark(remark);
-                signIn.setStatus(2);
-
-                return 1;
-            } else if (dateTime > time) {
-                signIn.setExType(30);
-                signIn.setRemark(remark);
-                signIn.setStatus(2);
-
-                return 2;
-            }
+    private int switchAndChooseTime(SignIn signIn, long dateTime, Date date, Date endDate, String remark,boolean flag) {
+        long startTime = date.getTime();
+      //  date = org.apache.commons.lang3.time.DateUtils.addMinutes(date, value);
+        long endTime = endDate.getTime();
+
+        if(dateTime < startTime){
+            signIn.setExType(20);
+            signIn.setRemark(remark);
+            signIn.setStatus(2);
+
+            return 1;
+        }else if(dateTime > endTime){
+            signIn.setExType(30);
+            signIn.setRemark(remark);
+            signIn.setStatus(2);
+
+            return 2;
         }
         signIn.setExType(0);
@@ -188,25 +188,25 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     @Override
     public boolean isNormal(SignIn signIn) {
-        return Objects.nonNull(signIn) && Objects.equals(signIn.getExType(), 0);
+        return Objects.nonNull(signIn) && Objects.equals(signIn.getExType1(), 0);
     }
     @Override
     public boolean isEarly(SignIn signIn) {
-        return Objects.nonNull(signIn) && signIn.getExType() >= 20 && signIn.getExType() < 30;
+        return Objects.nonNull(signIn) && signIn.getExType1() >= 20 && signIn.getExType1() < 30;
     }
     @Override
     public boolean isSignStatusWineEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType()) && signIn.getExType() % 10 == 3;
+        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType1()) && signIn.getExType1() % 10 == 3;
     }
     @Override
     public boolean isSignStatusDelayEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType()) && signIn.getExType() >= 30 && signIn.getExType() < 40;
+        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType1()) && signIn.getExType1() >= 30 && signIn.getExType1() < 40;
     }
     @Override
@@ -37,6 +37,7 @@
         <result property="alcoholIntake" column="alcohol_intake"/>
         <result property="remark" column="remark"/>
         <result property="exType" column="ex_type"/>
+        <result property="exType1" column="ex_type1"/>
     </resultMap>
     <sql id="selectSignInVo">
@@ -54,7 +55,8 @@
                update_time,
                alcohol_intake,
                remark,
-               ex_type
+               ex_type,
+               ex_type1
         from sign_in
     </sql>
@@ -166,6 +168,7 @@
             <if test="alcoholIntake != null">alcohol_intake,</if>
             <if test="remark != null">remark,</if>
             <if test="exType != null">ex_type,</if>
+            <if test="exType1 != null">ex_type1,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">#{createTime},</if>
@@ -182,6 +185,7 @@
             <if test="alcoholIntake != null">#{alcoholIntake},</if>
             <if test="remark != null">#{remark},</if>
             <if test="exType != null">#{exType},</if>
+            <if test="exType1 != null">#{exType1},</if>
         </trim>
     </insert>