添加提醒功能

liujun001
1 parent fac8b470
Showing 7 changed files with 155 additions and 4 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/RemindDriverKeyLocalController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/location/vo/RemindKeyInfoLocalVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/scheling/dto/RemindDriverReportDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/scheling/vo/RemindDriverReportVo.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
@@ -76,8 +76,8 @@ public class DssFaceController extends BaseController {
         }
  
         NewDriver driver = new NewDriver();
-        driver.setPosts("驾驶员");
-        driver.setFaceSignIn(1);
+//        driver.setPosts("驾驶员");
+//        driver.setFaceSignIn(1);
  
         List<NewDriver> drivers = newDriverService.list(driver);
         List<ReqDataVo> vos = convertReqDataVo(drivers);
@@ -357,6 +357,10 @@ public class DssFaceController extends BaseController {
         if (StringUtils.indexOf(post, "工会副主席") > -1) {
             postSet.add(3);
         }
+        if (StringUtils.indexOf(post, "管理员") > -1) {
+            postSet.add(3);
+        }
+
  
  
         if (CollectionUtils.isEmpty(postSet)) {
+package com.ruoyi.controller.dss;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.domain.dss.scheling.dto.RemindDriverReportDTO;
+import com.ruoyi.domain.dss.scheling.vo.RemindDriverReportVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @author liujun
+ * @date 2024年10月09日 15:48
+ */
+@Slf4j
+@RestController
+@RequestMapping("/dss")
+@Api(tags = "【对接】钥匙提醒功能")
+public class RemindDriverKeyLocalController extends BaseController {
+
+
+    @ApiOperation("司机提醒信息")
+    @PostMapping(value = "/remind/driver/key/local/report")
+    public ResponseResult<RemindDriverReportVo> remindDriverKeyLocalReport(@Valid @RequestBody RemindDriverReportDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+
+        return null;
+    }
+}
+package com.ruoyi.domain.dss.key.location.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author liujun
+ * @date 2024年10月09日 15:31
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "钥匙信息提醒")
+public class RemindKeyInfoLocalVo implements Serializable {
+
+
+    private static final long serialVersionUID = -6256368671786016831L;
+
+    @ApiModelProperty(value = "车辆自编号")
+    private String nbbm;
+
+    @ApiModelProperty(value = "1=取出，0=存入，16=钥匙未归还，255=异常")
+    private Integer keyInfoStatus;
+
+    @ApiModelProperty(value = "钥匙已经存在的柜子")
+    private String equipmentName;
+    @ApiModelProperty(value = "钥匙已经存在的场地")
+    private String yardName;
+
+    @ApiModelProperty(value = "钥匙需要归还的柜子")
+    private String returnEquipmentName;
+    @ApiModelProperty(value = "钥匙需要归还的场地")
+    private String returnYardName;
+
+
+}
+package com.ruoyi.domain.dss.scheling.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年10月09日 15:45
+ */
+@Data
+@ApiModel(value = "司机和钥匙提醒信息")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class RemindDriverReportDTO implements Serializable {
+
+    private static final long serialVersionUID = -2011474790725194886L;
+
+    @NotNull(message = "司机工号不能为空")
+    @ApiModelProperty(value = "司机工号", required = true)
+    private String jobCode;
+
+    @NotNull(message = "时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "时间;格式=yyyy-MM-dd", required = true)
+    private Date date;
+}
+package com.ruoyi.domain.dss.scheling.vo;
+
+import com.ruoyi.domain.dss.key.location.vo.RemindKeyInfoLocalVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author liujun
+ * @date 2024年10月09日 15:35
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "司机当天排班信息")
+public class RemindDriverReportVo implements Serializable {
+
+    private static final long serialVersionUID = 2852709680924849711L;
+
+    @ApiModelProperty(value = "当天有多少个班次")
+    private Integer count;
+    @ApiModelProperty(value = "钥匙地址提醒信息")
+    private List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList;
+}
@@ -75,7 +75,7 @@ public class FaceServiceImpl implements FaceService {
             }
  
  
-            Optional<NewDriver> optional = drivers.stream().map(dr -> {
+            Optional<NewDriver> optional = drivers.parallelStream().map(dr -> {
                 float imageScore = checkFaceScore(dr, sourceFaceFeature);
                 dr.setImageScore(imageScore);
  
@@ -215,4 +215,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;/login/no/code;/uploadPath/**
+        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