fix: resolve sql query error

guzijian
1 parent c88a377b
Showing 3 changed files with 21 additions and 6 deletions
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
@@ -119,12 +119,14 @@ public class ThreadJobService {
             if (result == 0) {
                 continue;
             }
+            log.info("图片开始上传");
             // 获取图片请求地址
             String imageUrl = DriverJob.getDownloadImageUrl(token, imageUlr);
             // 获取图片数据
             InputStream is = HttpUtils.doGet(imageUrl, new HashMap<>());
             // 上传图片
             uploadImage(is, filePath);
+            log.debug("图片上传完毕");
         }
@@ -132,6 +134,7 @@ public class ThreadJobService {
     private void uploadImage(InputStream is, String filePath) {
         File file = new File(filePath + File.separator);
+        log.info("文件路径:{}",file.getPath());
         if (!file.exists()) {
             if (!file.getParentFile().exists()) {
                 file.getParentFile().mkdirs();
@@ -221,16 +221,26 @@
     </update>
     <update id="updateDriverByComputed">
         update driver set face_sign_in = 0
-        WHERE job_code in (
+        WHERE face_sign_in != 1 and job_code in (
             SELECT job_code
-            FROM driver_face_device_id
+            FROM driver_face_device_id,equipment
+            WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
+            GROUP BY job_code
+            HAVING COUNT(*) = #{count}
+        );
+        update driver set face_sign_in = 0
+        WHERE face_sign_in = 1 and job_code in (
+            SELECT job_code
+            FROM driver_face_device_id,equipment
+            WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
             GROUP BY job_code
             HAVING COUNT(*) = #{count}
         );
         update driver set face_sign_in = 2
-        WHERE job_code in (
+        WHERE face_sign_in != 1 and job_code in (
             SELECT job_code
-            FROM driver_face_device_id
+            FROM driver_face_device_id,equipment
+            WHERE equipment.`status` = 1 and driver_face_device_id.device_id = equipment.device_id
             GROUP BY job_code
             HAVING COUNT(*) != #{count}
         );
@@ -43,16 +43,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         where id = #{id}
     </select>
     <select id="selectEquipmentByDeviceId" resultType="com.ruoyi.equipment.domain.Equipment">
+        <if test="deviceId !=null and deviceId != ''">
         <include refid="selectEquipmentVo"></include>
         where device_id = #{deviceId}
+        </if>
     </select>
     <select id="count" resultType="java.lang.Integer">
         select count(*) from equipment
         where status = 1
     </select>
     <select id="querySignListByJobCode" resultType="com.ruoyi.pojo.domain.EquipmentDriverExpand">
-        select * from driver_face_device_id
-        where 1=1
+        select driver_face_device_id.* from driver_face_device_id,equipment
+        where 1=1 and equipment.status = 1
         <if test="drivers != null and drivers.size() > 0">
             and job_code in
             <foreach collection="drivers" item="item" open="(" separator="," close=")">