数据字典添加分别字符key

liujun001
1 parent b3b6a9d8
Showing 8 changed files with 107 additions and 16 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/key/location/LinggangKeyWorkLocationController.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationUpdateStatusDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/vo/LinggangKeyWorkLocationVO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
@@ -450,9 +450,9 @@ public class KeyBoxController extends BaseController {
         if (CollectionUtils.isEmpty(locations)) {
             return ResponseResult.success();
         }
-
+       Date date = DateUtil.shortDate(new Date());
         location.setType(255);
-        location.setStartScheduleDate(locations.get(0).getScheduleDate());
+        location.setStartScheduleDate(DateUtil.shortDate(new Date()));
         int errorCount = linggangKeyWorkLocationService.countId(location);
         location.setType(0);
@@ -466,18 +466,18 @@ public class KeyBoxController extends BaseController {
         LinggangKeyWorkLocation locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
-        locationEq.setStartScheduleDate(locations.get(0).getScheduleDate());
+        locationEq.setStartScheduleDate(date);
         List<LinggangKeyWorkLocation> locationsOfEq = linggangKeyWorkLocationService.list(locationEq);
         locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
-        locationEq.setStartScheduleDate(locations.get(0).getScheduleDate());
+        locationEq.setStartScheduleDate(date);
         locationEq.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(locationEq.getStartScheduleDate(),1));
-        Set<Integer> types = new HashSet<>();
-        types.add(1);
-        types.add(0);
-        locationEq.setTypes(types);
+//        Set<Integer> types = new HashSet<>();
+//        types.add(1);
+//        types.add(0);
+//        locationEq.setTypes(types);
         IPage<LinggangKeyWorkLocation> page = linggangKeyWorkLocationService.pageList(new Page<>(dto.getPageNum(), dto.getPageSize()), locationEq, new OrderEntity());
@@ -487,8 +487,7 @@ public class KeyBoxController extends BaseController {
         List<Equipment> yarnCabinetStateEqus = Collections.emptyList();
         if (Objects.nonNull(page) && CollectionUtils.isNotEmpty(page.getRecords())) {
-            Set<Long> driverIds = page.getRecords().stream().map(LinggangKeyWorkLocation::getCreateBy).collect(Collectors.toSet());
-            drivers = newDriverService.listOfIdsLon(driverIds);
+
             Set<String> deviceCodes = page.getRecords().stream().map(LinggangKeyWorkLocation::getDevice).collect(Collectors.toSet());
             yarnCabinetStateEqus = equipmentService.listNameAndIDBydeviceIds(deviceCodes);
@@ -498,6 +497,9 @@ public class KeyBoxController extends BaseController {
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 Set<String> nbbm = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
                 carInfos = carInfoService.list(nbbm);
+
+                Set<String> jobCode = schedulings.stream().map(LinggangScheduling::getJobCode).collect(Collectors.toSet());
+                drivers = newDriverService.list(jobCode);
             }
         }
         YarnCabinetStatePageVO pageVO = conertYarnCabinetStatePageVO(locations, equipment, errorCount, depositCount, equipmentList, locationsOfEq, page, schedulings, dto, carInfos, drivers, yarnCabinetStateEqus);
@@ -869,16 +871,22 @@ public class KeyBoxController extends BaseController {
                                     recordsVo.setPlate(optCar.get().getPlateNum());
                                 }
                             }
+
+                            if (CollectionUtils.isNotEmpty(drivers)) {
+                                Optional<NewDriver> opt = drivers.stream().filter(d -> Objects.equals(d.getJobCode(),optional.get().getJobCode())).findFirst();
+                                if (opt.isPresent()) {
+                                    recordsVo.setStaffName(opt.get().getPersonnelName());
+                                }
+                            }
                         }
                     }
