feat&fix: 新增测试demo，修改定时任务获取人员信息任务更新人事信息，修复重复打卡照成的打卡记录不匹配问题

guzijian
1 parent a239bf15
Showing 11 changed files with 221 additions and 20 deletions
Bsth-admin/pom.xml
Bsth-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
Bsth-admin/src/main/test/com.ruoyi/Demo.java
Bsth-admin/src/main/test/com.ruoyi/TestBsthApplication.java
@@ -16,6 +16,27 @@
     </description>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <!--<scope>test</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <version>2.0.0.RELEASE</version>
+        </dependency>
         <!--  邮箱starter依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -6,6 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
@@ -17,7 +21,8 @@ import java.util.Date;
  * @author 古自健
  * @date 2023-07-04
  */
-@Data
+@Setter
+@Getter
 @ApiModel("驾驶员信息对象")
 public class Driver extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -136,4 +141,25 @@ public class Driver extends BaseEntity implements Serializable {
     @Excel( name ="车队名称")
     private String fleetName;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Driver driver = (Driver) o;
+
+        return new EqualsBuilder()
+                .append(getJobCode(), driver.getJobCode())
+                .append(getPersonnelName(), driver.getPersonnelName())
+                .append(getPosts(), driver.getPosts())
+                .append(getLineName(), driver.getLineName())
+                .append(getFleetName(), driver.getFleetName()).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37).append(getId()).append(getJobCode()).append(getCompanyCode()).append(getBrancheCompanyCode()).append(getPersonnelName()).append(getPapersCode()).append(getIcCardCode()).append(getPersonnelType()).append(getPosts()).append(getCard()).append(getTelphone()).append(getIcRfid()).append(getIdRfid()).append(getTagRfid()).append(getLineName()).append(getLineCode()).append(getFaceSignIn()).append(getImage()).append(getUpdateTime()).append(getSignInEquipment()).append(getFleetName()).toHashCode();
+    }
 }
@@ -136,4 +136,6 @@ public interface DriverMapper
     List<String> queryEmptyJob(List<String> list);
     void updateDriverBaseInfoByJobCodes(@Param("list") List<Driver> list,@Param("filterImage") Integer filterImage);
+
+    List<Driver> selectDriverListAll();
 }
@@ -123,4 +123,6 @@ public interface IDriverService
     void updateDriverBaseInfoByJobCodes(List<Driver> drivers, int filterImage);
     AjaxResult allUpdateDriverInfo(HttpServletRequest request);
+
+    List<Driver> selectDriverListAll();
 }
@@ -632,6 +632,11 @@ public class DriverServiceImpl implements IDriverService {
         return AjaxResult.success();
     }
