fix: 修改人脸更新接口逻辑

guzijian
1 parent 9d2c2b6e
Showing 5 changed files with 50 additions and 41 deletions
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/FaceUpdateReqVo.java
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/logback.xml
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -224,6 +224,7 @@ public class DriverJob implements InitializingBean {
         int countPage = vo.getTotalCount() / pageSize;
         countPage = vo.getTotalCount() % pageSize == 0 ? countPage : countPage + 1;
         List<Driver> drivers = getDrivers(date, vo);
+//        updateDrivers(drivers);
         saveDrivers(drivers, accessToken);
         for (int i = 1; i <= countPage; ) {
             if (++i <= countPage) {
@@ -11,45 +11,49 @@ import java.util.List;
 /**
  * 人脸更新数据
+ *
  * @author 20412
  */
 @Data
 @ApiModel("人脸更新数据")
 public class FaceUpdateReqVo {
-    @ApiModelProperty("人脸数据")
+    @ApiModelProperty(value = "人脸数据",required = true)
     @NotEmpty(message = "人脸数据集合不能为空")
     @Valid
     List<FaceData> faceDataList;
-      @Data
-      @ApiModel("FaceData")
-      public static class FaceData{
-          /**
-           * 工号
-           */
-          @ApiModelProperty("工号")
-          @NotBlank(message = "工号不能为空")
-          String jobCode;
-          /**
-           * 图片url不能为空
-           */
-          @ApiModelProperty("图片url")
-          @NotBlank(message = "图片url不能为空")
-          String imageUrl;
-          /**
-           * 姓名
-           */
-          @ApiModelProperty("姓名")
-          @NotBlank(message = "姓名不能为空")
-          String name;
-          /**
-           * 工种
-           */
-          @ApiModelProperty("工种")
-          @NotBlank(message = "工种不能为空")
-          String posts;
-          @ApiModelProperty("线路")
-          String lineName;
-          @ApiModelProperty("车队")
-          String fleetName;
-      }
+
+    @Data
+    @ApiModel("FaceData")
+    public static class FaceData {
+        /**
+         * 工号
+         */
+        @ApiModelProperty(value = "工号",required = true)
+        @NotBlank(message = "工号不能为空")
+        String jobCode;
+        /**
+         * 图片url不能为空
+         */
+        @ApiModelProperty(value = "图片url",required = true)
+        @NotBlank(message = "图片url不能为空")
+        String imageUrl;
+        /**
+         * 姓名
+         */
+        @ApiModelProperty(value = "姓名",required = true)
+        @NotBlank(message = "姓名不能为空")
+        String name;
+        /**
+         * 工种
+         */
+        @ApiModelProperty(value = "工种",required = true)
+        @NotBlank(message = "工种不能为空")
+        String posts;
+        @ApiModelProperty(value = "线路",required = true)
+        @NotBlank(message = "线路不能为空")
+        String lineName;
+        @ApiModelProperty(value = "车队名称",required = true)
+        @NotBlank(message = "车队名称不能为空")
+        String fleetName;
+    }
 }
@@ -110,8 +110,8 @@ ruoyi:
     copyrightYear: 2023
     # 实例演示开关
     demoEnabled: true
-    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: D:/ruoyi/uploadPath
+    # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: E:/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="D:/ruoyi/logs" />
-<!--	<property name="log.path" value="/home/ruoyi/logs" />-->
+<!--	<property name="log.path" value="E:/ruoyi/logs" />-->
+<!--	<property name="log.path" value="D:/ruoyi/logs" />-->
+	<property name="log.path" value="/home/ruoyi/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -168,7 +168,8 @@
             <if test="lineCode != null">line_code,</if>
             <if test="faceSignIn != null">face_sign_in,</if>
             <if test="image != null">image,</if>
-            <if test="updateTime != null">update_time</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="fleetName != null">fleet_name</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
@@ -189,7 +190,8 @@
             <if test="lineCode != null">#{lineCode},</if>
             <if test="faceSignIn != null">#{faceSignIn},</if>
             <if test="image != null">#{image},</if>
-            <if test="updateTime != null">#{updateTime}</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="fleetName != null">#{fleetName}</if>
         </trim>
         on duplicate key update
         job_code = values(job_code)
@@ -215,8 +217,9 @@
             <if test="lineName != null">line_name = #{lineName},</if>
             <if test="lineCode != null">line_code = #{lineCode},</if>
             <if test="faceSignIn != null">face_sign_in = #{faceSignIn},</if>
-            <if test="image != null">image = #{image}</if>
-            <if test="signInEquipment != null">sign_in_equipment = #{signInEquipment}</if>
+            <if test="image != null">image = #{image},</if>
+            <if test="signInEquipment != null">sign_in_equipment = #{signInEquipment},</if>
+            <if test="fleetName != null">fleet_name = #{fleetName}</if>
         </trim>
         where id = #{id}
     </update>