list = morningInspectionDetailService.getByCheckInId(checkInId);
+ return success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated({AddGroup.class}) MorningInspectionDetailVO morningInspectionDetailVO){
+ return morningInspectionDetailService.saveVO(morningInspectionDetailVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated({UpdateGroup.class}) MorningInspectionDetailVO morningInspectionDetailVO){
+ return morningInspectionDetailService.updateVO(morningInspectionDetailVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long morningDetailId){
+ if(morningDetailId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勬櫒妫鏄庣粏");
+ }
+ return morningInspectionDetailService.deleteWithId(morningDetailId);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java
new file mode 100644
index 0000000..ae8152f
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java
@@ -0,0 +1,56 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IRubbishDealService;
+import com.zf.foodpurchase.fdsafe.vo.RubbishDealVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍘ㄤ綑鍨冨溇澶勭悊琛 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-12
+ */
+@RestController
+@RequestMapping("/rubbishDeal")
+public class RubbishDealController extends BaseController {
+
+ @Autowired
+ private IRubbishDealService rubbishDealService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(RubbishDealVO rubbishDealVO) {
+ startPage();
+ List list = rubbishDealService.queryRubbishDealVO(rubbishDealVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@Validated(AddGroup.class) @RequestBody RubbishDealVO rubbishDealVO) {
+ return rubbishDealService.saveVO(rubbishDealVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody RubbishDealVO rubbishDealVO) {
+ return rubbishDealService.updateVO(rubbishDealVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer dealId) {
+ if(dealId == null){
+ return error("璇烽夋嫨瑕佸垹闄ょ殑鍘ㄤ綑鍨冨溇澶勭悊璁板綍");
+ }
+ return rubbishDealService.deleteWithId(dealId);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java
new file mode 100644
index 0000000..6323470
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java
@@ -0,0 +1,65 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISchoolCartItemService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolCartItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 瀛︽牎璐墿杞 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-23
+ */
+@RestController
+@RequestMapping("/schoolCartItem")
+public class SchoolCartItemController extends BaseController {
+
+ @Autowired
+ private ISchoolCartItemService schoolCartItemService;
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SchoolCartItemVO schoolCartItemVO) {
+ startPage();
+ List list = schoolCartItemService.querySchoolCartItemVO(schoolCartItemVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) SchoolCartItemVO schoolCartItemVO) {
+ if(schoolCartItemVO == null){
+ return error("鏈寚瀹氳娣诲姞鐨勮喘鐗╅」");
+ }
+ return schoolCartItemService.saveVO(schoolCartItemVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup .class) SchoolCartItemVO schoolCartItemVO) {
+ if(schoolCartItemVO == null || schoolCartItemVO.getCartItemId() == null){
+ return error("鏈寚瀹氳淇敼鐨勮喘鐗╅」");
+ }
+ return schoolCartItemService.updateVO(schoolCartItemVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long cartItemId) {
+ if(cartItemId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勮喘鐗╅」");
+ }
+ boolean result = schoolCartItemService.removeById(cartItemId);
+ return result ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+
+
+}
+
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java
new file mode 100644
index 0000000..e9da240
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java
@@ -0,0 +1,54 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.utils.DateUtils;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISchoolService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author:lilj
+ * @date:2025/4/10
+ */
+@RestController
+@RequestMapping("/school")
+public class SchoolController extends BaseController {
+
+ @Autowired
+ private ISchoolService schoolService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SchoolVO schoolVO){
+ startPage();
+ List list = schoolService.querySchoolList(schoolVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) SchoolVO schoolVO){
+ return schoolService.saveVO(schoolVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) SchoolVO schoolVO){
+ return schoolService.updateVO(schoolVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer schoolId){
+ if(schoolId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勫鏍");
+ }
+ return schoolService.removeById(schoolId) ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java
new file mode 100644
index 0000000..4b3ae73
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java
@@ -0,0 +1,90 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderItemService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderService;
+import com.zf.foodpurchase.fdsafe.vo.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-24
+ */
+@RestController
+@RequestMapping("/schoolOrder")
+public class SchoolOrderController extends BaseController {
+
+ @Autowired
+ private ISchoolOrderService schoolOrderService;
+
+ @Autowired
+ private ISchoolOrderItemService schoolOrderItemService;
+
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SchoolOrderVO schoolOrderVO) {
+ startPage();
+ List list = schoolOrderService.querySchoolOrderVO(schoolOrderVO);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鎻愪氦璁㈠崟:
+ * 1.鏍￠獙:鍟嗗搧鏈夋晥鎬ф牎楠,璁㈠崟閲戦鏍￠獙
+ * 2.璁㈠崟鍏ュ簱:璁㈠崟琛,璁㈠崟璇︽儏琛,璐墿杞﹁〃
+ * 3.璁㈠崟鍏ュ簱鎴愬姛鍚,鍒犻櫎璐墿杞﹂」
+ * @param submitOrderVO
+ * @return
+ */
+ @PostMapping("/submitOrder")
+ public AjaxResult submitOrder(@RequestBody @Valid SchoolSubmitOrderVO submitOrderVO) {
+ return schoolOrderService.submitOrder(submitOrderVO);
+ }
+
+ /**
+ * 鍙栨秷璁㈠崟
+ */
+ @PostMapping("/cancelOrder")
+ public AjaxResult cancelOrder(@RequestBody @Valid SchoolCancelOrderVO cancelOrderVO) {
+ return schoolOrderService.cancelOrder(cancelOrderVO);
+ }
+
+ /**
+ * 璁㈠崟澶囨敞淇敼
+ */
+ @PostMapping("/updateOrderRemark")
+ public AjaxResult updateOrderRemark(@RequestBody @Valid SchoolModifyOrderRemarkVO remarkVO) {
+ return schoolOrderService.updateOrderRemark(remarkVO);
+ }
+
+ /**
+ * 璁㈠崟瀛愰」鏌ヨ
+ */
+ @GetMapping("/queryOrderItem")
+ public AjaxResult queryOrderItem(String orderNo) {
+ SchoolOrderItemVO schoolOrderVO = new SchoolOrderItemVO();
+ schoolOrderVO.setOrderNo(orderNo);
+ List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderVO);
+ return success(list);
+ }
+
+ /**
+ * 渚涜揣鍟嗘帴鍗
+ */
+ @GetMapping("/supplierAcceptOrder")
+ public AjaxResult supplierAcceptOrder(@Validated SupplierAcceptOrderVO supplierAcceptOrderVO) {
+ return schoolOrderService.supplierAcceptOrder(supplierAcceptOrderVO);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java
new file mode 100644
index 0000000..fb6dca5
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java
@@ -0,0 +1,44 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.fdsafe.entity.SchoolOrderItem;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderItemService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolOrderItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-24
+ */
+@RestController
+@RequestMapping("/schoolOrderItem")
+public class SchoolOrderItemController extends BaseController {
+ @Autowired
+ private ISchoolOrderItemService schoolOrderItemService;
+
+ @GetMapping("/list")
+ public AjaxResult list(SchoolOrderItemVO schoolOrderItemVO) {
+ List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderItemVO);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SchoolOrderItemVO schoolOrderItemVO) {
+ startPage();
+ List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderItemVO);
+ return getDataTable(list);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java
new file mode 100644
index 0000000..8292156
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java
@@ -0,0 +1,89 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.entity.SchoolRefund;
+import com.zf.foodpurchase.fdsafe.service.ISchoolRefundItemService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolRefundService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolService;
+import com.zf.foodpurchase.fdsafe.vo.RefundCheckVO;
+import com.zf.foodpurchase.fdsafe.vo.RefundItemAddUpdateVO;
+import com.zf.foodpurchase.fdsafe.vo.SchoolRefundItemVO;
+import com.zf.foodpurchase.fdsafe.vo.SchoolRefundVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-28
+ */
+@RestController
+@RequestMapping("/schoolRefund")
+public class SchoolRefundController extends BaseController {
+ @Autowired
+ private ISchoolRefundItemService schoolRefundItemService;
+
+ @Autowired
+ private ISchoolRefundService schoolRefundService;
+
+ // 鏌ヨ鎺ュ彛,鏍规嵁閫娆炬诲崟鍙锋煡璇
+ @GetMapping("/querySchoolRefund")
+ public TableDataInfo querySchoolRefund(SchoolRefundVO schoolRefundVO) {
+ startPage();
+ List schoolRefunds = schoolRefundService.querySchoolRefund(schoolRefundVO);
+ return getDataTable(schoolRefunds);
+ }
+
+ // 鏌ヨ璇︽儏
+ @GetMapping("/querySchoolRefundDetail")
+ public AjaxResult querySchoolRefundDetail(String refundNo) {
+ if(StringUtils.isBlank(refundNo)){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List refundItems = schoolRefundItemService.queryRefundItem(refundNo);
+ return AjaxResult.success(refundItems);
+ }
+
+ /**
+ * 鍑犱釜瀛楁:
+ * 1.瀛愬崟缂栧彿
+ * 2.閫璐у師鍥
+ * 3.閫璐ф暟閲
+ * @param refundItemAddUpdateVO
+ * @return
+ */
+ @PostMapping("/addRefundItem")
+ public AjaxResult addRefundItem(@RequestBody @Validated(AddGroup.class) RefundItemAddUpdateVO refundItemAddUpdateVO) {
+ return schoolRefundItemService.addRefundItem(refundItemAddUpdateVO);
+ }
+
+ /**
+ * 淇敼閫娆鹃」
+ */
+ @PostMapping("/updateRefundItem")
+ public AjaxResult updateRefundItem(@RequestBody @Validated(UpdateGroup.class) RefundItemAddUpdateVO refundItemAddUpdateVO) {
+ return schoolRefundItemService.updateRefundItem(refundItemAddUpdateVO);
+ }
+
+ /**
+ * 閫璐у崟瀹℃牳
+ */
+ @PostMapping("/checkSchoolRefund")
+ public AjaxResult checkSchoolRefund(@RequestBody @Valid RefundCheckVO checkVO) {
+ return schoolRefundService.checkSchoolRefund(checkVO);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundItemController.java
new file mode 100644
index 0000000..5412c95
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundItemController.java
@@ -0,0 +1,23 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-28
+ */
+@RestController
+@RequestMapping("/schoolRefundItem")
+public class SchoolRefundItemController {
+
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java
new file mode 100644
index 0000000..ab71804
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java
@@ -0,0 +1,97 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.constant.OrderStatusConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolSettleService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolOrderVO;
+import com.zf.foodpurchase.fdsafe.vo.SchoolSettleCheckVO;
+import com.zf.foodpurchase.fdsafe.vo.SchoolSettleSubmitVO;
+import com.zf.foodpurchase.fdsafe.vo.SchoolSettleVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 缁撶畻鍗 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-05-06
+ */
+@RestController
+@RequestMapping("/schoolSettle")
+public class SchoolSettleController extends BaseController {
+ @Autowired
+ private ISchoolOrderService schoolOrderService;
+
+ @Autowired
+ private ISchoolSettleService schoolSettleService;
+
+ /**
+ * 鏌ヨ鍙粨绠楄鍗
+ */
+ @GetMapping("/queryCanSettleOrder")
+ public TableDataInfo queryCanSettleOrder(SchoolOrderVO schoolOrderVO) {
+ startPage();
+ schoolOrderVO.setOrderSettleStatus(OrderStatusConstants.CAN_SETTLEMENT);
+ List list = schoolOrderService.querySchoolOrderVO(schoolOrderVO);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鍙戣捣璁㈠崟缁撶畻
+ */
+ @PostMapping("/submitSettle")
+ public AjaxResult submitSettle(@RequestBody @Valid SchoolSettleSubmitVO submitVO) {
+ return schoolSettleService.submitSettle(submitVO);
+ }
+
+ /**
+ * 璁㈠崟缁撶畻瀹℃牳
+ */
+ @PostMapping("/checkSettle")
+ public AjaxResult checkSettle(@RequestBody @Valid SchoolSettleCheckVO checkVO) {
+ return schoolSettleService.checkSettle(checkVO);
+ }
+
+ /**
+ * 瀛︽牎缁撶畻鍗曟敮浠樼姸鎬佹洿鏂
+ */
+ @GetMapping("/updateSettlePayStatus")
+ public AjaxResult updateSettlePayStatus(String settleNo) {
+ if(StringUtils.isEmpty(settleNo)){
+ return AjaxResult.warn("缁撶畻鍗曞彿涓嶈兘涓虹┖");
+ }
+ return schoolSettleService.updateSettlePayStatus(settleNo);
+ }
+
+ /**
+ * 渚涜揣鍟嗙粨绠楀崟鏀舵纭
+ */
+ @GetMapping("/updateSettleConfirmStatus")
+ public AjaxResult updateSettleConfirmStatus(String settleNo) {
+ if(StringUtils.isEmpty(settleNo)){
+ return AjaxResult.warn("缁撶畻鍗曞彿涓嶈兘涓虹┖");
+ }
+ return schoolSettleService.updateSettleConfirmStatus(settleNo);
+ }
+
+ /**
+ * 缁撶畻鍗曟煡璇㈡帴鍙
+ */
+ @GetMapping("/querySettleList")
+ public TableDataInfo querySettleList(SchoolSettleVO settleVO) {
+ startPage();
+ List list = schoolSettleService.qeurySettleVO(settleVO);
+ return getDataTable(list);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java
new file mode 100644
index 0000000..af5e2ff
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java
@@ -0,0 +1,69 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISchoolStaffService;
+import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
+import com.zf.foodpurchase.fdsafe.vo.SchoolStaffVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-11
+ */
+@RestController
+@RequestMapping("/schoolStaff")
+public class SchoolStaffController extends BaseController {
+ @Autowired
+ private ISchoolStaffService schoolStaffService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SchoolStaffVO schoolStaffVO) {
+ startPage();
+ List list = schoolStaffService.querySchoolStaffVO(schoolStaffVO);
+ if(!CollectionUtils.isEmpty(list)){
+ list.forEach(item->{
+ item.setHealthCertImg(ArrayStringUtils.stringToArray(item.getHealthCertImgStr()));
+ });
+ }
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@Validated(AddGroup.class) @RequestBody SchoolStaffVO schoolStaffVO) {
+ return schoolStaffService.saveVO(schoolStaffVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody SchoolStaffVO schoolStaffVO) {
+ return schoolStaffService.updateVO(schoolStaffVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer staffId) {
+ if(staffId == null){
+ return error("璇烽夋嫨瑕佸垹闄ょ殑瀛︽牎浜哄憳");
+ }
+ boolean flag = schoolStaffService.removeById(staffId);
+ return flag ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolTypeController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolTypeController.java
new file mode 100644
index 0000000..4e5a2a3
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolTypeController.java
@@ -0,0 +1,56 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.entity.SchoolType;
+import com.zf.foodpurchase.fdsafe.service.ISchoolTypeService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolTypeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author:lilj
+ * @date:2025/4/11
+ */
+@RestController
+@RequestMapping("/schoolType")
+public class SchoolTypeController extends BaseController {
+
+ @Autowired
+ private ISchoolTypeService schoolTypeService;
+
+ @GetMapping("/list")
+ public AjaxResult list(SchoolTypeVO schoolTypeVO){
+ List list = schoolTypeService.querySchoolTypeVO(schoolTypeVO);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SchoolTypeVO schoolTypeVO){
+ startPage();
+ List list = schoolTypeService.querySchoolTypeVO(schoolTypeVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@Validated(AddGroup.class) @RequestBody SchoolTypeVO schoolTypeVO){
+ return schoolTypeService.saveVO(schoolTypeVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody SchoolTypeVO schoolTypeVO){
+ return schoolTypeService.updateVO(schoolTypeVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer schoolTypeId){
+ boolean flag = schoolTypeService.removeById(schoolTypeId);
+ return flag ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionDetailController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionDetailController.java
new file mode 100644
index 0000000..aaeb87f
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionDetailController.java
@@ -0,0 +1,29 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.fdsafe.service.ISelfInspectionDetailService;
+import com.zf.foodpurchase.fdsafe.vo.SelfInspectionDetailVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author:lilj
+ * @date:2025/4/16
+ */
+@RestController
+@RequestMapping("/selfInspectionDetail")
+public class SelfInspectionDetailController {
+
+ @Autowired
+ private ISelfInspectionDetailService selfInspectionDetailService;
+
+ @GetMapping("/getDetail")
+ public AjaxResult getDetail(Long selfRecordId){
+ List list = selfInspectionDetailService.getDetail(selfRecordId);
+ return AjaxResult.success(list);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java
new file mode 100644
index 0000000..716fcef
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java
@@ -0,0 +1,57 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISelfInspectionRecordService;
+import com.zf.foodpurchase.fdsafe.vo.SelfInspectionDetailVO;
+import com.zf.foodpurchase.fdsafe.vo.SelfInspectionRecordVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-15
+ */
+@RestController
+@RequestMapping("/selfInspectionRecord")
+public class SelfInspectionRecordController extends BaseController {
+
+ @Autowired
+ private ISelfInspectionRecordService selfInspectionRecordService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SelfInspectionRecordVO selfInspectionRecordVO) {
+ startPage();
+ List list = selfInspectionRecordService.querySelfInspectionRecordVO(selfInspectionRecordVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) SelfInspectionRecordVO selfInspectionRecordVO) {
+ return selfInspectionRecordService.saveVO(selfInspectionRecordVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) SelfInspectionRecordVO selfInspectionRecordVO) {
+ return selfInspectionRecordService.updateVO(selfInspectionRecordVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long selfRecordId) {
+ if(selfRecordId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勮嚜妫璁板綍");
+ }
+ return selfInspectionRecordService.deleteWithId(selfRecordId);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/WxAppUserController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/WxAppUserController.java
new file mode 100644
index 0000000..a34a013
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/WxAppUserController.java
@@ -0,0 +1,89 @@
+package com.zf.foodpurchase.fdsafe.web.school;
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.SysUser;
+import com.zf.foodpurchase.common.core.domain.model.LoginUser;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.utils.SecurityUtils;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.entity.WxAppUser;
+import com.zf.foodpurchase.fdsafe.service.IWxAppUserService;
+import com.zf.foodpurchase.fdsafe.vo.WxAppUserViewVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author:lilj
+ * @date:2025/5/13
+ */
+@RequestMapping("/wxAppUser")
+@RestController
+public class WxAppUserController extends BaseController {
+
+ @Autowired
+ private IWxAppUserService wxAppUserService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(WxAppUserViewVO wxAppUserViewVO) {
+ startPage();
+ SysUser loginUser = getLoginUser().getUser();
+ if (!loginUser.isAdmin()) {
+ wxAppUserViewVO.setAccountType(loginUser.getAccountType());
+ wxAppUserViewVO.setDeptId(loginUser.getDeptId().intValue());
+ }
+ List list = wxAppUserService.pageList(wxAppUserViewVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) WxAppUserViewVO wxAppUserViewVO) {
+ SysUser loginUser = getLoginUser().getUser();
+ if (!loginUser.isAdmin()) {
+ wxAppUserViewVO.setAccountType(loginUser.getAccountType());
+ wxAppUserViewVO.setDeptId(loginUser.getDeptId().intValue());
+ } else {
+ if (wxAppUserViewVO.getAccountType() == null) {
+ return error("璇锋寚瀹氱敤鎴风被鍨");
+ }
+ if (wxAppUserViewVO.getDeptId() == null) {
+ return error("璇锋寚瀹氱敤鎴锋墍灞為儴闂");
+ }
+ }
+ wxAppUserViewVO.setPassword(SecurityUtils.encryptPassword(wxAppUserViewVO.getPassword()));
+ return wxAppUserService.saveVO(wxAppUserViewVO);
+ }
+
+ /**
+ * 淇敼椤:
+ * 鏄电О
+ * 濮撳悕
+ * 澶村儚
+ * 鎬у埆
+ * 鐘舵
+ * 閮ㄩ棬
+ * @param wxAppUserViewVO
+ * @return
+ */
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) WxAppUserViewVO wxAppUserViewVO) {
+ SysUser loginUser = getLoginUser().getUser();
+ if (!loginUser.isAdmin()) {
+ wxAppUserViewVO.setAccountType(loginUser.getAccountType());
+ wxAppUserViewVO.setDeptId(loginUser.getDeptId().intValue());
+ }
+ return wxAppUserService.updateVO(wxAppUserViewVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long id) {
+ if(id == null){
+ return error("璇锋寚瀹氳鍒犻櫎鐨勭敤鎴");
+ }
+ return wxAppUserService.removeById(id) ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java
new file mode 100644
index 0000000..85ca003
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java
@@ -0,0 +1,87 @@
+package com.zf.foodpurchase.fdsafe.web.supplier;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.CheckGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.entity.FoodProduct;
+import com.zf.foodpurchase.fdsafe.service.IFoodProductService;
+import com.zf.foodpurchase.fdsafe.utils.RestTemplateUtils;
+import com.zf.foodpurchase.fdsafe.vo.FoodProductVO;
+import com.zf.foodpurchase.fdsafe.vo.ReferencePriceVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-22
+ */
+@RestController
+@RequestMapping("/foodProduct")
+public class FoodProductController extends BaseController {
+ @Autowired
+ private IFoodProductService foodProductService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(FoodProductVO foodProductVO) {
+ startPage();
+ foodProductVO.setDelFlag(0);
+ List list = foodProductService.queryFoodProductVO(foodProductVO);
+ return getDataTable(list);
+ }
+
+ /**
+ * 渚涜揣鍟嗗彂甯冨晢鍝
+ */
+ @PostMapping("/supplierAdd")
+ public AjaxResult supplierAdd(@RequestBody @Validated(AddGroup.class) FoodProductVO foodProductVO) {
+ return foodProductService.supplierAdd(foodProductVO);
+ }
+
+ /**
+ * 渚涜揣鍟嗕慨鏀瑰晢鍝
+ */
+ @PostMapping("/supplierUpdate")
+ public AjaxResult supplierUpdate(@RequestBody @Validated(UpdateGroup.class) FoodProductVO foodProductVO) {
+ return foodProductService.supplierUpdate(foodProductVO);
+ }
+
+ /**
+ * 鏁欒偛灞瀹℃牳鍟嗗搧
+ */
+ @PostMapping("/eduCheck")
+ public AjaxResult eduCheck(@RequestBody @Validated(CheckGroup.class) FoodProductVO foodProductVO) {
+ return foodProductService.eduCheck(foodProductVO);
+ }
+
+ /**
+ * 鍒犻櫎鍟嗗搧淇℃伅
+ */
+ @GetMapping("/supplierDelete")
+ public AjaxResult supplierDelete(Long foodProductId) {
+ if(foodProductId == null){
+ return error("鍟嗗搧id涓嶈兘涓虹┖");
+ }
+ return foodProductService.removeById(foodProductId) ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鑾峰彇鍟嗗搧鍙傝冧环
+ */
+ @GetMapping("/referPrice")
+ public AjaxResult referPrice(String categoryName, String productName) {
+ List list = RestTemplateUtils.getReferencePrice(categoryName, productName);
+ return success(list);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java
new file mode 100644
index 0000000..400d781
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java
@@ -0,0 +1,57 @@
+package com.zf.foodpurchase.fdsafe.web.supplier;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISupplierDeliveryService;
+import com.zf.foodpurchase.fdsafe.service.ISupplierService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolDeliveryVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryAddUpdateVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 閫佽揣鍗曟殏鏃朵笉鎻愪緵鍒犻櫎鍔熻兘
+ *
+ * @author lilj
+ * @since 2025-04-25
+ */
+@RestController
+@RequestMapping("/supplierDelivery")
+public class SupplierDeliveryController extends BaseController {
+ @Autowired
+ private ISupplierDeliveryService supplierDeliveryService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SupplierDeliveryVO supplierDeliveryVO){
+ startPage();
+ List list = supplierDeliveryService.querySupplierDeliveryVO(supplierDeliveryVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/addOrderDelivery")
+ public AjaxResult addOrderDelivery(@RequestBody @Validated(AddGroup.class) SupplierDeliveryAddUpdateVO deliveryAddVO){
+ return supplierDeliveryService.addOrderDelivery(deliveryAddVO);
+ }
+
+ @PostMapping("/supplierUpdateDelivery")
+ public AjaxResult supplierUpdateDelivery(@RequestBody @Validated(UpdateGroup.class) SupplierDeliveryAddUpdateVO supplierDeliveryVO){
+ return supplierDeliveryService.supplierUpdateDelivery(supplierDeliveryVO);
+ }
+
+ @PostMapping("/schoolSignDelivery")
+ public AjaxResult schoolUpdateDelivery(@RequestBody @Validated(UpdateGroup.class) SchoolDeliveryVO schoolDeliveryVO){
+ return supplierDeliveryService.schoolUpdateDelivery(schoolDeliveryVO);
+ }
+
+
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryItemController.java
new file mode 100644
index 0000000..e77d71c
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryItemController.java
@@ -0,0 +1,44 @@
+package com.zf.foodpurchase.fdsafe.web.supplier;
+
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISupplierDeliveryItemService;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryItemUpdateVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-25
+ */
+@RestController
+@RequestMapping("/supplierDeliveryItem")
+public class SupplierDeliveryItemController extends BaseController {
+
+ @Autowired
+ private ISupplierDeliveryItemService supplierDeliveryItemService;
+
+ @GetMapping("/pageList")
+ public TableDataInfo pageList(SupplierDeliveryItemVO supplierDeliveryItemVO) {
+ startPage();
+ List list = supplierDeliveryItemService.querySupplierDeliveryItemVO(supplierDeliveryItemVO);
+ return getDataTable(list);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) SupplierDeliveryItemUpdateVO supplierDeliveryItemUpdateVO) {
+ return supplierDeliveryItemService.updateVO(supplierDeliveryItemUpdateVO);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/test/TestQueryController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/test/TestQueryController.java
new file mode 100644
index 0000000..a006521
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/test/TestQueryController.java
@@ -0,0 +1,28 @@
+package com.zf.foodpurchase.fdsafe.web.test;
+
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.SysUser;
+import com.zf.foodpurchase.common.core.domain.model.LoginUser;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author:lilj
+ * @date:2025/4/10
+ */
+@RequestMapping("/testQuery")
+@RestController
+public class TestQueryController extends BaseController {
+
+ @GetMapping("/getUser")
+ public AjaxResult getUser(){
+ LoginUser loginUser = getLoginUser();
+ System.out.println(loginUser);
+ SysUser user = loginUser.getUser();
+ System.out.println(user);
+ // 鐢╝ccount_type缁撳悎deptId浣滀负鏌ヨ鐢ㄦ埛鍏宠仈鍗曚綅鐨勪俊鎭.
+ return AjaxResult.success(loginUser);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/common/WxAppCommonController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/common/WxAppCommonController.java
new file mode 100644
index 0000000..fbcfa4c
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/common/WxAppCommonController.java
@@ -0,0 +1,164 @@
+package com.zf.foodpurchase.fdsafe.wxapp.common;
+
+import com.zf.foodpurchase.common.config.RuoYiConfig;
+import com.zf.foodpurchase.common.constant.Constants;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.common.utils.file.FileUploadUtils;
+import com.zf.foodpurchase.common.utils.file.FileUtils;
+import com.zf.foodpurchase.framework.config.ServerConfig;
+import com.zf.foodpurchase.web.controller.common.CommonController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author:lilj
+ * @date:2025/5/20
+ */
+@RestController
+@RequestMapping("/wxapp/common")
+public class WxAppCommonController {
+ private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+ @Autowired
+ private ServerConfig serverConfig;
+
+ private static final String FILE_DELIMETER = ",";
+
+ /**
+ * 閫氱敤涓嬭浇璇锋眰
+ *
+ * @param fileName 鏂囦欢鍚嶇О
+ * @param delete 鏄惁鍒犻櫎
+ */
+ @GetMapping("/download")
+ public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+ {
+ try
+ {
+ if (!FileUtils.checkAllowDownload(fileName))
+ {
+ throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", fileName));
+ }
+ String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+ String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, realFileName);
+ FileUtils.writeBytes(filePath, response.getOutputStream());
+ if (delete)
+ {
+ FileUtils.deleteFile(filePath);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("涓嬭浇鏂囦欢澶辫触", e);
+ }
+ }
+
+ /**
+ * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
+ */
+ @PostMapping("/upload")
+ public AjaxResult uploadFile(MultipartFile file) throws Exception
+ {
+ try
+ {
+ // 涓婁紶鏂囦欢璺緞
+ String filePath = RuoYiConfig.getUploadPath();
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName = FileUploadUtils.upload(filePath, file);
+ // String url = serverConfig.getUrl() + fileName;
+ String url = RuoYiConfig.getImagePrefix() + fileName;
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("url", url);
+ ajax.put("fileName", fileName);
+ ajax.put("newFileName", FileUtils.getName(fileName));
+ ajax.put("originalFilename", file.getOriginalFilename());
+ return ajax;
+ }
+ catch (Exception e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 閫氱敤涓婁紶璇锋眰锛堝涓級
+ */
+ @PostMapping("/uploads")
+ public AjaxResult uploadFiles(List files) throws Exception
+ {
+ try
+ {
+ // 涓婁紶鏂囦欢璺緞
+ String filePath = RuoYiConfig.getUploadPath();
+ List urls = new ArrayList();
+ List fileNames = new ArrayList();
+ List newFileNames = new ArrayList();
+ List originalFilenames = new ArrayList();
+ for (MultipartFile file : files)
+ {
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName = FileUploadUtils.upload(filePath, file);
+ String url = serverConfig.getUrl() + fileName;
+ urls.add(url);
+ fileNames.add(fileName);
+ newFileNames.add(FileUtils.getName(fileName));
+ originalFilenames.add(file.getOriginalFilename());
+ }
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+ ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+ ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+ ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ return ajax;
+ }
+ catch (Exception e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 鏈湴璧勬簮閫氱敤涓嬭浇
+ */
+ @GetMapping("/download/resource")
+ public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+ throws Exception
+ {
+ try
+ {
+ if (!FileUtils.checkAllowDownload(resource))
+ {
+ throw new Exception(StringUtils.format("璧勬簮鏂囦欢({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", resource));
+ }
+ // 鏈湴璧勬簮璺緞
+ String localPath = RuoYiConfig.getProfile();
+ // 鏁版嵁搴撹祫婧愬湴鍧
+ String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+ // 涓嬭浇鍚嶇О
+ String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, downloadName);
+ FileUtils.writeBytes(downloadPath, response.getOutputStream());
+ }
+ catch (Exception e)
+ {
+ log.error("涓嬭浇鏂囦欢澶辫触", e);
+ }
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/common/WxAppUserLoginController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/common/WxAppUserLoginController.java
new file mode 100644
index 0000000..de8009e
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/common/WxAppUserLoginController.java
@@ -0,0 +1,167 @@
+package com.zf.foodpurchase.fdsafe.wxapp.common;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zf.foodpurchase.common.config.RuoYiConfig;
+import com.zf.foodpurchase.common.constant.Constants;
+import com.zf.foodpurchase.common.constant.UserConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.LoginWxUser;
+import com.zf.foodpurchase.common.core.domain.entity.User;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.domain.model.WxAppLoginBody;
+import com.zf.foodpurchase.common.core.domain.model.WxAppLoginUser;
+import com.zf.foodpurchase.common.exception.ServiceException;
+import com.zf.foodpurchase.common.exception.user.UserPasswordNotMatchException;
+import com.zf.foodpurchase.common.utils.MessageUtils;
+import com.zf.foodpurchase.common.utils.SecurityUtils;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.common.utils.file.FileUploadUtils;
+import com.zf.foodpurchase.common.utils.file.MimeTypeUtils;
+import com.zf.foodpurchase.fdsafe.entity.WxAppUser;
+import com.zf.foodpurchase.fdsafe.service.IWxAppUserService;
+import com.zf.foodpurchase.fdsafe.vo.WxAppUserViewVO;
+import com.zf.foodpurchase.framework.manager.AsyncManager;
+import com.zf.foodpurchase.framework.manager.factory.AsyncFactory;
+import com.zf.foodpurchase.framework.web.service.WxAppLoginService;
+import com.zf.foodpurchase.framework.web.service.WxAppTokenService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ * @author:lilj
+ * @date:2025/5/12
+ */
+@RestController
+@RequestMapping("/wxapp/userLogin")
+public class WxAppUserLoginController extends BaseController {
+ @Autowired
+ private IWxAppUserService wxAppUserService;
+
+ @Autowired
+ private WxAppTokenService wxAppTokenService;
+
+ @Autowired
+ private WxAppLoginService wxAppLoginService;
+ private WxAppUserVO loginWxUser;
+
+ @PostMapping("/login")
+ public AjaxResult login(@RequestBody @Valid WxAppLoginBody wxAppLoginBody) {
+ String token = wxAppLoginService.login(wxAppLoginBody);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
+ }
+
+ @GetMapping("/getCurrentUser")
+ public AjaxResult getCurrentUser() {
+ WxAppLoginUser loginWxUser = getWxAppLoginUser();
+ WxAppUserVO user = loginWxUser.getUser();
+ AjaxResult response = success("鏌ヨ鎴愬姛");
+ response.put("user", user);
+ return response;
+ }
+
+ /**
+ * 鍙慨鏀归」:鐢ㄦ埛瀵嗙爜,鏄电О,澶村儚,鎬у埆
+ *
+ * @param user
+ * @return
+ */
+ @PostMapping("/updateUser")
+ public AjaxResult updateUser(@RequestBody WxAppUserViewVO user) {
+ if (user == null || user.getId() == null) {
+ return error("鐢ㄦ埛id涓嶈兘涓虹┖");
+ }
+ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper();
+ updateWrapper.eq(WxAppUser::getId, user.getId());
+ updateWrapper.set(WxAppUser::getNickname, user.getNickname());
+ updateWrapper.set(WxAppUser::getRealName, user.getRealName());
+ updateWrapper.set(WxAppUser::getAvatarUrl, user.getAvatarUrl());
+ updateWrapper.set(WxAppUser::getGender, user.getGender());
+ updateWrapper.set(WxAppUser::getUpdateTime, new Date());
+ boolean isUpdate = wxAppUserService.update(updateWrapper);
+ if (!isUpdate) {
+ return error("淇敼澶辫触");
+ }
+ WxAppUserVO newUser = wxAppUserService.getUserVOById(user.getId());
+ WxAppLoginUser loginUser = getWxAppLoginUser();
+ loginUser.setUser(newUser);
+
+ wxAppTokenService.setLoginWxAppUser(loginUser);
+ return isUpdate ? success("淇敼鎴愬姛") : error("淇敼澶辫触");
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛瀵嗙爜
+ */
+ @PostMapping("/updateUserPassword")
+ public AjaxResult updateUserPassword(@RequestBody WxAppUserViewVO user) {
+ if (user == null || user.getId() == null) {
+ return error("鐢ㄦ埛id涓嶈兘涓虹┖");
+ }
+ pwdCheck(user.getNewPassword());
+ WxAppUser old = wxAppUserService.getById(user.getId());
+ if (old == null) {
+ return error("鐢ㄦ埛涓嶅瓨鍦");
+ }
+ // 鏍￠獙瀵嗙爜鏄惁姝ｇ‘
+ boolean isMatch = SecurityUtils.matchesPassword(user.getPassword(), old.getPassword());
+ if (!isMatch) {
+ throw new ServiceException("鍘熷瘑鐮佹湁璇");
+ }
+
+ WxAppUser updateUser = new WxAppUser();
+ updateUser.setId(user.getId());
+ updateUser.setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));
+ boolean isUpdate = wxAppUserService.updateById(updateUser);
+ return isUpdate ? success("瀵嗙爜淇敼鎴愬姛") : error("瀵嗙爜淇敼澶辫触");
+ }
+
+
+ @GetMapping("/logout")
+ public AjaxResult logout() {
+ WxAppLoginUser wxAppLoginUser = getWxAppLoginUser();
+ if (wxAppLoginUser != null) {
+ String token = wxAppLoginUser.getToken();
+ wxAppTokenService.delLoginWxAppUser(token);
+ }
+ return AjaxResult.success("閫鍑虹櫥褰曟垚鍔");
+ }
+
+ public void pwdCheck(String userPwd) {
+ if (StringUtils.isBlank(userPwd)) {
+ throw new ServiceException("鏂板瘑鐮佷笉鑳戒负绌");
+ }
+ // 瀵嗙爜濡傛灉涓嶅湪鎸囧畾鑼冨洿鍐 閿欒
+ if (userPwd.length() < UserConstants.PASSWORD_MIN_LENGTH
+ || userPwd.length() > UserConstants.PASSWORD_MAX_LENGTH) {
+ throw new ServiceException("鏂板瘑鐮佷綅鏁板簲澶т簬" + UserConstants.PASSWORD_MIN_LENGTH + ",灏忎簬" + UserConstants.PASSWORD_MAX_LENGTH + "浣");
+ }
+ }
+
+ /**
+ * 寰俊澶村儚涓婁紶
+ */
+ @PostMapping(value = "/avatar", produces = "application/json;charset=UTF-8")
+ public AjaxResult avatar(MultipartFile file) throws Exception {
+ if (!file.isEmpty()) {
+ WxAppLoginUser loginWxUser = getWxAppLoginUser();
+ // 涓婁紶鏂囦欢璺緞
+ String filePath = RuoYiConfig.getUploadPath();
+ // D:/ruoyi/wxprofile/avatar
+ String avatar = FileUploadUtils.upload(filePath, file, MimeTypeUtils.IMAGE_EXTENSION);
+
+ avatar = RuoYiConfig.getImagePrefix() + avatar;
+ return AjaxResult.success().put("avatarUrl", avatar);
+ }
+ return error("涓婁紶鍥剧墖寮傚父");
+ }
+
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppAccompanyMealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppAccompanyMealController.java
new file mode 100644
index 0000000..134b66c
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppAccompanyMealController.java
@@ -0,0 +1,75 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.domain.model.WxAppLoginUser;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.entity.WxAppUser;
+import com.zf.foodpurchase.fdsafe.service.IAccompanyMealService;
+import com.zf.foodpurchase.fdsafe.vo.AccompanyMealVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-11
+ */
+@RestController
+@RequestMapping("/wxapp/accompanyMeal")
+public class WxAppAccompanyMealController extends BaseController {
+ @Autowired
+ private IAccompanyMealService accompanyMealService;
+
+ @RequestMapping("/list")
+ public AjaxResult list(AccompanyMealVO accompanyMealVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ accompanyMealVO.setSchoolId(userVO.getSchoolId());
+ List list = accompanyMealService.queryAccompanyMealVO(accompanyMealVO);
+ return AjaxResult.success(list);
+ }
+
+ @RequestMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) AccompanyMealVO accompanyMealVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ accompanyMealVO.setSchoolId(userVO.getSchoolId());
+ return accompanyMealService.saveVO(accompanyMealVO);
+ }
+
+ @RequestMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) AccompanyMealVO accompanyMealVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ accompanyMealVO.setSchoolId(userVO.getSchoolId());
+ return accompanyMealService.updateVO(accompanyMealVO);
+ }
+
+ @RequestMapping("/delete")
+ public AjaxResult delete(Integer accompanyMealId) {
+ if (accompanyMealId == null) {
+ return error("璇烽夋嫨瑕佸垹闄ょ殑闄璁板綍");
+ }
+ return accompanyMealService.removeWithId(accompanyMealId);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppCattenController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppCattenController.java
new file mode 100644
index 0000000..226907d
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppCattenController.java
@@ -0,0 +1,75 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ICattenService;
+import com.zf.foodpurchase.fdsafe.vo.CattenVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-11
+ */
+@RestController
+@RequestMapping("/wxapp/catten")
+public class WxAppCattenController extends BaseController {
+ @Autowired
+ private ICattenService cattenService;
+
+ @RequestMapping("/list")
+ public AjaxResult list(CattenVO cattenVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ cattenVO.setSchoolId(userVO.getSchoolId());
+ List list = cattenService.queryCattenVO(cattenVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@Validated(AddGroup.class) @RequestBody CattenVO cattenVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ cattenVO.setSchoolId(userVO.getSchoolId());
+ return cattenService.saveVO(cattenVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody CattenVO cattenVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ cattenVO.setSchoolId(userVO.getSchoolId());
+ return cattenService.updateVO(cattenVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer cattenId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(cattenId == null){
+ return error("璇烽夋嫨瑕佸垹闄ょ殑椋熷爞");
+ }
+ return cattenService.removeById(cattenId) ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDeliveryController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDeliveryController.java
new file mode 100644
index 0000000..a0eeecf
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDeliveryController.java
@@ -0,0 +1,72 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISupplierDeliveryItemService;
+import com.zf.foodpurchase.fdsafe.service.ISupplierDeliveryService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolDeliveryVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryAddUpdateVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryItemVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 閫佽揣鍗曟殏鏃朵笉鎻愪緵鍒犻櫎鍔熻兘
+ *
+ * @author lilj
+ * @since 2025-04-25
+ */
+@RestController
+@RequestMapping("/wxapp/delivery")
+public class WxAppDeliveryController extends BaseController {
+ @Autowired
+ private ISupplierDeliveryService supplierDeliveryService;
+
+ @Autowired
+ private ISupplierDeliveryItemService supplierDeliveryItemService;
+
+ @GetMapping("/list")
+ public AjaxResult list(SupplierDeliveryVO supplierDeliveryVO){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ supplierDeliveryVO.setSchoolId(userVO.getSchoolId());
+ List list = supplierDeliveryService.querySupplierDeliveryVO(supplierDeliveryVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/schoolSignDelivery")
+ public AjaxResult schoolUpdateDelivery(@RequestBody @Validated(UpdateGroup.class) SchoolDeliveryVO schoolDeliveryVO){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolDeliveryVO.setSchoolId(userVO.getSchoolId());
+ return supplierDeliveryService.schoolUpdateDelivery(schoolDeliveryVO);
+ }
+
+
+ @GetMapping("/itemList")
+ public AjaxResult itemList(SupplierDeliveryItemVO supplierDeliveryItemVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ supplierDeliveryItemVO.setSchoolId(userVO.getSchoolId());
+ List list = supplierDeliveryItemService.querySupplierDeliveryItemVO(supplierDeliveryItemVO);
+ return AjaxResult.success(list);
+ }
+
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDishController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDishController.java
new file mode 100644
index 0000000..9c0716e
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDishController.java
@@ -0,0 +1,88 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IDishFoodRelationService;
+import com.zf.foodpurchase.fdsafe.service.IDishService;
+import com.zf.foodpurchase.fdsafe.vo.DishFoodRelationVO;
+import com.zf.foodpurchase.fdsafe.vo.DishVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 鑿滃搧琛 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-18
+ */
+@RestController
+@RequestMapping("/wxapp/dish")
+public class WxAppDishController extends BaseController {
+ @Autowired
+ private IDishService dishService;
+
+ @Autowired
+ private IDishFoodRelationService dishFoodRelationService;
+
+ @RequestMapping("/list")
+ public AjaxResult list(DishVO dishVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ dishVO.setSchoolId(userVO.getSchoolId());
+ List dishVOList = dishService.queryDishVO(dishVO);
+ return AjaxResult.success(dishVOList);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) DishVO dishVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ dishVO.setSchoolId(userVO.getSchoolId());
+ return dishService.saveVO(dishVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) DishVO dishVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ dishVO.setSchoolId(userVO.getSchoolId());
+ return dishService.updateVO(dishVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer dishId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if (dishId == null) {
+ return error("鏈寚瀹氳鍒犻櫎鐨勮彍鍝");
+ }
+ boolean flag = dishService.removeById(dishId);
+ return flag ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+
+ @GetMapping("/detail")
+ public AjaxResult detail(Integer dishId) {
+ List dishFoodRelationVOList = dishFoodRelationService.detail(dishId);
+ return AjaxResult.success(dishFoodRelationVOList);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodBookController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodBookController.java
new file mode 100644
index 0000000..38d677a
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodBookController.java
@@ -0,0 +1,78 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IFoodBookService;
+import com.zf.foodpurchase.fdsafe.vo.FoodBookVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-19
+ */
+@RestController
+@RequestMapping("/wxapp/foodBook")
+public class WxAppFoodBookController extends BaseController {
+
+ @Autowired
+ private IFoodBookService foodBookService;
+
+ @RequestMapping("/list")
+ public AjaxResult list(FoodBookVO foodBookVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodBookVO.setSchoolId(userVO.getSchoolId());
+ foodBookVO.setDelFlag(0);
+ List list = foodBookService.queryFoodBookVO(foodBookVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodBookVO foodBookVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodBookVO.setSchoolId(userVO.getSchoolId());
+ return foodBookService.saveVO(foodBookVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodBookVO foodBookVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodBookVO.setSchoolId(userVO.getSchoolId());
+ return foodBookService.updateVO(foodBookVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long bookId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if (userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())) {
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(bookId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勮彍璋");
+ }
+ return foodBookService.removeWithId(bookId);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodProductController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodProductController.java
new file mode 100644
index 0000000..65168ec
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodProductController.java
@@ -0,0 +1,72 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.fdsafe.service.IFoodProductService;
+import com.zf.foodpurchase.fdsafe.service.IFoodTypeService;
+import com.zf.foodpurchase.fdsafe.service.ISupplierService;
+import com.zf.foodpurchase.fdsafe.vo.FoodProductVO;
+import com.zf.foodpurchase.fdsafe.vo.FoodTypeVO;
+import com.zf.foodpurchase.fdsafe.vo.SupplierVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author:lilj
+ * @date:2025/5/16
+ */
+@RequestMapping("/wxapp/foodProduct")
+@RestController
+public class WxAppFoodProductController extends BaseController {
+ @Autowired
+ private IFoodProductService foodProductService;
+
+ @Autowired
+ private IFoodTypeService foodTypeServcie;
+
+ @Autowired
+ private ISupplierService supplierService;
+
+ @GetMapping("/supplierList")
+ public AjaxResult list(SupplierVO supplierVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ supplierVO.setEduId(userVO.getEduId());
+ List list = supplierService.querySupplierVO(supplierVO);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 鏌ヨ鐢
+ * @return
+ */
+ @GetMapping("/foodTypeList")
+ public AjaxResult list(){
+ FoodTypeVO foodTypeVO = new FoodTypeVO();
+ foodTypeVO.setStatus(0);
+ List list = foodTypeServcie.queryFoodTypeVO(foodTypeVO);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/list")
+ public AjaxResult list(FoodProductVO foodProductVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodProductVO.setEduId(userVO.getEduId());
+ foodProductVO.setDelFlag(0);
+ List list = foodProductService.queryFoodProductVO(foodProductVO);
+ return AjaxResult.success(list);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
new file mode 100644
index 0000000..d3a5790
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
@@ -0,0 +1,76 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IFoodSampleService;
+import com.zf.foodpurchase.fdsafe.vo.FoodSampleVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-21
+ */
+@RestController
+@RequestMapping("/wxapp/foodSample")
+public class WxAppFoodSampleController extends BaseController {
+ @Autowired
+ private IFoodSampleService foodSampleService;
+
+ @GetMapping("/list")
+ public AjaxResult list(FoodSampleVO foodSampleVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodSampleVO.setSchoolId(userVO.getSchoolId());
+ List list = foodSampleService.queryFoodSampleVO(foodSampleVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodSampleVO foodSampleVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodSampleVO.setSchoolId(userVO.getSchoolId());
+ return foodSampleService.saveVO(foodSampleVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodSampleVO foodSampleVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ foodSampleVO.setSchoolId(userVO.getSchoolId());
+ return foodSampleService.updateVO(foodSampleVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long sampleId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(sampleId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勭暀鏍疯褰");
+ }
+ return foodSampleService.deleteWithId(sampleId);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningCheckInController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningCheckInController.java
new file mode 100644
index 0000000..1fcfbd0
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningCheckInController.java
@@ -0,0 +1,75 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IMorningCheckInService;
+import com.zf.foodpurchase.fdsafe.vo.MorningCheckInVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-14
+ */
+@RestController
+@RequestMapping("/wxapp/morningCheckIn")
+public class WxAppMorningCheckInController extends BaseController {
+ @Autowired
+ private IMorningCheckInService morningCheckInService;
+
+ @GetMapping("/list")
+ public AjaxResult pageList(MorningCheckInVO morningCheckInVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ morningCheckInVO.setSchoolId(userVO.getSchoolId());
+ List list = morningCheckInService.queryMorningCheckInVO(morningCheckInVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult save(@RequestBody @Validated(AddGroup.class) MorningCheckInVO morningCheckInVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ morningCheckInVO.setSchoolId(userVO.getSchoolId());
+ return morningCheckInService.saveVO(morningCheckInVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) MorningCheckInVO morningCheckInVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ morningCheckInVO.setSchoolId(userVO.getSchoolId());
+ return morningCheckInService.updateVO(morningCheckInVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long checkInId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(checkInId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勬櫒妫鐧昏璁板綍");
+ }
+ return morningCheckInService.removewithId(checkInId);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningInspectionDetailController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningInspectionDetailController.java
new file mode 100644
index 0000000..f5481ed
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningInspectionDetailController.java
@@ -0,0 +1,114 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IMorningInspectionContentService;
+import com.zf.foodpurchase.fdsafe.service.IMorningInspectionDetailService;
+import com.zf.foodpurchase.fdsafe.vo.MorningInspectionDetailVO;
+import com.zf.foodpurchase.fdsafe.vo.MorningTableHeaderVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-14
+ */
+@RestController
+@RequestMapping("/wxapp/morningInspectionDetail")
+public class WxAppMorningInspectionDetailController extends BaseController {
+
+ @Autowired
+ private IMorningInspectionDetailService morningInspectionDetailService;
+
+ @Autowired
+ private IMorningInspectionContentService morningInspectionContentService;
+
+ @GetMapping("/getTableHearder")
+ public AjaxResult getTableHearder(){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ Integer eduId = userVO.getEduId();
+ List list =new ArrayList<>();
+ if(eduId == null){
+ return success(list);
+ }
+ list =morningInspectionContentService.getTableHearder(eduId);
+ return success(list);
+ }
+
+
+ @GetMapping("/list")
+ public AjaxResult pageList(MorningInspectionDetailVO morningInspectionDetailVO){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ List list = morningInspectionDetailService.queryMorningInspectionDetailVO(morningInspectionDetailVO);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 鏍规嵁鏅ㄦ椤筰d鏌ヨ鏅ㄦ鏄庣粏
+ * @param checkInId
+ * @return
+ */
+ @GetMapping("/detail")
+ public AjaxResult detail(Long checkInId){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(checkInId == null){
+ return error("鏈寚瀹氳鏌ヨ鐨勬櫒妫璁板綍");
+ }
+ List list = morningInspectionDetailService.getByCheckInId(checkInId);
+ return success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated({AddGroup.class}) MorningInspectionDetailVO morningInspectionDetailVO){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return morningInspectionDetailService.saveVO(morningInspectionDetailVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated({UpdateGroup.class}) MorningInspectionDetailVO morningInspectionDetailVO){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return morningInspectionDetailService.updateVO(morningInspectionDetailVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long morningDetailId){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(morningDetailId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勬櫒妫鏄庣粏");
+ }
+ return morningInspectionDetailService.deleteWithId(morningDetailId);
+ }
+
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppRubbishDealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppRubbishDealController.java
new file mode 100644
index 0000000..c94f870
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppRubbishDealController.java
@@ -0,0 +1,72 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.IRubbishDealService;
+import com.zf.foodpurchase.fdsafe.vo.RubbishDealVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍘ㄤ綑鍨冨溇澶勭悊琛 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-12
+ */
+@RestController
+@RequestMapping("/wxapp/rubbishDeal")
+public class WxAppRubbishDealController extends BaseController {
+
+ @Autowired
+ private IRubbishDealService rubbishDealService;
+
+ @GetMapping("/list")
+ public AjaxResult list(RubbishDealVO rubbishDealVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ rubbishDealVO.setSchoolId(userVO.getSchoolId());
+ List list = rubbishDealService.queryRubbishDealVO(rubbishDealVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@Validated(AddGroup.class) @RequestBody RubbishDealVO rubbishDealVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ rubbishDealVO.setSchoolId(userVO.getSchoolId());
+ return rubbishDealService.saveVO(rubbishDealVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody RubbishDealVO rubbishDealVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ rubbishDealVO.setSchoolId(userVO.getSchoolId());
+ return rubbishDealService.updateVO(rubbishDealVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer dealId) {
+ if(dealId == null){
+ return error("璇烽夋嫨瑕佸垹闄ょ殑鍘ㄤ綑鍨冨溇澶勭悊璁板綍");
+ }
+ return rubbishDealService.deleteWithId(dealId);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolCartItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolCartItemController.java
new file mode 100644
index 0000000..e0e70d4
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolCartItemController.java
@@ -0,0 +1,85 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISchoolCartItemService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolCartItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 瀛︽牎璐墿杞 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-23
+ */
+@RestController
+@RequestMapping("/wxapp/schoolCartItem")
+public class WxAppSchoolCartItemController extends BaseController {
+
+ @Autowired
+ private ISchoolCartItemService schoolCartItemService;
+ @GetMapping("/list")
+ public AjaxResult list(SchoolCartItemVO schoolCartItemVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolCartItemVO.setSchoolId(userVO.getSchoolId());
+ List list = schoolCartItemService.querySchoolCartItemVO(schoolCartItemVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) SchoolCartItemVO schoolCartItemVO) {
+ if(schoolCartItemVO == null){
+ return error("鏈寚瀹氳娣诲姞鐨勮喘鐗╅」");
+ }
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolCartItemVO.setSchoolId(userVO.getSchoolId());
+ return schoolCartItemService.saveVO(schoolCartItemVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup .class) SchoolCartItemVO schoolCartItemVO) {
+ if(schoolCartItemVO == null || schoolCartItemVO.getCartItemId() == null){
+ return error("鏈寚瀹氳淇敼鐨勮喘鐗╅」");
+ }
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolCartItemVO.setSchoolId(userVO.getSchoolId());
+ return schoolCartItemService.updateVO(schoolCartItemVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long cartItemId) {
+ if(cartItemId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勮喘鐗╅」");
+ }
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ boolean result = schoolCartItemService.removeById(cartItemId);
+ return result ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+
+
+}
+
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolOrderController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolOrderController.java
new file mode 100644
index 0000000..7875ffb
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolOrderController.java
@@ -0,0 +1,104 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderItemService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderService;
+import com.zf.foodpurchase.fdsafe.vo.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-24
+ */
+@RestController
+@RequestMapping("/wxapp/schoolOrder")
+public class WxAppSchoolOrderController extends BaseController {
+
+ @Autowired
+ private ISchoolOrderService schoolOrderService;
+
+ @Autowired
+ private ISchoolOrderItemService schoolOrderItemService;
+
+
+ @GetMapping("/list")
+ public AjaxResult list(SchoolOrderVO schoolOrderVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolOrderVO.setSchoolId(userVO.getSchoolId());
+ List list = schoolOrderService.querySchoolOrderVO(schoolOrderVO);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 鎻愪氦璁㈠崟:
+ * 1.鏍￠獙:鍟嗗搧鏈夋晥鎬ф牎楠,璁㈠崟閲戦鏍￠獙
+ * 2.璁㈠崟鍏ュ簱:璁㈠崟琛,璁㈠崟璇︽儏琛,璐墿杞﹁〃
+ * 3.璁㈠崟鍏ュ簱鎴愬姛鍚,鍒犻櫎璐墿杞﹂」
+ * @param submitOrderVO
+ * @return
+ */
+ @PostMapping("/submitOrder")
+ public AjaxResult submitOrder(@RequestBody @Valid SchoolSubmitOrderVO submitOrderVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return schoolOrderService.submitOrder(submitOrderVO);
+ }
+
+ /**
+ * 鍙栨秷璁㈠崟
+ */
+ @PostMapping("/cancelOrder")
+ public AjaxResult cancelOrder(@RequestBody @Valid SchoolCancelOrderVO cancelOrderVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return schoolOrderService.cancelOrder(cancelOrderVO);
+ }
+
+ /**
+ * 璁㈠崟澶囨敞淇敼
+ */
+ @PostMapping("/updateOrderRemark")
+ public AjaxResult updateOrderRemark(@RequestBody @Valid SchoolModifyOrderRemarkVO remarkVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return schoolOrderService.updateOrderRemark(remarkVO);
+ }
+
+ /**
+ * 璁㈠崟瀛愰」鏌ヨ
+ */
+ @GetMapping("/queryOrderItem")
+ public AjaxResult queryOrderItem(String orderNo) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ SchoolOrderItemVO schoolOrderVO = new SchoolOrderItemVO();
+ schoolOrderVO.setOrderNo(orderNo);
+ List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderVO);
+ return success(list);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolRefundController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolRefundController.java
new file mode 100644
index 0000000..a5ac1d2
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolRefundController.java
@@ -0,0 +1,120 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISchoolOrderItemService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolRefundItemService;
+import com.zf.foodpurchase.fdsafe.service.ISchoolRefundService;
+import com.zf.foodpurchase.fdsafe.vo.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-28
+ */
+@RestController
+@RequestMapping("/wxapp/schoolRefund")
+public class WxAppSchoolRefundController extends BaseController {
+ @Autowired
+ private ISchoolRefundItemService schoolRefundItemService;
+
+ @Autowired
+ private ISchoolRefundService schoolRefundService;
+
+ @Autowired
+ private ISchoolOrderItemService schoolOrderItemService;
+
+ @GetMapping("/orderItemList")
+ public AjaxResult orderItemList(SchoolOrderItemVO schoolOrderItemVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolOrderItemVO.setSchoolId(userVO.getSchoolId());
+ List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderItemVO);
+ return AjaxResult.success(list);
+ }
+ // 鏌ヨ鎺ュ彛,鏍规嵁閫娆炬诲崟鍙锋煡璇
+ @GetMapping("/querySchoolRefund")
+ public AjaxResult querySchoolRefund(SchoolRefundVO schoolRefundVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolRefundVO.setSchoolId(userVO.getSchoolId());
+ List schoolRefunds = schoolRefundService.querySchoolRefund(schoolRefundVO);
+ return AjaxResult.success(schoolRefunds);
+ }
+
+ // 鏌ヨ璇︽儏
+ @GetMapping("/querySchoolRefundDetail")
+ public AjaxResult querySchoolRefundDetail(String refundNo) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(StringUtils.isBlank(refundNo)){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List refundItems = schoolRefundItemService.queryRefundItem(refundNo);
+ return AjaxResult.success(refundItems);
+ }
+
+ /**
+ * 鍑犱釜瀛楁:
+ * 1.瀛愬崟缂栧彿
+ * 2.閫璐у師鍥
+ * 3.閫璐ф暟閲
+ * @param refundItemAddUpdateVO
+ * @return
+ */
+ @PostMapping("/addRefundItem")
+ public AjaxResult addRefundItem(@RequestBody @Validated(AddGroup.class) RefundItemAddUpdateVO refundItemAddUpdateVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return schoolRefundItemService.addRefundItem(refundItemAddUpdateVO);
+ }
+
+ /**
+ * 淇敼閫娆鹃」
+ */
+ @PostMapping("/updateRefundItem")
+ public AjaxResult updateRefundItem(@RequestBody @Validated(UpdateGroup.class) RefundItemAddUpdateVO refundItemAddUpdateVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return schoolRefundItemService.updateRefundItem(refundItemAddUpdateVO);
+ }
+
+ /**
+ * 閫璐у崟瀹℃牳
+ */
+ @PostMapping("/checkSchoolRefund")
+ public AjaxResult checkSchoolRefund(@RequestBody @Valid RefundCheckVO checkVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ return schoolRefundService.checkSchoolRefund(checkVO);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolStaffController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolStaffController.java
new file mode 100644
index 0000000..29f36a6
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolStaffController.java
@@ -0,0 +1,76 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISchoolStaffService;
+import com.zf.foodpurchase.fdsafe.vo.SchoolStaffVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-11
+ */
+@RestController
+@RequestMapping("/wxapp/schoolStaff")
+public class WxAppSchoolStaffController extends BaseController {
+ @Autowired
+ private ISchoolStaffService schoolStaffService;
+
+ @GetMapping("/list")
+ public AjaxResult list(SchoolStaffVO schoolStaffVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolStaffVO.setSchoolId(userVO.getSchoolId());
+ List list = schoolStaffService.querySchoolStaffVO(schoolStaffVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@Validated(AddGroup.class) @RequestBody SchoolStaffVO schoolStaffVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolStaffVO.setSchoolId(userVO.getSchoolId());
+ return schoolStaffService.saveVO(schoolStaffVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody SchoolStaffVO schoolStaffVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ schoolStaffVO.setSchoolId(userVO.getSchoolId());
+ return schoolStaffService.updateVO(schoolStaffVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Integer staffId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(staffId == null){
+ return error("璇烽夋嫨瑕佸垹闄ょ殑瀛︽牎浜哄憳");
+ }
+ boolean flag = schoolStaffService.removeById(staffId);
+ return flag ? success("鍒犻櫎鎴愬姛") : error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSelfInspectionRecordController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSelfInspectionRecordController.java
new file mode 100644
index 0000000..e0c7309
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSelfInspectionRecordController.java
@@ -0,0 +1,106 @@
+package com.zf.foodpurchase.fdsafe.wxapp.school;
+
+
+import com.zf.foodpurchase.common.constant.WxAPPAccountConstants;
+import com.zf.foodpurchase.common.core.controller.BaseController;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
+import com.zf.foodpurchase.common.core.page.TableDataInfo;
+import com.zf.foodpurchase.common.valigroud.AddGroup;
+import com.zf.foodpurchase.common.valigroud.UpdateGroup;
+import com.zf.foodpurchase.fdsafe.service.ISelfInspectionContentService;
+import com.zf.foodpurchase.fdsafe.service.ISelfInspectionDetailService;
+import com.zf.foodpurchase.fdsafe.service.ISelfInspectionRecordService;
+import com.zf.foodpurchase.fdsafe.vo.SelfInspectionContentVO;
+import com.zf.foodpurchase.fdsafe.vo.SelfInspectionDetailVO;
+import com.zf.foodpurchase.fdsafe.vo.SelfInspectionRecordVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 鍓嶇鎺у埗鍣
+ *
+ *
+ * @author lilj
+ * @since 2025-04-15
+ */
+@RestController
+@RequestMapping("/wxapp/selfInspectionRecord")
+public class WxAppSelfInspectionRecordController extends BaseController {
+
+ @Autowired
+ private ISelfInspectionRecordService selfInspectionRecordService;
+
+ @Autowired
+ private ISelfInspectionDetailService selfInspectionDetailService;
+
+ @Autowired
+ private ISelfInspectionContentService selfInspectionContentService;
+
+ @GetMapping("/inspectionContents")
+ public AjaxResult inspectionContents(SelfInspectionContentVO selfInspectionContentVO){
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ selfInspectionContentVO.setEduId(userVO.getEduId());
+ List list = selfInspectionContentService.querySelfInspectionContentVO(selfInspectionContentVO);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/list")
+ public AjaxResult list(SelfInspectionRecordVO selfInspectionRecordVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ selfInspectionRecordVO.setSchoolId(userVO.getSchoolId());
+ List list = selfInspectionRecordService.querySelfInspectionRecordVO(selfInspectionRecordVO);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody @Validated(AddGroup.class) SelfInspectionRecordVO selfInspectionRecordVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ selfInspectionRecordVO.setSchoolId(userVO.getSchoolId());
+ selfInspectionRecordVO.setEduId(userVO.getEduId());
+ return selfInspectionRecordService.saveVO(selfInspectionRecordVO);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) SelfInspectionRecordVO selfInspectionRecordVO) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ selfInspectionRecordVO.setSchoolId(userVO.getSchoolId());
+ return selfInspectionRecordService.updateVO(selfInspectionRecordVO);
+ }
+
+ @GetMapping("/delete")
+ public AjaxResult delete(Long selfRecordId) {
+ WxAppUserVO userVO = getWxAppLoginUser().getUser();
+ if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
+ return AjaxResult.error("闈炲鏍′汉鍛樿处鍙锋棤娉曟搷浣");
+ }
+ if(selfRecordId == null){
+ return error("鏈寚瀹氳鍒犻櫎鐨勮嚜妫璁板綍");
+ }
+ return selfInspectionRecordService.deleteWithId(selfRecordId);
+ }
+
+
+
+ @GetMapping("/getDetail")
+ public AjaxResult getDetail(Long selfRecordId){
+ List list = selfInspectionDetailService.getDetail(selfRecordId);
+ return AjaxResult.success(list);
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/common/CaptchaController.java b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/common/CaptchaController.java
new file mode 100644
index 0000000..7ce9ae9
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/common/CaptchaController.java
@@ -0,0 +1,95 @@
+package com.zf.foodpurchase.web.controller.common;
+
+import com.google.code.kaptcha.Producer;
+import com.zf.foodpurchase.common.config.RuoYiConfig;
+import com.zf.foodpurchase.common.constant.CacheConstants;
+import com.zf.foodpurchase.common.constant.Constants;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.core.redis.RedisCache;
+import com.zf.foodpurchase.common.utils.sign.Base64;
+import com.zf.foodpurchase.common.utils.uuid.IdUtils;
+import com.zf.foodpurchase.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 楠岃瘉鐮佹搷浣滃鐞
+ *
+ * @author ruoyi
+ */
+@RestController
+public class CaptchaController
+{
+ @Resource(name = "captchaProducer")
+ private Producer captchaProducer;
+
+ @Resource(name = "captchaProducerMath")
+ private Producer captchaProducerMath;
+
+ @Autowired
+ private RedisCache redisCache;
+
+ @Autowired
+ private ISysConfigService configService;
+ /**
+ * 鐢熸垚楠岃瘉鐮
+ */
+ @GetMapping("/captchaImage")
+ public AjaxResult getCode(HttpServletResponse response) throws IOException
+ {
+ AjaxResult ajax = AjaxResult.success();
+ boolean captchaEnabled = configService.selectCaptchaEnabled();
+ ajax.put("captchaEnabled", captchaEnabled);
+ if (!captchaEnabled)
+ {
+ return ajax;
+ }
+
+ // 淇濆瓨楠岃瘉鐮佷俊鎭
+ String uuid = IdUtils.simpleUUID();
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+
+ String capStr = null, code = null;
+ BufferedImage image = null;
+
+ // 鐢熸垚楠岃瘉鐮
+ String captchaType = RuoYiConfig.getCaptchaType();
+ if ("math".equals(captchaType))
+ {
+ String capText = captchaProducerMath.createText();
+ capStr = capText.substring(0, capText.lastIndexOf("@"));
+ code = capText.substring(capText.lastIndexOf("@") + 1);
+ image = captchaProducerMath.createImage(capStr);
+ }
+ else if ("char".equals(captchaType))
+ {
+ capStr = code = captchaProducer.createText();
+ image = captchaProducer.createImage(capStr);
+ }
+
+ redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+ // 杞崲娴佷俊鎭啓鍑
+ FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+ try
+ {
+ ImageIO.write(image, "jpg", os);
+ }
+ catch (IOException e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+
+ ajax.put("uuid", uuid);
+ ajax.put("img", Base64.encode(os.toByteArray()));
+ return ajax;
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/common/CommonController.java b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/common/CommonController.java
new file mode 100644
index 0000000..26ff61b
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/common/CommonController.java
@@ -0,0 +1,165 @@
+package com.zf.foodpurchase.web.controller.common;
+
+import com.zf.foodpurchase.common.config.RuoYiConfig;
+import com.zf.foodpurchase.common.constant.Constants;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.common.utils.file.FileUploadUtils;
+import com.zf.foodpurchase.common.utils.file.FileUtils;
+import com.zf.foodpurchase.framework.config.ServerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 閫氱敤璇锋眰澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/common")
+public class CommonController
+{
+ private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+ @Autowired
+ private ServerConfig serverConfig;
+
+ private static final String FILE_DELIMETER = ",";
+
+ /**
+ * 閫氱敤涓嬭浇璇锋眰
+ *
+ * @param fileName 鏂囦欢鍚嶇О
+ * @param delete 鏄惁鍒犻櫎
+ */
+ @GetMapping("/download")
+ public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+ {
+ try
+ {
+ if (!FileUtils.checkAllowDownload(fileName))
+ {
+ throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", fileName));
+ }
+ String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+ String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, realFileName);
+ FileUtils.writeBytes(filePath, response.getOutputStream());
+ if (delete)
+ {
+ FileUtils.deleteFile(filePath);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("涓嬭浇鏂囦欢澶辫触", e);
+ }
+ }
+
+ /**
+ * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
+ */
+ @PostMapping("/upload")
+ public AjaxResult uploadFile(MultipartFile file) throws Exception
+ {
+ try
+ {
+ // 涓婁紶鏂囦欢璺緞
+ String filePath = RuoYiConfig.getUploadPath();
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName = FileUploadUtils.upload(filePath, file);
+ // String url = serverConfig.getUrl() + fileName;
+ String url = RuoYiConfig.getImagePrefix() + fileName;
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("url", url);
+ ajax.put("fileName", fileName);
+ ajax.put("newFileName", FileUtils.getName(fileName));
+ ajax.put("originalFilename", file.getOriginalFilename());
+ return ajax;
+ }
+ catch (Exception e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 閫氱敤涓婁紶璇锋眰锛堝涓級
+ */
+ @PostMapping("/uploads")
+ public AjaxResult uploadFiles(List files) throws Exception
+ {
+ try
+ {
+ // 涓婁紶鏂囦欢璺緞
+ String filePath = RuoYiConfig.getUploadPath();
+ List urls = new ArrayList();
+ List fileNames = new ArrayList();
+ List newFileNames = new ArrayList();
+ List originalFilenames = new ArrayList();
+ for (MultipartFile file : files)
+ {
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName = FileUploadUtils.upload(filePath, file);
+ String url = serverConfig.getUrl() + fileName;
+ urls.add(url);
+ fileNames.add(fileName);
+ newFileNames.add(FileUtils.getName(fileName));
+ originalFilenames.add(file.getOriginalFilename());
+ }
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+ ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+ ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+ ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ return ajax;
+ }
+ catch (Exception e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 鏈湴璧勬簮閫氱敤涓嬭浇
+ */
+ @GetMapping("/download/resource")
+ public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+ throws Exception
+ {
+ try
+ {
+ if (!FileUtils.checkAllowDownload(resource))
+ {
+ throw new Exception(StringUtils.format("璧勬簮鏂囦欢({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", resource));
+ }
+ // 鏈湴璧勬簮璺緞
+ String localPath = RuoYiConfig.getProfile();
+ // 鏁版嵁搴撹祫婧愬湴鍧
+ String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+ // 涓嬭浇鍚嶇О
+ String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, downloadName);
+ FileUtils.writeBytes(downloadPath, response.getOutputStream());
+ }
+ catch (Exception e)
+ {
+ log.error("涓嬭浇鏂囦欢澶辫触", e);
+ }
+ }
+}
diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/monitor/CacheController.java b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/monitor/CacheController.java
new file mode 100644
index 0000000..c012148
--- /dev/null
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/monitor/CacheController.java
@@ -0,0 +1,111 @@
+package com.zf.foodpurchase.web.controller.monitor;
+
+import com.zf.foodpurchase.common.constant.CacheConstants;
+import com.zf.foodpurchase.common.core.domain.AjaxResult;
+import com.zf.foodpurchase.common.utils.StringUtils;
+import com.zf.foodpurchase.system.domain.SysCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * 缂撳瓨鐩戞帶
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController
+{
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ private final static List caches = new ArrayList();
+ {
+ caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "鐢ㄦ埛淇℃伅"));
+ caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "閰嶇疆淇℃伅"));
+ caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "鏁版嵁瀛楀吀"));
+ caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "楠岃瘉鐮"));
+ caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "闃查噸鎻愪氦"));
+ caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "闄愭祦澶勭悊"));
+ caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @GetMapping()
+ public AjaxResult getInfo() throws Exception
+ {
+ Properties info = (Properties) redisTemplate.execute((RedisCallback