+    @Override
+    public List<Driver> selectDriverListAll() {
+        return driverMapper.selectDriverListAll();
+    }
+
     private void sendNotice(List<DriverSignInRecommendation> nowTimerList) {
         List<SysNotice> noticeList = new ArrayList<>(nowTimerList.size());
         for (DriverSignInRecommendation item : nowTimerList) {
@@ -19,6 +19,7 @@ import com.ruoyi.pojo.request.TokenRequestVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.pojo.response.personnel.*;
 import com.ruoyi.pojo.vo.ExpandResponseVo;
+import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
@@ -86,6 +87,9 @@ public class DriverJob implements InitializingBean {
     @Autowired
     private IDriverService driverService;
+    @Autowired
+    private RuleAttendanceMainService attendanceMainService;
+
     @Value("${api.url.getDriverInfo}")
     private String getDriverInfoUrl;
@@ -111,6 +115,7 @@ public class DriverJob implements InitializingBean {
     private static DriverSchedulingExpandMapper EXPAND_MAPPER;
     private static RuleNumSettingService RULE_NUM_SETTING_SERVICE;
+    private static RuleAttendanceMainService ATTENDANCE_MAIN_SERVICE;
     private static NowSchedulingCache NOW_SCHEDULING_CACHE;
     private static ThreadJobService THREAD_JOB_SERVICE;
     private static SchedulingCache SCHEDULING_CACHE;
@@ -409,10 +414,11 @@ public class DriverJob implements InitializingBean {
         for (int i = 2; i <= countPage; i++) {
             drivers.addAll(getDrivers(date, getPersonInfo(accessToken, 100, i)));
         }
-        List<String> jobList = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
-//        DRIVER_SERVICE.updateDriverBaseInfoByJobCodes(drivers, 1);
+        List<String> jobList = drivers.stream().map(Driver::getJobCode).distinct().collect(Collectors.toList());
         // 删除离职员工
         handleNotEmptyJob(jobList);
+        // 更新人事人员信息 防止信息不匹配
+        updatePersonalInfo(drivers);
         // 过滤已经存在的员工工号
         drivers = filterEmptyJob(drivers, jobList);
         List<List<Driver>> splitList = ListUtils.splitList(drivers, 200);
@@ -421,13 +427,45 @@ public class DriverJob implements InitializingBean {
         }
     }
+    private static void updatePersonalInfo(List<Driver> drivers) {
+        // 查询现有信息 用stream过滤 筛选出需要更新的drivers
+        List<Driver> allDriverList = DRIVER_SERVICE.selectDriverListAll();
+        Map<String, Driver> driverMap = new HashMap<>();
+        for (Driver driver : drivers) {
+            if (driverMap.get(driver.getJobCode()) == null) {
+                driverMap.put(driver.getJobCode(),driver);
+            }else {
+                System.out.println(driver);
+            }
+        }
+        // 过滤出需要更新的driver
+        List<Driver> updateDriverList = allDriverList.stream()
+                // 过滤暂时没有保存的人员
+                .filter(item->driverMap.get(item.getJobCode()) != null)
+                // 过滤全部一致的人员信息
+                .filter(item -> !item.equals(driverMap.get(item.getJobCode())))
+                .map(item -> {
+                    Driver driver = driverMap.get(item.getJobCode());
+                    item.setLineName(driver.getLineName());
+                    item.setPersonnelName(driver.getPersonnelName());
+                    item.setFleetName(driver.getFleetName());
+                    item.setPosts(driver.getPosts());
+                    return item;
+                })
+                // 保留需要更新的driver
+                .collect(Collectors.toList());
+        // 更新表
+        ATTENDANCE_MAIN_SERVICE.updateAttendanceMainByJobCode(updateDriverList);
+        DRIVER_SERVICE.updateDrivers(updateDriverList);
+
+    }
+
     private static List<Driver> filterEmptyJob(List<Driver> drivers, List<String> jobList) {
         List<String> jobs = DRIVER_SERVICE.queryEmptyJob(jobList);
         Map<String, String> jobMap = new HashMap<>(jobs.size());
         for (String job : jobs) {
             jobMap.put(job, job);
         }
-
         // 过滤
         return drivers.stream().filter(item -> StringUtils.isEmpty(jobMap.get(item.getJobCode()))).collect(Collectors.toList());
     }
@@ -436,12 +474,6 @@ public class DriverJob implements InitializingBean {
         DRIVER_SERVICE.deleteNotEmptyJob(jobList);
     }
-    private static void updateDrivers(List<Driver> drivers) {
-        log.info("开始更新人脸注册状态");
-        DRIVER_SERVICE.updateDrivers(drivers);
-        log.info("更新人脸注册状态完毕");
-    }
-
     public static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
         List<Driver> drivers = vo.getData().stream().map(item -> {
             Driver driver = new Driver();
@@ -568,5 +600,6 @@ public class DriverJob implements InitializingBean {
         NOW_SCHEDULING_CACHE = nowSchedulingCache;
         RULE_NUM_SETTING_SERVICE = ruleNumSettingService;
         EXPAND_MAPPER = expandMapper;
+        ATTENDANCE_MAIN_SERVICE = attendanceMainService;
     }
 }
@@ -170,18 +170,21 @@ public class SchedulingService {
             return;
         }
         long timer = 1000 * 60 * 3;
-        // 有效的在一小时内内重复签到不做修改
+        // 有效的在三分钟内重复签到不做修改
         if (signIn.getExType().equals(SIGN_NO_EX_NUM) && (DateUtils.getNowDate().getTime() - dto.get(globalIndex.getIndex()).getSignTime().getTime()) <= timer) {
             signIn.setRemark("您已经打卡过了，请勿在3分钟内重复打卡");
             return;
         }
+        //   目前也有效 -》 无需更新 || 目前无效 -》往后更新  TODO 判断时间   之前的有效 但是时间还在有效范围内打卡的话会导致排班表数据不匹配
+        if (signIn.getExType().equals(SIGN_NO_EX_NUM)) {
+            return;
+        }
         int index = globalIndex.getIndex() + 1;
         DriverScheduling scheduling = dto.get(index);
         long date = scheduling.getBcType().equals(BC_TYPE_IN) ? scheduling.getZdsjT() : scheduling.getFcsjT();
         String prompt = getPrompt(new Date(date), scheduling.getBcType());
         signIn.setRemark((scheduling.getBcType().equals(BC_TYPE_IN) ? SIGN_OUT_TIMEOUT : SIGN_IN_TIMEOUT) + prompt);
         signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
-        //   目前无效 -》往后更新
         String remark = getRemark(dto, signIn, index);
         schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
         nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(dto.get(0).getScheduleDate()), globalIndex.getIndex() + 1, signIn);
@@ -203,13 +206,13 @@ public class SchedulingService {
     public List<ReportViewResponseVo> queryReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
         // 处理天
         if (requestVo.getExportFlag().equals(NOW)) {
-            return getDayReportTableResponseVo(requestVo, response);
+            return getDayReportTableResponseVo(requestVo);
         }
         return null;
     }
-    private List<ReportViewResponseVo> getDayReportTableResponseVo(ReportViewRequestVo vo, HttpServletResponse response) {
+    private List<ReportViewResponseVo> getDayReportTableResponseVo(ReportViewRequestVo vo) {
         // 签到数据
         List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
         toDay.sort(Comparator.comparing(DriverScheduling::getFcsjT));
@@ -518,8 +518,16 @@ public class ThreadJobService {
                 // 配置处理
                 nowScheduling = handlerScheduler(configMap, schedulingList, nowScheduling);
                 //  ------|特殊处理|------
-                DriverScheduling scheduling = nowScheduling.get(nowScheduling.size() - 1);
-                scheduling.setZdsjT(scheduling.getFcsjT());
+                try {
+                    DriverScheduling scheduling = nowScheduling.get(nowScheduling.size() - 1);
+                    scheduling.setZdsjT(scheduling.getFcsjT());
+                } catch (Exception e) {
+                    log.error("特殊处理失败:{}",e.getMessage());
+                }
+                // 处理青蒸线区间 区间删除注意特殊情况放到最后可能没有全部都是区间倒是nowScheduling 为0 然后get报错
+                if (nowScheduling.get(0).getLineName().startsWith("青蒸线")) {
+                    nowScheduling = handleQinZhengLine(nowScheduling);
+                }
                 //  ------|结束处理|------
                 bcList.addAll(nowScheduling);
             } else {
@@ -560,10 +568,6 @@ public class ThreadJobService {
         if (nowScheduling.get(0).getLineName().equals("青浦20路")) {
             updateQinpu2With5(nowScheduling);
         }
-        // 处理青蒸线区间 区间删除注意特殊情况放到最后可能没有全部都是区间倒是nowScheduling 为0 然后get报错
-        if (nowScheduling.get(0).getLineName().startsWith("青蒸线")) {
-            nowScheduling = handleQinZhengLine(nowScheduling);
-        }
         return nowScheduling;
     }
@@ -210,6 +210,9 @@
         </foreach>
         ) d1
     </select>
+    <select id="selectDriverListAll" resultType="com.ruoyi.driver.domain.Driver">
+        select job_code, line_name, personnel_name, posts, fleet_name from driver
+    </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
+package com.ruoyi;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class Demo {
+    public static void main(String[] args) {
+        List<String> list = new ArrayList<>(Arrays.asList("123","2314"));
+        list.stream().filter(item->item.equals("123")).forEach(System.out::println);
+    }
+}
+
+package com.ruoyi;
+
+
+import com.ruoyi.BsthApplication;
+import com.ruoyi.common.cache.NowSchedulingCache;
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.driver.service.IDriverService;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.pojo.request.DriverRequestVo;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
+import com.ruoyi.pojo.response.ReportViewResponseVo;
+import com.ruoyi.service.ReportService;
+import com.ruoyi.utils.ConstDateUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.math.BigDecimal;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = BsthApplication.class)
+public class TestBsthApplication {
+
+    /**
+     * 模拟mvc测试对象
+     */
+    @Autowired
+    private ISignInService signInService;
+
+    @Autowired
+    private ReportService reportService;
+
+    @Autowired
+    private IDriverService driverService;
+
+    @Test
+    public void testAddSignIn() {
+        // 模拟前端签到
+        String [] params = new String[] {
+                "2024-02-19 04:30:06,1,1,0",
+                "2024-02-19 05:03:06,1,1,0",
+                "2024-02-19 11:30:30,2,0,0",
+                "2024-02-19 12:16:15,2,0,0",
+                "2024-02-19 15:13:03,1,1,0",
+                "2024-02-19 16:13:03,1,1,0",
+                "2024-02-19 21:36:03,1,1,0",};
+        try {
+            for (int i = 0; i < params.length; i++) {
+                String[] strings = params[i].split(",");
+                SignIn signIn = new SignIn();
+                signIn.setJobCode("722017");
+                signIn.setCreateTime(ConstDateUtil.parseDate(strings[0]));
+                signIn.setType(Integer.parseInt(strings[1]));
+                signIn.setDeviceId("003");
+                signIn.setAlcoholFlag(Integer.parseInt(strings[2]));
+                signIn.setAlcoholIntake(new BigDecimal(strings[3]));
+                signInService.addSignIn(signIn);
+            }
+
+            ReportViewRequestVo vo = new ReportViewRequestVo();
+            vo.setDate("2024-02-19");
+            vo.setJobCode("722017");
+            System.out.println();
+            for (ReportViewResponseVo responseVo : reportService.getReportScrollViewTable(vo, null)) {
+                System.out.println(responseVo);
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    // 模拟获取人员信息
+    @Test
+    public void getDriversTest() {
+        // 722608
+        DriverRequestVo vo = new DriverRequestVo();
+        vo.setJobCode("722608");
+        vo.setUpdateTime(ConstDateUtil.parseDate("2024-02-17 04:56:56"));
+        System.out.println(driverService.getDrivers(vo));
+
+        vo.setUpdateTime(ConstDateUtil.parseDate("2024-02-17 04:57:01"));
+        System.out.println(driverService.getDrivers(vo));
+
+    }
+
+}
 \ No newline at end of file