移动端插件权限、移动端简易订单-车辆预定审核通过后3日定时自动解锁

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author dimengzhe
@@ -13,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.common.base.config",
         "com.yxt.anrui.buscenter"
 })
+@EnableScheduling
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin"})
 public class BusCenterApplication {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
+import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -72,4 +73,6 @@ public interface BusDepositVehicleMapper extends BaseMapper<BusDepositVehicle> {
 
 
     int selByUserSid(@Param("createBySid") String createBySid);
+
+    List<BusMainDeposit> selectListByState(@Param("date") String tomorrow,@Param("nodeState") String nodeState, @Param("key") String key);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml

@@ -87,4 +87,12 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <select id="selectListByState" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit">
+        select *
+        from bus_main_deposit
+        where nodeState = #{nodeState}
+          and depositBillTypeKey = #{key}
+          and DATE_FORMAT(modifyTime, '%Y-%m-%d') = #{date}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
@@ -296,6 +297,12 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         return new ResultBean<AppBusDepositVehicleDetailVo>().success().setData(vo);
     }
 
+    public List<BusMainDeposit> selectListByState(String tomorrow) {
+        String nodeState = "已办结";
+        String key = DictCommonEnum.DepositBillType.JYDD_DC.getCode();
+        return baseMapper.selectListByState(tomorrow, nodeState,key);
+    }
+
    /* public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderVehicleDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //根据用户sid获取staffSid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java

@@ -0,0 +1,76 @@
+package com.yxt.anrui.buscenter.biz.busdepositvehicle;
+
+import cn.hutool.core.date.DateUtil;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
+import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailVo;
+import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo;
+import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/8 13:37
+ * @Description
+ */
+@Component
+public class ScheduledService {
+
+    @Autowired
+    private BusDepositVehicleService busDepositVehicleService;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+
+    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0/5 12 * * ?")
+    public void remindVehicle() {
+        Date now = new Date();
+        //获取当前时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //得到今天凌晨时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(now);
+        //+1今天的时间加一天
+        calendar.add(Calendar.DAY_OF_MONTH, -4);
+        String tomorrow = sdf.format(calendar.getTime());
+        //查询简易订单-车辆预定中
+        //查询修改日期包含该日期的已经通过的简易订车单
+        List<BusMainDeposit> strList = busDepositVehicleService.selectListByState(tomorrow);
+        for (BusMainDeposit strDeposit : strList) {
+            String sid = strDeposit.getSid();
+            AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(sid).getData();
+            List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinSidList(list);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+        }
+    }
+
+
+    public static void main(String[] args) {
+        String today = DateUtil.today();
+        Date now = new Date();
+        //获取当前时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //得到今天凌晨时间
+        String nowStr = sdf.format(now) + " 00:00:00";
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(now);
+        //+1今天的时间加一天
+        calendar.add(Calendar.DAY_OF_MONTH, -4);
+        String tomorrow = sdf.format(calendar.getTime());
+        System.out.println(tomorrow);
+
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -136,4 +137,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("name") String name);
 
     String selectNum(String bill);
+
+    int updateModify(@Param("date") Date date, @Param("sid") String businessSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -342,4 +342,8 @@
         order by id desc
             limit 1
     </select>
+
+    <update id="updateModify">
+        update bus_main_deposit set modifyTime = #{date} where sid = #{sid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1997,6 +1997,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 messageFlowableQuery.setMsgTitle("简易订单");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
+                //更新修改时间
+                baseMapper.updateModify(new Date(),bv.getBusinessSid());
                 //如果类型为订金，推送款项确认
                 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
                     BusDeposit busDeposit = busDepositService.selectByBillSid(bv.getBusinessSid());

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@@ -25,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description
@@ -93,39 +90,14 @@ public class AppIndexRest implements AppIndexFeign {
         //查询用户的权限
         //查询该用户是否有权限
         List<String> stringList = sysMobileMenuRoleService.selectAppSidList(userSid);
-//        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path);
-        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionListOne(linkSid, path,stringList);
-        subsetVersionVoList.stream().forEach(item -> {
-            /*if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
-                //供应链
-                ResultBean<AppScmBaseInfoVo> indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
-                int count = 0;
-                if (indexCountVo.getSuccess()) {
-                    AppScmBaseInfoVo appScmBaseInfoVo = indexCountVo.getData();
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectedCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getInspectedCarNum()).intValue();
-                    }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectinoCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getInspectinoCarNum()).intValue();
-                    }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getMoveCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getMoveCarNum()).intValue();
-                    }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getStorageCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getStorageCarNum()).intValue();
-                    }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInventoryCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getInventoryCarNum()).intValue();
-                    }
-                }
-//                item.setCornerNum(String.valueOf(count));
+        List<AppSubsetVersionVo> subsetVersionVoList = new ArrayList<>();
+        if(!stringList.isEmpty()){
+            subsetVersionVoList = appSubsetVersionService.selectVersionListOne(linkSid, path,stringList);
+            subsetVersionVoList.stream().forEach(item -> {
                 item.setCornerNum("");
-            } else {
-                item.setCornerNum("");
-            }*/
-            item.setCornerNum("");
+            });
+        }
 
-        });
         map.put("apps", subsetVersionVoList);
 
         // 轮播图