`添加排班、添加查询`

ruoyi-admin/src/main/resources/application-dev.yml

@@ -241,8 +241,8 @@ justauth:
       client-secret: 079494f2fa6ecdc47c46f872bae769e7
       redirect-uri: ${justauth.address}/social-callback?source=wechat_mini_program
     wechat_mini_program_1:
-      client-id: wx01
-      client-secret: 079494f2fa6ecdc47c46f872bae769e7
+      client-id: wx5c9baacf2aab55b8
+      client-secret: 09b62981f58c2aa01b06cff12a5abd76
       redirect-uri: ${justauth.address}/social-callback?source=wechat_mini_program_1
     wechat_enterprise:
       client-id: 10**********6

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/controller/TblDzbcOrderController.java

@@ -3,6 +3,7 @@ package org.dromara.system.controller;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
@@ -64,6 +65,9 @@ public class TblDzbcOrderController extends BaseController {
 
     @GetMapping("/list")
     public TableDataInfo<TblDzbcOrderVo> list(TblDzbcOrderBo bo, PageQuery pageQuery) {
+        if(!LoginHelper.getLoginUser().getRoles().stream().map(i->i.getRoleName()).collect(Collectors.joining(",")).contains("定制班车-管理员")){
+            bo.setUserId(LoginHelper.getUserId());
+        }
         return tblDzbcOrderService.queryPageList(bo, pageQuery);
     }
 

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/TblDzbcCar.java

@@ -62,5 +62,7 @@ public class TblDzbcCar extends BaseEntity {
      */
     private String ext2;
 
+    private Long kyzId;
+
 
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/bo/TblDzbcCarBo.java

@@ -68,5 +68,6 @@ public class TblDzbcCarBo extends BaseEntity {
     //@NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;
 
+    private Long kyzId;
 
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/vo/TblDzbcCarVo.java

@@ -76,5 +76,6 @@ public class TblDzbcCarVo implements Serializable {
     @ExcelProperty(value = "扩展2")
     private String ext2;
 
+    private Long kyzId;
 
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcCarServiceImpl.java

@@ -63,6 +63,7 @@ public class TblDzbcCarServiceImpl implements ITblDzbcCarService {
         LambdaQueryWrapper<TblDzbcCar> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getCarNum()), TblDzbcCar::getCarNum, bo.getCarNum());
         lqw.eq(bo.getCarZw() != null, TblDzbcCar::getCarZw, bo.getCarZw());
+        lqw.eq(bo.getKyzId() != null, TblDzbcCar::getKyzId, bo.getKyzId());
         lqw.eq(StringUtils.isNotBlank(bo.getGps()), TblDzbcCar::getGps, bo.getGps());
         lqw.eq(bo.getDriverId() != null, TblDzbcCar::getDriverId, bo.getDriverId());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblDzbcCar::getExt1, bo.getExt1());

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcOrderServiceImpl.java

@@ -90,6 +90,7 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblDzbcOrder> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), TblDzbcOrder::getName, bo.getName());
+        lqw.eq(bo.getId() != null, TblDzbcOrder::getId, bo.getId());
         lqw.eq(bo.getUserId() != null, TblDzbcOrder::getUserId, bo.getUserId());
         lqw.eq(bo.getSchedulingId() != null, TblDzbcOrder::getSchedulingId, bo.getSchedulingId());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), TblDzbcOrder::getStatus, bo.getStatus());
@@ -97,6 +98,12 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getEndInfo()), TblDzbcOrder::getEndInfo, bo.getEndInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblDzbcOrder::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblDzbcOrder::getExt2, bo.getExt2());
+
+        if(params!=null && params.containsKey("kyzId")){
+            String datasql = "( select id from tbl_dzbc_car where kyz_id = "+bo.getParams().get("kyzId").toString()+")";
+            lqw.apply(StringUtils.format(" scheduling_id in {}", datasql));
+        }
+
         return lqw;
     }
 

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/util/ScheduleCarUtil.java

@@ -0,0 +1,51 @@
+package org.dromara.system.util;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.system.domain.bo.TblDzbcPathSchedulingBo;
+import org.dromara.system.domain.vo.TblDzbcPathSchedulingVo;
+import org.dromara.system.service.ISysUserService;
+import org.dromara.system.service.ITblDzbcPathSchedulingService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class ScheduleCarUtil {
+
+    @Scheduled(cron = "0 10 0 ? * ? ")
+    public void doSchedule() {
+        //获取所有自动排班标记的路线
+        TblDzbcPathSchedulingBo bo = new TblDzbcPathSchedulingBo();
+        bo.setIsauto(1);
+        List<TblDzbcPathSchedulingVo> list = SpringUtils.getBean(ITblDzbcPathSchedulingService.class).queryList(bo);
+        Map<Long, TblDzbcPathSchedulingVo> map = new HashMap<>();
+        for (TblDzbcPathSchedulingVo vo : list) {
+            if(map.containsKey(vo.getPathId())){
+                TblDzbcPathSchedulingVo vo1 = map.get(vo.getPathId());
+                if(vo1.getMdate().getTime()<vo.getMdate().getTime()){
+                    map.put(vo.getPathId(),vo);
+                }
+            }else{
+                map.put(vo.getPathId(),vo);
+            }
+        }
+        map.values().stream().forEach(vo->{
+            TblDzbcPathSchedulingBo bo1 = new TblDzbcPathSchedulingBo();
+            bo1.setMdate(DateUtil.offsetDay(vo.getMdate(), 1));
+            bo1.setPathId(vo.getPathId());
+            bo1.setExt1(vo.getExt1());
+            bo1.setCarId(vo.getCarId());
+            bo1.setPprice(vo.getPprice());
+            bo1.setIsauto(1);
+            SpringUtils.getBean(ITblDzbcPathSchedulingService.class).insertByBo(bo1);
+        });
+
+
+    }
+}