From 6f930fc318a23049e35ebd4db01b78e7fcd6b2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=8D=8E=E8=A7=9E?= <2840315406@qq.com> Date: Fri, 11 Jul 2025 09:02:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=A0=A1=E9=AA=8C,=E5=95=86=E5=93=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2sql=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxapp/school/WxAppCattenController.java | 15 +++++++++++++++ .../wxapp/school/WxAppFoodSampleController.java | 9 +++++++++ fp-admin/src/main/resources/application.yml | 7 +++++-- .../com/zf/foodpurchase/fdsafe/vo/CattenVO.java | 8 ++++---- .../zf/foodpurchase/fdsafe/vo/FoodSampleVO.java | 2 +- .../main/resources/mapper/FoodProductMapper.xml | 2 +- 6 files changed, 35 insertions(+), 8 deletions(-) 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 index c7aea5f..f357c77 100644 --- 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 @@ -14,6 +14,7 @@ import com.zf.foodpurchase.fdsafe.service.ICattenService; import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils; import com.zf.foodpurchase.fdsafe.vo.CattenVO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -50,6 +51,13 @@ public class WxAppCattenController extends BaseController { if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){ return AjaxResult.error("非学校人员账号无法操作"); } + // 图片信息校验 + if(CollectionUtils.isEmpty(cattenVO.getWxLicenseImg()) && (cattenVO.getLicenseImg() == null || cattenVO.getLicenseImg().length == 0)){ + return error("营业执照图片不能为空"); + } + if(CollectionUtils.isEmpty(cattenVO.getWxFoodLicenseImg()) && (cattenVO.getFoodLicenseImg() == null || cattenVO.getFoodLicenseImg().length == 0)){ + return error("食品许可证图片不能为空"); + } cattenVO.setSchoolId(userVO.getSchoolId()); cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg())); cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg())); @@ -62,6 +70,13 @@ public class WxAppCattenController extends BaseController { if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){ return AjaxResult.error("非学校人员账号无法操作"); } + // 图片信息校验 + if(CollectionUtils.isEmpty(cattenVO.getWxLicenseImg()) && (cattenVO.getLicenseImg() == null || cattenVO.getLicenseImg().length == 0)){ + return error("营业执照图片不能为空"); + } + if(CollectionUtils.isEmpty(cattenVO.getWxFoodLicenseImg()) && (cattenVO.getFoodLicenseImg() == null || cattenVO.getFoodLicenseImg().length == 0)){ + return error("食品许可证图片不能为空"); + } cattenVO.setSchoolId(userVO.getSchoolId()); cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg())); cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg())); 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 index 3bed3b2..66b411f 100644 --- 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 @@ -14,6 +14,7 @@ import com.zf.foodpurchase.fdsafe.service.IFoodSampleService; import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils; import com.zf.foodpurchase.fdsafe.vo.FoodSampleVO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -50,6 +51,10 @@ public class WxAppFoodSampleController extends BaseController { if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){ return AjaxResult.error("非学校人员账号无法操作"); } + // 图片校验小程序与app使用图片字段不一样,不能同时为空 + if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ + return error("留样照片不能为空"); + } foodSampleVO.setSchoolId(userVO.getSchoolId()); // 图片处理 foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage())); @@ -62,6 +67,10 @@ public class WxAppFoodSampleController extends BaseController { if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){ return AjaxResult.error("非学校人员账号无法操作"); } + // 图片校验小程序与app使用图片字段不一样,不能同时为空 + if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ + return error("留样照片不能为空"); + } foodSampleVO.setSchoolId(userVO.getSchoolId()); // 图片处理 foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage())); diff --git a/fp-admin/src/main/resources/application.yml b/fp-admin/src/main/resources/application.yml index 3db53f3..23c6496 100644 --- a/fp-admin/src/main/resources/application.yml +++ b/fp-admin/src/main/resources/application.yml @@ -16,7 +16,9 @@ ruoyi: # imagePrefix: http://192.168.1.124:8080 # 正常访问路径: # http://download.zhengfankeji.com/upload/foodPurchase/upload/2024/12/31/3_20241231182707A001.jpg - imagePrefix: http://download.zhengfankeji.com/upload/schoolFood/upload/ +# imagePrefix: http://download.zhengfankeji.com/upload/schoolFood/upload/ +# 小程序组件要求图片必须为https,对应图片前缀 + imagePrefix: https://zfxc.zhengfankeji.com/upload/schoolFood/upload/ # 开发环境配置 server: @@ -100,7 +102,8 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 +# expireTime: 30 + expireTime: 7200 ## MyBatis配置 #mybatis: diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/CattenVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/CattenVO.java index 668ad46..14f1f39 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/CattenVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/CattenVO.java @@ -68,19 +68,19 @@ public class CattenVO extends CommonVO implements Serializable { /** * 营业执照 */ - @NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class}) + @NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class}) private String[] licenseImg; private String licenseImgStr; - @NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class}) + // @NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class}) private List wxLicenseImg; /** * 食品许可证 */ - @NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class}) + @NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class}) private String[] foodLicenseImg; private String foodLicenseImgStr; - @NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class}) + // @NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class}) private List wxFoodLicenseImg; /** diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java index faae86f..bded7cd 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java @@ -74,7 +74,7 @@ public class FoodSampleVO extends CommonVO implements Serializable { @NotEmpty(message = "留样照片不能为空", groups = {UpdateGroup.class, AddGroup.class}) private String[] saveImg; private String saveImgStr; - @NotEmpty(message = "留样照片不能为空", groups = {WxUpdateGroup.class, WxAddGroup.class}) + // @NotEmpty(message = "留样照片不能为空", groups = {WxUpdateGroup.class, WxAddGroup.class}) private List wxSaveImage; /** diff --git a/fp-system/src/main/resources/mapper/FoodProductMapper.xml b/fp-system/src/main/resources/mapper/FoodProductMapper.xml index c7e4c33..43df074 100644 --- a/fp-system/src/main/resources/mapper/FoodProductMapper.xml +++ b/fp-system/src/main/resources/mapper/FoodProductMapper.xml @@ -38,7 +38,7 @@ and f.food_name like concat('%',#{foodName},'%') - + and fp.del_flag = #{delFlag}