-                    if (CollectionUtils.isNotEmpty(drivers)) {
-                        Optional<NewDriver> opt = drivers.stream().filter(d -> Objects.equals(Convert.toLong(d.getId()), l.getCreateBy())).findFirst();
-                        if (opt.isPresent()) {
-                            recordsVo.setStaffName(opt.get().getPersonnelName());
-                        }
+                    if(Objects.nonNull(l.getUpdateTime())){
+                        recordsVo.setTime(l.getUpdateTime());
+                    }else if(Objects.nonNull(l.getCreateTime())){
+                        recordsVo.setTime(l.getCreateTime());
                     }
-                    recordsVo.setTime(l.getCreateTime());
+
                     if (CollectionUtils.isNotEmpty(yarnCabinetStateEqus)) {
                         Optional<Equipment> opt = yarnCabinetStateEqus.stream().filter(ya -> Objects.equals(ya.getDeviceId(), l.getDevice())).findFirst();
@@ -11,9 +11,14 @@ import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationQueryDTO;
 import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationUpdateDTO;
 import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationUpdateStatusDTO;
 import com.ruoyi.domain.key.location.vo.LinggangKeyWorkLocationVO;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 @RestController
 @Api(tags = "钥匙存放地址")
@@ -31,6 +37,8 @@ import java.util.List;
 public class LinggangKeyWorkLocationController extends BaseController {
     @Autowired
     private LinggangKeyWorkLocationService linggangKeyWorkLocationService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
     @ApiOperation("分页查询")
     @PreAuthorize("@ss.hasPermi('linggang:key:work:location:list:limit:page:limit')")
@@ -105,6 +113,35 @@ public class LinggangKeyWorkLocationController extends BaseController {
         return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
+    private LinggangScheduling queryScheduling(LinggangKeyWorkLocationUpdateStatusDTO request){
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setJobCode(request.getJobCode());
+        scheduling.setStartScheduleDate(DateUtil.shortDate(request.getScheduleDate()));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),1));
+
+        List<LinggangScheduling> schedulings = schedulingService.list(scheduling);
+        int size = CollectionUtils.size(schedulings);
+
+        if(size > 1){
+           Optional<LinggangScheduling> optional = schedulings.stream().filter(sc->request.getScheduleDate().getTime()-sc.getFcsjT()<300000).findFirst();
+           if(optional.isPresent()){
+               return optional.get();
+           }
+            optional = schedulings.stream().filter(sc->request.getScheduleDate().getTime()-sc.getZdsjT()<300000).findFirst();
+            if(optional.isPresent()){
+                return optional.get();
+            }
+
+
+        }
+        if(0 == size){
+            return null;
+        }else if(1 == size){
+            return schedulings.get(0);
+        }
+        return null;
+    }
+
     private LinggangKeyWorkLocation convert(LinggangKeyWorkLocationQueryDTO source) {
         return java.util.Optional.ofNullable(source).map(sc -> {
             LinggangKeyWorkLocation target = new LinggangKeyWorkLocation();
@@ -68,6 +68,14 @@ public class LinggangKeyWorkLocationAddDTO implements java.io.Serializable {
     @ApiModelProperty(value = "操作人员")
     private String operator;
+    @ApiModelProperty(value = "钥匙编号", example = "1")
+    private String keyCode;
+
+    @ApiModelProperty(value="排班人员")
+    private String jobCode;
+    @ApiModelProperty(value="场站编码")
+    private String yardCode;
+
     @Override
     public String toString() {
@@ -56,6 +56,8 @@ public class LinggangKeyWorkLocationQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value="排班ID")
     private Long schedulingId;
+
+
     /***状态：1 是归还；0是借出*/
     @Excel(name = "状态：1 是归还；0是借出")
     private java.lang.Integer type;
@@ -64,6 +66,14 @@ public class LinggangKeyWorkLocationQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value="排班时间")
     private java.util.Date scheduleDate;
+    @ApiModelProperty(value = "钥匙编号", example = "1")
+    private String keyCode;
+
+    @ApiModelProperty(value="排班人员")
+    private String jobCode;
+    @ApiModelProperty(value="场站编码")
+    private String yardCode;
+
     @Override
     public String toString() {
@@ -67,6 +67,14 @@ public class LinggangKeyWorkLocationUpdateDTO implements java.io.Serializable {
     @ApiModelProperty(value = "操作人员")
     private String operator;
+    @ApiModelProperty(value = "钥匙编号", example = "1")
+    private String keyCode;
+
+    @ApiModelProperty(value="排班人员")
+    private String jobCode;
+    @ApiModelProperty(value="场站编码")
+    private String yardCode;
+
     @Override
     public String toString() {
@@ -67,6 +67,14 @@ public class LinggangKeyWorkLocationUpdateStatusDTO implements java.io.Serializa
     @ApiModelProperty(value = "操作人员")
     private String operator;
+    @ApiModelProperty(value = "钥匙编号", example = "1")
+    private String keyCode;
+
+    @ApiModelProperty(value="排班人员")
+    private String jobCode;
+    @ApiModelProperty(value="场站编码")
+    private String yardCode;
+
     @Override
     public String toString() {
@@ -68,6 +68,14 @@ public class LinggangKeyWorkLocationVO implements java.io.Serializable {
     @ApiModelProperty(value = "排班ID")
     private Long schedulingId;
+    @ApiModelProperty(value = "钥匙编号", example = "1")
+    private String keyCode;
+
+    @ApiModelProperty(value="排班人员")
+    private String jobCode;
+    @ApiModelProperty(value="场站编码")
+    private String yardCode;
+
     @Override
     public String toString() {
@@ -153,6 +153,10 @@ public class LinggangScheduling {
     private Date  startScheduleDate;
     @TableField(exist = false)
     private Date  endScheduleDate;
+    @TableField(exist = false)
+    private long fcsjTVal;
+    @TableField(exist = false)
+    private long zdsjTVal;
     public String getCheZhanCode(){
         return StringUtils.join(qdzcode,"@",zdzcode,"@",jobCode,"@");