酒测未通过审核

liujun001
1 parent da4006ac
Showing 12 changed files with 102 additions and 10 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/vo/EquipmentExceptionReportVO.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/exception/report/EquipmentExceptionReportServiceImpl.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-admin/src/main/resources/mapper/sign/in/exception/report/EquipmentExceptionReportMapper.xml
@@ -87,9 +87,10 @@ public class DssFaceController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        NewDriver newDriver = convertNewDriver(dto);
-        TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
-        return new ResponseResult<>(errorTipEnum.getCode(), errorTipEnum.getMsg());
+        log.info("client data:[{}]",dto);
+//        NewDriver newDriver = convertNewDriver(dto);
+//        TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
+        return ResponseResult.success();
     }
     @ApiOperation(("人脸注册"))
@@ -3,6 +3,7 @@ package com.ruoyi.controller.sign.in.exception.report;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.driver.NewDriver;
@@ -11,6 +12,8 @@ import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportAdd
 import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportQueryDTO;
 import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportUpdateDTO;
 import com.ruoyi.domain.sign.in.exception.report.vo.EquipmentExceptionReportVO;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
 import io.swagger.annotations.Api;
@@ -35,6 +38,8 @@ public class EquipmentExceptionReportController extends BaseController {
     private EquipmentExceptionReportService equipmentExceptionReportService;
     @Autowired
     private NewDriverService driverService;
+    @Autowired
+    private ISignInService signInService;
     @ApiOperation("分页查询")
     @PreAuthorize("@ss.hasPermi('equipment:exception:report:list:limit:page:limit')")
@@ -48,10 +53,13 @@ public class EquipmentExceptionReportController extends BaseController {
     @ApiOperation("分页查询-用于对外")
     @PostMapping(value = "/list/limit/contact/{page}/{pageLimit}")
-    public IPage<EquipmentExceptionReportVO> listLimitOfContact(@ModelAttribute EquipmentExceptionReportQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+    public IPage<EquipmentExceptionReportVO> listLimitOfContact(@RequestBody EquipmentExceptionReportQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
         IPage<EquipmentExceptionReportVO> voiPage = listLimit(request, orderEntity, page, pageLimit, model);
         if (Objects.nonNull(voiPage) && CollectionUtils.isNotEmpty(voiPage.getRecords())) {
             Set<String> jobs = voiPage.getRecords().stream().map(EquipmentExceptionReportVO::getJobCode).collect(Collectors.toSet());
+            Set<Long> signIds = voiPage.getRecords().stream().map(EquipmentExceptionReportVO::getSignId).collect(Collectors.toSet());
+
+            List<SignIn> signIns = signInService.listByIds(signIds);
             List<NewDriver> drivers = driverService.list(jobs);
             List<EquipmentExceptionReportVO> vos = voiPage.getRecords().stream().map(v -> {
                 if (CollectionUtils.isNotEmpty(drivers)) {
@@ -60,6 +68,15 @@ public class EquipmentExceptionReportController extends BaseController {
                         v.setJobCodeName(optional.get().getPersonnelName());
                     }
                 }
+
+                if (CollectionUtils.isNotEmpty(signIns)) {
+                    Optional<SignIn> optional = signIns.stream().filter(d -> Objects.equals(d.getId(), v.getSignId())).findFirst();
+                    if (optional.isPresent()) {
+                        v.setAlcoholIntake(optional.get().getAlcoholIntake());
+                        v.setCreateTime(optional.get().getCreateTime());
+                    }
+
+                }
                 return v;
             }).collect(Collectors.toList());
             voiPage.setRecords(vos);
@@ -114,6 +131,20 @@ public class EquipmentExceptionReportController extends BaseController {
         return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
+    @ApiOperation("修改状态")
+    @PostMapping(value = "/update/{status}/{id}")
+    public ResponseResult<Boolean> updateStatus(@PathVariable("status") Integer status, @PathVariable("id") Long id) {
+        EquipmentExceptionReport entity = equipmentExceptionReportService.getById(id);
+        if (Objects.isNull(entity)) {
+            return com.ruoyi.common.core.domain.ResponseResult.error("没有要修改的数据");
+        }
+//        entity.setUpdateBy(getUserId());
+        entity.setUpdateTime(new Date());
+        entity.setStatus(status);
+        boolean flag = equipmentExceptionReportService.updateByPrimaryKey(entity);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
+    }
+
     @PreAuthorize("@ss.hasPermi('equipment:exception:report:del')")
     @ApiOperation("删除数据")
     @GetMapping(value = "/del/{id}")
@@ -126,6 +126,10 @@ public class EquipmentExceptionReport {
     @Excel(name = "是否删除，0 未删除；1是删除")
     private java.lang.Boolean delFlag;
+    /***签到ID*/
+    @Excel(name = "签到ID")
+    private java.lang.Long signId;
+
     @Override
     public String toString() {
@@ -78,6 +78,10 @@ public class EquipmentExceptionReportAddDTO implements java.io.Serializable {
     @ApiModelProperty(value = "是否删除，0 未删除；1是删除")
     private java.lang.Boolean delFlag;
+    /***签到ID*/
+    @ApiModelProperty(value="签到ID",example ="1")
+    private java.lang.Long signId;
+
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
@@ -79,6 +79,10 @@ public class EquipmentExceptionReportQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value = "是否删除，0 未删除；1是删除")
     private java.lang.Boolean delFlag;
+    /***签到ID*/
+    @ApiModelProperty(value="签到ID",example ="1")
+    private java.lang.Long signId;
+
     public void clearStrEmpty() {
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.title)) {
@@ -78,6 +78,11 @@ public class EquipmentExceptionReportUpdateDTO implements java.io.Serializable {
     /***是否删除，0 未删除；1是删除*/
     @ApiModelProperty(value = "是否删除，0 未删除；1是删除")
     private java.lang.Boolean delFlag;
+
+    /***签到ID*/
+    @ApiModelProperty(value = "签到ID", example = "1")
+    private java.lang.Long signId;
+
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
@@ -9,6 +9,8 @@ import lombok.experimental.Accessors;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
+import java.math.BigDecimal;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -83,8 +85,15 @@ public class EquipmentExceptionReportVO implements java.io.Serializable {
     /***是否删除，0 未删除；1是删除*/
     @ApiModelProperty(value = "是否删除，0 未删除；1是删除")
     private java.lang.Boolean delFlag;
+
+    /***签到ID*/
+    @ApiModelProperty(value="签到ID",example ="1")
+    private java.lang.Long signId;
+
     @ApiModelProperty(value = "上报姓名")
     private String jobCodeName;
+    @ApiModelProperty(value = "酒精含量")
+    private BigDecimal alcoholIntake;
     @Override
@@ -199,9 +199,12 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         GlobalIndex globalIndex = new GlobalIndex();
         long now = signIn.getCreateTime().getTime();
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
+        if(CollectionUtils.isEmpty(dto)){
+            return AjaxResult.error("今天没有签到数据，签到失败");
+        }
         handleSignBody(signIn, driver, globalIndex, now, dto);
-        log.info("签到的数据为:[{}]",dto.get(globalIndex.getIndex()));
+        log.info("签到的数据为:[{}];index为[{}]",dto,globalIndex);
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
@@ -222,6 +222,7 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
                 wrapper.orderByDesc(EquipmentExceptionReport::getReportOldStatus);
             }
         } else {
+            wrapper.orderByAsc(EquipmentExceptionReport::getStatus);
             wrapper.orderByDesc(EquipmentExceptionReport::getId);
         }
     }
@@ -210,5 +210,5 @@ bsth:
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     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;/test/**;login/no/code
+        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;/test/**;/login/no/code
@@ -214,4 +214,4 @@ bsth:
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     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;/test/**;login/no/code
+        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;/test/**;/login/no/code
@@ -19,6 +19,11 @@
         <result column="report_id" jdbcType="VARCHAR" property="reportId"/>
         <result column="report_time" jdbcType="VARCHAR" property="reportTime"/>
         <result column="report_old_status" jdbcType="INTEGER" property="reportOldStatus"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="BIT" property="delFlag"/>
+        <result column="sign_id" jdbcType="BIGINT" property="signId"/>
     </resultMap>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
@@ -30,12 +35,12 @@
     <sql id="columns">
         id
-        ,  title   ,  device_id   ,  job_code   ,  image   ,  status   ,  create_time   ,  remark   ,  ex_type   ,  fleet_name   ,  nbbm   ,  line_name   ,  plan_time   ,  sign_type   ,  report_id   ,  report_time   ,  report_old_status
+        ,  title   ,  device_id   ,  job_code   ,  image   ,  status   ,  create_time   ,  remark   ,  ex_type   ,  fleet_name   ,  nbbm   ,  line_name   ,  plan_time   ,  sign_type   ,  report_id   ,  report_time   ,  report_old_status   ,  create_by   ,  update_by   ,  update_time   ,  del_flag   ,  sign_id
     </sql>
     <sql id="insert_columns">
         id
-        ,  title  ,  device_id  ,  job_code  ,  image  ,  status  ,  create_time  ,  remark  ,  ex_type  ,  fleet_name  ,  nbbm  ,  line_name  ,  plan_time  ,  sign_type  ,  report_id  ,  report_time  ,  report_old_status
+        ,  title  ,  device_id  ,  job_code  ,  image  ,  status  ,  create_time  ,  remark  ,  ex_type  ,  fleet_name  ,  nbbm  ,  line_name  ,  plan_time  ,  sign_type  ,  report_id  ,  report_time  ,  report_old_status  ,  create_by  ,  update_by  ,  update_time  ,  del_flag  ,  sign_id
     </sql>
     <sql id="insert_values">
@@ -56,7 +61,12 @@
         #{signType},
         #{reportId},
         #{reportTime},
-        #{reportOldStatus}
+        #{reportOldStatus},
+        #{createBy},
+        #{updateBy},
+        #{updateTime},
+        #{delFlag},
+        #{signId}
     </sql>
     <sql id="insertSelectiveColumn">
@@ -78,6 +88,11 @@
             <if test="null!=reportId">report_id,</if>
             <if test="null!=reportTime">report_time,</if>
             <if test="null!=reportOldStatus">report_old_status,</if>
+            <if test="null!=createBy">create_by,</if>
+            <if test="null!=updateBy">update_by,</if>
+            <if test="null!=updateTime">update_time,</if>
+            <if test="null!=delFlag">del_flag,</if>
+            <if test="null!=signId">sign_id,</if>
         </trim>
     </sql>
@@ -100,6 +115,11 @@
             <if test="null!=reportId">#{reportId,jdbcType=VARCHAR},</if>
             <if test="null!=reportTime">#{reportTime,jdbcType=VARCHAR},</if>
             <if test="null!=reportOldStatus">#{reportOldStatus,jdbcType=INTEGER},</if>
+            <if test="null!=createBy">#{createBy,jdbcType=BIGINT},</if>
+            <if test="null!=updateBy">#{updateBy,jdbcType=BIGINT},</if>
+            <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=delFlag">#{delFlag,jdbcType=BIT},</if>
+            <if test="null!=signId">#{signId,jdbcType=BIGINT},</if>
         </trim>
     </sql>
@@ -122,6 +142,11 @@
             <if test="null!=reportId">report_id = #{reportId,jdbcType=VARCHAR},</if>
             <if test="null!=reportTime">report_time = #{reportTime,jdbcType=VARCHAR},</if>
             <if test="null!=reportOldStatus">report_old_status = #{reportOldStatus,jdbcType=INTEGER},</if>
+            <if test="null!=createBy">create_by = #{createBy,jdbcType=BIGINT},</if>
+            <if test="null!=updateBy">update_by = #{updateBy,jdbcType=BIGINT},</if>
+            <if test="null!=updateTime">update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=delFlag">del_flag = #{delFlag,jdbcType=BIT},</if>
+            <if test="null!=signId">sign_id = #{signId,jdbcType=BIGINT},</if>
         </set>
     </sql>
@@ -143,5 +168,10 @@
         <if test="null!=reportId">AND report_id = #{reportId,jdbcType=VARCHAR},</if>
         <if test="null!=reportTime">AND report_time = #{reportTime,jdbcType=VARCHAR},</if>
         <if test="null!=reportOldStatus">AND report_old_status = #{reportOldStatus,jdbcType=INTEGER},</if>
+        <if test="null!=createBy">AND create_by = #{createBy,jdbcType=BIGINT},</if>
+        <if test="null!=updateBy">AND update_by = #{updateBy,jdbcType=BIGINT},</if>
+        <if test="null!=updateTime">AND update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=delFlag">AND del_flag = #{delFlag,jdbcType=BIT},</if>
+        <if test="null!=signId">AND sign_id = #{signId,jdbcType=BIGINT},</if>
     </sql>
 </mapper>
 \ No newline at end of file