酒测复测

liujun001
1 parent decaea49
Showing 8 changed files with 42 additions and 8 deletions
Bsth-admin/sql/DDL.sql
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss2/driver/dto/DssSignV2DTO.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/ThreadJobService.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -4,3 +4,7 @@ ALTER TABLE equipment_exception ADD sign_id INT NULL COMMENT &#39;打卡表ID&#39;;
 ALTER TABLE equipment_exception_report ADD sign_in varchar(100) NULL COMMENT '签到类型 1 人脸 2 刷卡  3 其他 4 酒精;104 线下酒测';
+ALTER TABLE sign_in ADD exception_Id BIGINT NULL COMMENT '异常ID复测签到';
+
+
+
@@ -77,7 +77,7 @@ public class EquipmentExceptionReportController extends BaseController {
 //            request.setDriverJobs(driverJobs);
         }
         Set<String> notSignIn = new HashSet<>();
-        notSignIn.add("104");
+      //  notSignIn.add("104");
         request.setNotSignIn(notSignIn);
@@ -61,6 +61,8 @@ public class DssSignV2DTO {
     @ApiModelProperty(value = "视频内容Base64")
     private String videoContent;
+    private Long exceptionId;
+
     @Override
     public String toString() {
@@ -14,11 +14,11 @@ import java.util.Date;
 /**
  * 签到对象 sign_in
- * 
+ *
  * @author guzijian
  * @date 2023-07-05
  */
-@ApiModel(value = "签到对象",description = "签到记录参数")
+@ApiModel(value = "签到对象", description = "签到记录参数")
 @Data
 public class SignIn extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -94,7 +94,7 @@ public class SignIn extends BaseEntity {
     @Excel(name = "酒精摄入量")
     @ApiModelProperty("酒精摄入量 52.12")
     private BigDecimal alcoholIntake;
-    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
+    @Excel(name = "异常类型", readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
     @ApiModelProperty("异常类型")
     private Integer exType;
@@ -114,5 +114,7 @@ public class SignIn extends BaseEntity {
     @TableField(exist = false)
     private Date endCreateTime;
+
+    private Long exceptionId;
 }
@@ -21,6 +21,7 @@ import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
@@ -38,6 +39,7 @@ import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.BigViewServiceV1;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
 import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.UploadUtil;
@@ -90,6 +92,8 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     @Autowired
     private ISignInService signInService;
+    private EquipmentExceptionReportService equipmentExceptionReportService;
+
     private static final FastDateFormat HHMM = FastDateFormat.getInstance("HH:mm");
     @Override
@@ -340,6 +344,13 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         // 异常保存到异常异常中
         threadJobService.asyncInsertExceptionRecord(signIn, driver, scheduling);
+        if (Objects.nonNull(signIn.getExceptionId())) {
+            LambdaUpdateWrapper<EquipmentExceptionReport> reportLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            reportLambdaUpdateWrapper.set(EquipmentExceptionReport::getStatus, 3).set(EquipmentExceptionReport::getUpdateTime, new Date())
+                    .set(EquipmentExceptionReport::getUpdateBy, signIn.getCreateBy()).eq(EquipmentExceptionReport::getId, signIn.getExceptionId());
+            equipmentExceptionReportService.update(reportLambdaUpdateWrapper);
+        }
+
         return handleAjaxResult(signIn, signInV1);
     }
@@ -205,6 +205,8 @@ public class ThreadJobService {
             exception.setCreateTime(signIn.getCreateTime());
             exception.setFleetName(driver.getFleetName());
             exception.setSignId(signIn.getId());
+            exception.setCreateTime(signIn.getCreateTime());
+            exception.setCreateBy(signIn.getCreateBy());
             if (Objects.nonNull(scheduling)) {
                 exception.setNbbm(scheduling.getNbbm());
                 exception.setLineName(scheduling.getLineName());
@@ -217,10 +219,13 @@ public class ThreadJobService {
             BeanUtils.copyProperties(exception, exceptionReport);
             exceptionReport.setSignId(signIn.getId());
             exceptionReport.setSignIn(signIn.getSingnIn());
+            exceptionReport.setStatus(1);
             equipmentExceptionReportService.save(exceptionReport);
-            // 发送通知
-            sendNotice(signIn, driver, scheduling);
+            if (Objects.isNull(signIn.getExceptionId())) {
+                // 发送通知
+                sendNotice(signIn, driver, scheduling);
+            }
         }
     }
@@ -369,9 +374,14 @@ public class ThreadJobService {
                     String key = SignatureUtils.generateSignature(map, "your_secret_key_here");
                     map.put("signature", key);
+                    String result = null;
+                    try {
+                        result = HttpUtil.get(processSignExceptionURL, map, 10000);
+                        log.info("processSignExceptionURL:[{}],paramMap:[{}],result:[{}]", processSignExceptionURL, JSONUtil.toJsonStr(map), result);
+                    } catch (Exception e) {
+                        log.error("processSignExceptionURL:[{}],paramMap:[{}],result:[{}]", processSignExceptionURL, JSONUtil.toJsonStr(map), result, e);
+                    }
-                    String result = HttpUtil.get(processSignExceptionURL, map, 10000);
-                    log.info("processSignExceptionURL:[{}],paramMap:[{}],result:[{}]", processSignExceptionURL, JSONUtil.toJsonStr(map), result);
                 }
             }
@@ -215,5 +215,8 @@ bsth:
            # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
+    process:
+        sign:
+            url: http://127.0.0.1:9103/commonOpenDataApi/sendAppAndSmsNotice
     skip:
         url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/login/no/code;/uploadPath/**;/doc.html
@@ -173,6 +173,7 @@
             <if test="exType != null">ex_type,</if>
             <if test="null!=schedulingId">scheduling_id,</if>
             <if test="null!=exType1">ex_type1,</if>
+            <if test="null!=exceptionId">exception_Id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">#{createTime},</if>
@@ -191,6 +192,7 @@
             <if test="exType != null">#{exType},</if>
             <if test="null!=schedulingId">#{schedulingId,jdbcType=INTEGER},</if>
             <if test="null!=exType1">#{exType1,jdbcType=INTEGER},</if>
+            <if test="null!=exceptionId">#{exceptionId},</if>
         </trim>
     </insert>