fix: 人脸注册更新

guzijian
1 parent b1aa1c06
Showing 9 changed files with 104 additions and 96 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/global/Result.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/personnel/FormData.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -67,6 +67,14 @@ public class Result&lt;T extends Object&gt; {
         r.setMsg("失败");
         return r;
     }
+    /** 失败静态方法 */
+    public static Result ERROR(ResultCode code,String msg) {
+        Result r = new Result();
+        r.setSuccess(false);
+        r.setCode(code.getCode());
+        r.setMsg("失败");
+        return r;
+    }
  
     /** 失败静态方法 */
     public static Result ERROR(String message) {
@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
 import com.ruoyi.common.global.Result;
+import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
@@ -128,7 +129,6 @@ public class DriverController extends BaseController {
     }
  
  
-
     /**
      * 修改驾驶员信息
      */
@@ -142,16 +142,20 @@ public class DriverController extends BaseController {
  
  
     /**
-     *  人脸数据更新接口
+     * 人脸数据更新接口
+     *
      * @param request 请求头
-     * @param vo 更新实际数据
+     * @param vo      更新实际数据
      */
-    @ApiOperation("人脸数据更新接口")
     @PostMapping("/update/face")
-    public AjaxResult updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo){
-        // TODO 人脸数据更新接口
-        driverService.updateFaceByJob(request,vo);
-        return AjaxResult.success();
+    @ApiOperation("人脸数据更新接口")
+    public Result<?> updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo) {
+        try {
+            driverService.updateFaceByJob(request, vo);
+        } catch (Exception e) {
+            return Result.ERROR(ResultCode.CODE_401, e.getMessage());
+        }
+        return Result.OK();
     }
  
     /**
@@ -190,7 +194,6 @@ public class DriverController extends BaseController {
     }
  
  
-
     /**
      * 头像下载  根据 工号
      */
@@ -206,7 +209,7 @@ public class DriverController extends BaseController {
     @ApiOperation("注册反馈")
     @PostMapping("/faceSignIn")
     public AjaxResult faceRegistrationFeedback(@RequestBody FaceRegistrationFeedbackVo vo) {
-        return driverService.faceRegistrationFeedback(vo.getDeviceId(),vo.getJobCodes());
+        return driverService.faceRegistrationFeedback(vo.getDeviceId(), vo.getJobCodes());
     }
  
 }
@@ -145,4 +145,8 @@ public class Driver extends BaseEntity {
     @ApiModelProperty("注册设备列表")
     private String signInEquipment;
  
+    @ApiModelProperty("车队名称")
+    @Excel( name ="车队名称")
+    private String fleetName;
+
 }
@@ -69,15 +69,7 @@ public interface DriverMapper
      */
     void saveDrivers(@Param("drivers") List<Driver> driverList);
  
-    void saveDriverScheduling(@Param("responseSchedulings") List<ResponseScheduling> responseSchedulings);
  
-    /**
-     * 获取驾驶员排班信息
-     * @param date
-     * @param jobCode
-     * @return
-     */
-    List<ResponseScheduling> getDriverSchedulingList(@Param("date") String date,@Param("jobCode") String jobCode);
  
     /**
      *
@@ -103,8 +95,11 @@ public interface DriverMapper
  
     void updateDriverByComputed(@Param("count")Integer count);
  
-    void updateDriversByJobCodes(@Param("list") List<Driver> list);
+    void updateSignStatusDriversByJobCodes(@Param("list") List<Driver> list);
  
     void deleteDeviceIdAssociatedJobCode(@Param("jobCodes") List<String> jobCodes);
  
+    List<String> queryJobCodesIsExists(@Param("jobCodes") List<String> jobCodes);
+
+    void updateDriverInfoByJobCodes(@Param("drivers") List<Driver> drivers);
 }
@@ -9,6 +9,7 @@ import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
  
 import javax.servlet.http.HttpServletRequest;
@@ -78,8 +79,6 @@ public interface IDriverService
  
     AjaxResult getDriverSchedulingInfo(String schedulingDate,String jobCode);
  
-    void saveDriverScheduling(List<ResponseScheduling> driverSchedulingMap);
-
     AjaxResult getDriverSchedulingAll();
  
     AjaxResult checkJobCode(Driver jobCode);
@@ -98,4 +97,6 @@ public interface IDriverService
     void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo);
  
     void saveDriverSignInfo(DriverSignInRequestVo vo);
+
+    void updateDrivers(List<Driver> drivers);
 }
@@ -17,7 +17,6 @@ import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.domain.EquipmentDriverExpand;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
@@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse;
  
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
-import static com.ruoyi.in.service.impl.SignInServiceImpl.checkImageBase64Format;
  
 /**
  * 驾驶员信息Service业务层处理
@@ -81,6 +79,7 @@ public class DriverServiceImpl implements IDriverService {
  
     @Value("${api.headImage}")
     private String headImagePre;
+
     /**
      * 查询驾驶员信息
      *
@@ -163,7 +162,7 @@ public class DriverServiceImpl implements IDriverService {
     public AjaxResult getDriverSchedulingInfo(String schedulingDate, String jobCode) {
         String key = DRIVER_SCHEDULING_PRE + schedulingDate;
         List<ResponseScheduling> cacheMapValue = redisCache.getCacheMapValue(key, jobCode);
-        log.info("获取到排班数据:{}",cacheMapValue);
+        log.info("获取到排班数据:{}", cacheMapValue);
         // 优先从缓存中读取
         if (cacheMapValue != null && cacheMapValue.size() > 0) {
  
@@ -181,19 +180,13 @@ public class DriverServiceImpl implements IDriverService {
         Map<String, List<ResponseScheduling>> scheduling = driverJob.saveSchedulingToRedis(getSchedulingInfoUrl, schedulingDate);
         // 数据库中读取所有接收到的排班信息
 //        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
-        if (jobCode.equals("700001") || jobCode.equals("700002")){
+        if (jobCode.equals("700001") || jobCode.equals("700002")) {
             return AjaxResult.success(scheduling.get("724228"));
         }
         return AjaxResult.success(scheduling.get(jobCode));
     }
  
-    @Override
-    public void saveDriverScheduling(List<ResponseScheduling> schedulings) {
-        List<List<ResponseScheduling>> lists = ListUtils.splitList(schedulings, 1000);
-        for (List<ResponseScheduling> responseSchedulings : lists) {
-            driverMapper.saveDriverScheduling(responseSchedulings);
-        }
-    }
+
  
     @Override
     public AjaxResult getDriverSchedulingAll() {
@@ -283,16 +276,20 @@ public class DriverServiceImpl implements IDriverService {
     public void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo) {
         // 获取校验
         String header = request.getHeader("X-TOKEN-AUTHORIZATION");
-        if (!PERSONNEL_API_KEY.equals(header)){
+        if (!PERSONNEL_API_KEY.equals(header)) {
             throw new RuntimeException("X-TOKEN-AUTHORIZATION value error");
         }
         Date date = new Date();
+        // 查询当前人员信息库是否存在对应员工数据
+        List<String> jobCodes = vo.getFaceDataList().stream().map(FaceUpdateReqVo.FaceData::getJobCode).collect(Collectors.toList());
+        List<String> existsJobCodes = driverMapper.queryJobCodesIsExists(jobCodes);
+
         List<Driver> drivers = vo.getFaceDataList().stream().map(item -> {
             Driver driver = new Driver();
             driver.setPosts(item.getPosts());
             driver.setJobCode(item.getJobCode());
             try {
-                driver.setImage(getNewImageUrl(item.getJobCode(),item.getImageUrl()));
+                driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
             } catch (IOException e) {
                 log.info(e.getMessage());
                 throw new RuntimeException(e);
@@ -305,11 +302,11 @@ public class DriverServiceImpl implements IDriverService {
         log.info("开始人脸数据更新");
         // 数据更新 更新人脸注册标识 更新基本数据
         for (List<Driver> list : lists) {
-            driverMapper.updateDriversByJobCodes(list);
+            driverMapper.updateSignStatusDriversByJobCodes(list);
         }
         log.info("人脸数据更新完成");
-        // 删除注册表中对应工号的数据
-        List<String> jobCodes = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
+        // TODO 删除注册表中对应工号的数据
+//        List<String> jobCodes = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
         log.info("开始删除注册表中对应工号的数据");
         driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes);
         log.info("删除注册表中对应工号的数据结束");
@@ -332,12 +329,17 @@ public class DriverServiceImpl implements IDriverService {
         driver.setImage(fileName);
         driver.setUpdateTime(new Date());
         int result = driverMapper.insertDriver(driver);
-        if (result == 0) driverMapper.updateDriversByJobCodes(new ArrayList<>(Arrays.asList(driver)));
+        if (result == 0) driverMapper.updateSignStatusDriversByJobCodes(new ArrayList<>(Arrays.asList(driver)));
         log.info("开始上传签到图片");
         // 异步上传文件
         threadJobService.asyncStartUploadBase64Image(filePath, base64);
     }
  
+    @Override
+    public void updateDrivers(List<Driver> drivers) {
+        driverMapper.updateDriverInfoByJobCodes(drivers);
+    }
+
     /**
      * 获取新的imageUrl
      *
@@ -345,7 +347,7 @@ public class DriverServiceImpl implements IDriverService {
      * @param url
      * @return
      */
-    private String getNewImageUrl(String jobCode,String url) throws IOException {
+    private String getNewImageUrl(String jobCode, String url) throws IOException {
         // 生成文件路径
         String fileName = jobCode + ".png";
         String filePath = RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName;
@@ -229,11 +229,14 @@ public class DriverJob implements InitializingBean {
             if (++i <= countPage) {
                 vo = getPersonInfo(accessToken, 100, i);
                 drivers = getDrivers(date, vo);
+//                updateDrivers(drivers);
                 saveDrivers(drivers, accessToken);
             }
         }
+    }
  
-//        return drivers;
+    private static void updateDrivers(List<Driver> drivers) {
+        DRIVER_SERVICE.updateDrivers(drivers);
     }
  
     private static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
@@ -247,6 +250,8 @@ public class DriverJob implements InitializingBean {
             // 解析JSON字符串
             List<ImageField_lk9mk228> lists = JSONArray.parseArray(formData.getImageField_lk9mk228(), ImageField_lk9mk228.class);
             driver.setImage(lists.get(0).getPreviewUrl());
+            driver.setLineName(formData.getTextField_lkmgdvnu());
+            driver.setFleetName(formData.getTextField_lkmgdvnv());
             return driver;
         }).collect(Collectors.toList());
         return drivers;
@@ -12,6 +12,31 @@ public class FormData {
     private String imageField_lk9mk228;
     private String textField_lk9mk222;
     private String textField_lk9mk224;
+    /**
+     * 车队
+     */
+    private String textField_lkmgdvnv;
+    /**
+     * 线路
+     */
+    private String textField_lkmgdvnu;
+
+    public String getTextField_lkmgdvnv() {
+        return textField_lkmgdvnv;
+    }
+
+    public void setTextField_lkmgdvnv(String textField_lkmgdvnv) {
+        this.textField_lkmgdvnv = textField_lkmgdvnv;
+    }
+
+    public String getTextField_lkmgdvnu() {
+        return textField_lkmgdvnu;
+    }
+
+    public void setTextField_lkmgdvnu(String textField_lkmgdvnu) {
+        this.textField_lkmgdvnu = textField_lkmgdvnu;
+    }
+
     public void setTextField_lk9mk226(String textField_lk9mk226) {
         this.textField_lk9mk226 = textField_lk9mk226;
     }
@@ -23,6 +23,7 @@
         <result property="lineName" column="line_name"/>
         <result property="lineCode" column="line_code"/>
         <result property="updateTime" column="update_time"/>
+        <result property="fleetName" column="fleet_name"/>
     </resultMap>
  
     <sql id="selectDriverVo">
@@ -46,12 +47,13 @@
                face_sign_in,
                image,
                update_time,
-               sign_in_equipment
+               sign_in_equipment,
+               fleet_name
         from driver
     </sql>
     <sql id="insertDriverVo">
         job_code
-        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,face_sign_in,image,update_time,sign_in_equipment
+        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,face_sign_in,image,update_time,sign_in_equipment,fleet_name
     </sql>
  
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
@@ -77,6 +79,7 @@
             <if test="lineName != null  and lineName != ''">and line_name like concat('%', #{lineName}, '%')</if>
             <if test="lineCode != null  and lineCode != ''">and line_code = #{lineCode}</if>
             <if test="faceSignIn != null  and faceSignIn != ''">and face_sign_in = #{faceSignIn}</if>
+            <if test="fleetName != null  and fleet_name != ''">and fleet_name = #{fleetName}</if>
         </where>
     </select>
  
@@ -84,16 +87,6 @@
         <include refid="selectDriverVo"/>
         where id = #{id}
     </select>
-    <select id="getDriverSchedulingList" resultType="com.ruoyi.pojo.response.ResponseScheduling">
-        select id, scheduleDate, lineName, lineCode, lpName,
-               nbbm, job_code as jobCode,jsy, spy, upDown, qdzCode,
-               qdzName, zdzCode, zdzName, fcsjT, dfsjT,
-               zdsjT, fcsjActualTime, zdsjActualTime,
-               jhlc, jhlcOrig, bcsj, bcType, status, adjustExps,
-               sflj, remarks
-        from driver_scheduling
-        where scheduleDate = #{date} and job_code = #{jobCode}
-    </select>
     <select id="getNameByJobCode" resultMap="DriverResult">
         select personnel_name,job_code
             from driver
@@ -145,6 +138,13 @@
         <include refid="selectDriverVo"></include>
         where job_code = #{jobCode}
     </select>
+    <select id="queryJobCodesIsExists" resultType="java.lang.String">
+        select job_code
+        where job_code in
+            <foreach collection="jobCodes" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+    </select>
  
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
@@ -245,56 +245,20 @@
             HAVING COUNT(*) = #{count}
         );
     </update>
-    <update id="updateDriversByJobCodes">
+    <update id="updateSignStatusDriversByJobCodes">
         <foreach collection="list" item="item" separator=";">
             update driver set face_sign_in = 1,
                               personnel_name = #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR},image = #{item.image,jdbcType=VARCHAR},update_time = #{item.updateTime}
             where job_code = #{item.jobCode,jdbcType=VARCHAR}
         </foreach>
     </update>
-    <insert id="saveDriverScheduling">
-        INSERT INTO driver_scheduling (
-        id, scheduleDate, lineName, lineCode, lpName,
-        nbbm, job_code,jsy, spy, upDown, qdzCode,
-        qdzName, zdzCode, zdzName, fcsjT, dfsjT,
-        zdsjT, fcsjActualTime, zdsjActualTime,
-        jhlc, jhlcOrig, bcsj, bcType, status, adjustExps,
-        sflj, remarks)
-        values
-        <foreach collection="responseSchedulings" item="item" index="index" separator=",">
-            (
-            #{item.id},
-            #{item.scheduleDate},
-            #{item.lineName,jdbcType=VARCHAR},
-            #{item.lineCode,jdbcType=VARCHAR},
-            #{item.lpName,jdbcType=VARCHAR},
-            #{item.nbbm,jdbcType=VARCHAR},
-            #{item.jobCode,jdbcType=VARCHAR},
-            #{item.jsy,jdbcType=VARCHAR},
-            #{item.spy,jdbcType=VARCHAR},
-            #{item.upDown,jdbcType=VARCHAR},
-            #{item.qdzCode,jdbcType=VARCHAR},
-            #{item.qdzName,jdbcType=VARCHAR},
-            #{item.zdzCode,jdbcType=VARCHAR},
-            #{item.zdzName,jdbcType=VARCHAR},
-            #{item.fcsjT},
-            #{item.dfsjT},
-            #{item.zdsjT},
-            #{item.fcsjActualTime},
-            #{item.zdsjActualTime},
-            #{item.jhlc,jdbcType=VARCHAR},
-            #{item.jhlcOrig,jdbcType=VARCHAR},
-            #{item.bcsj,jdbcType=VARCHAR},
-            #{item.bcType,jdbcType=VARCHAR},
-            #{item.status,jdbcType=VARCHAR},
-            #{item.adjustExps,jdbcType=VARCHAR},
-            #{item.sflj,jdbcType=VARCHAR},
-            #{item.remarks,jdbcType=VARCHAR}
-            )
+    <update id="updateDriverInfoByJobCodes">
+        <foreach collection="drivers" item="item" separator=";">
+            update driver set
+            line_name=#{item.lineName,jdbcType=VARCHAR},fleet_name=#{item.fleetName,jdbcType=VARCHAR},personnel_name = #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR}
+            where job_code = #{item.jobCode,jdbcType=VARCHAR}
         </foreach>
-        on duplicate key update
-        job_code = values(job_code)
-    </insert>
+    </update>
  
     <delete id="deleteDriverById" parameterType="Long">
         delete
@@ -344,7 +308,8 @@
             #{item.faceSignIn},
             #{item.image},
             #{item.updateTime},
-            #{item.signInEquipment}
+            #{item.signInEquipment},
+             #{item.fleetName}
             )
         </foreach>
         on duplicate key update