From 01095ce445edb1bd442b8a4d4c438c9f9bdf6f5d Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 28 May 2025 12:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E6=9D=90=E8=BF=9B=E9=94=80=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/controller/BoxesBookingController.java | 13 +++++++++++++
 .../pjcloud/canteen/job/BoxesAvaliabilityJob.java  |  2 +-
 .../impl/CanteenErpMaterialServiceImpl.java        |  3 +++
 .../src/main/resources/application.yml             | 14 +++++++-------
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java
index 39ccf9ac2..3bd78aa15 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.boxes.admin.BokingPageDTO;
+import com.bsd.pjcloud.canteen.job.BoxesAvaliabilityJob;
 import com.bsd.pjcloud.canteen.vo.AppMakeSaveReqVO;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
@@ -47,6 +48,9 @@ public class BoxesBookingController {
 
     private final  BoxesBookingService boxesBookingService;
 
+
+    private final BoxesAvaliabilityJob batchAvaliabilityJob;
+
     /**
      * 分页查询
      * @param page 分页对象
@@ -157,6 +161,15 @@ public class BoxesBookingController {
 
     }
 
+
+
+    @Operation(summary = "同步包厢时间" , description = "同步包厢时间" )
+    @GetMapping("/anscyJob" )
+    public R getById() {
+        batchAvaliabilityJob.avaliabilityJobHandler();
+        return R.ok();
+    }
+
 //-------------app------------------
 //    @GetMapping("/getMyBookingPage")
 //    @Operation(summary = "获得我的预约包厢信息")
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java
index 82fe613c8..5f841de50 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java
@@ -26,7 +26,7 @@ public class BoxesAvaliabilityJob {
 
     private final BoxesAvailabilityMapper boxesAvailabilityMapper;
     @XxlJob("avaliabilityJobHandler")
-    public void demoJobHandler() {
+    public void avaliabilityJobHandler() {
         //查询所有包厢
         List<BoxesInfoEntity> rooms = boxesInfoMapper.selectList(null);
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java
index c4caac5cd..5187415ae 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java
@@ -45,6 +45,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl<CanteenErpMateria
         canteenErpMaterialEntity.setUnit(canteenErpMaterialSaveDTO.getUnit());
         canteenErpMaterialEntity.setDeptId(deptId);
         canteenErpMaterialEntity.setPurchasePrice(canteenErpMaterialSaveDTO.getPurchasePrice());
+        canteenErpMaterialEntity.setCategoryId(canteenErpMaterialSaveDTO.getCategoryId());
         int insert = baseMapper.insert(canteenErpMaterialEntity);
         CanteenStockEntity canteenStockEntity = new CanteenStockEntity();
         canteenStockEntity.setItemType("1");
@@ -66,6 +67,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl<CanteenErpMateria
         canteenErpMaterialEntity.setName(canteenErpMaterialEditorDTO.getName());
         canteenErpMaterialEntity.setUnit(canteenErpMaterialEditorDTO.getUnit());
         canteenErpMaterialEntity.setPurchasePrice(canteenErpMaterialEditorDTO.getPurchasePrice());
+        canteenErpMaterialEntity.setCategoryId(canteenErpMaterialEditorDTO.getCategoryId());
 
         LambdaQueryWrapper<CanteenStockEntity> canteenStockEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
         canteenStockEntityLambdaQueryWrapper.eq(CanteenStockEntity::getItemId, id);
@@ -105,6 +107,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl<CanteenErpMateria
         canteenErpMaterialVO.setInventoryLowerLimit(sourceCanteenStockEntity.getInventoryLowerLimit());
         canteenErpMaterialVO.setCurrentStock(sourceCanteenStockEntity.getCurrentStock());
         canteenErpMaterialVO.setPurchasePrice(canteenErpMaterialEntity.getPurchasePrice());
+        canteenErpMaterialVO.setCategoryId(canteenErpMaterialEntity.getCategoryId());
         return canteenErpMaterialVO;
     }
 
diff --git a/pjcloud-visual/pjcloud-xxl-job-admin/src/main/resources/application.yml b/pjcloud-visual/pjcloud-xxl-job-admin/src/main/resources/application.yml
index 3ac9d6cb4..3d9b491ae 100644
--- a/pjcloud-visual/pjcloud-xxl-job-admin/src/main/resources/application.yml
+++ b/pjcloud-visual/pjcloud-xxl-job-admin/src/main/resources/application.yml
@@ -21,13 +21,13 @@ spring:
     import:
       - optional:nacos:application-@profiles.active@.yml
       - optional:nacos:${spring.application.name}-@profiles.active@.yml
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: ${MYSQL_USER:root@sys}
-      password: ${MYSQL_PWD:bsd.1799}
-      url: jdbc:mysql://${MYSQL_HOST:pjcloud-mysql}:${MYSQL_PORT:2881}/${MYSQL_DB:pjcloudx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    druid:
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      username: ${MYSQL_USER:root@sys}
+#      password: ${MYSQL_PWD:bsd.1799}
+#      url: jdbc:mysql://${MYSQL_HOST:pjcloud-mysql}:${MYSQL_PORT:2881}/${MYSQL_DB:pjcloudx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
   mvc:
     static-path-pattern: /static/**
   freemarker: