From 906fbfd3894c7bb593684788530f70a0af55431e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=8D=8E=E8=A7=9E?= <2840315406@qq.com> Date: Mon, 23 Jun 2025 17:26:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=AA=E9=A4=90=E7=AE=A1=E7=90=86,=E9=87=87?= =?UTF-8?q?=E6=A0=B7=E7=AE=A1=E7=90=86,=E9=A4=90=E4=BD=99=E5=9E=83?= =?UTF-8?q?=E5=9C=BE=E5=A4=84=E7=90=86,=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/WxAppAccompanyMealController.java | 5 +++ .../school/WxAppFoodSampleController.java | 5 +++ .../school/WxAppRubbishDealController.java | 5 +++ .../impl/AccompanyMealServiceImpl.java | 1 + .../service/impl/FoodSampleServiceImpl.java | 1 + .../service/impl/RubbishDealServiceImpl.java | 1 + .../fdsafe/utils/ArrayStringUtils.java | 33 +++++++++++++++++++ .../fdsafe/vo/AccompanyMealVO.java | 5 +++ .../foodpurchase/fdsafe/vo/FoodSampleVO.java | 2 ++ .../foodpurchase/fdsafe/vo/RubbishDealVO.java | 2 ++ .../com/zf/foodpurchase/fdsafe/vo/WxImg.java | 12 +++++++ 11 files changed, 72 insertions(+) create mode 100644 fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/WxImg.java 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 index 134b66c..3ad39bd 100644 --- 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 @@ -11,6 +11,7 @@ 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.utils.ArrayStringUtils; import com.zf.foodpurchase.fdsafe.vo.AccompanyMealVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -52,6 +53,8 @@ public class WxAppAccompanyMealController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } accompanyMealVO.setSchoolId(userVO.getSchoolId()); + // 参数处理,照片字段转换处理 + accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage())); return accompanyMealService.saveVO(accompanyMealVO); } @@ -62,6 +65,8 @@ public class WxAppAccompanyMealController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } accompanyMealVO.setSchoolId(userVO.getSchoolId()); + // 参数处理,照片字段转换处理 + accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage())); return accompanyMealService.updateVO(accompanyMealVO); } 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 d3a5790..a216c30 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 @@ -9,6 +9,7 @@ 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.utils.ArrayStringUtils; import com.zf.foodpurchase.fdsafe.vo.FoodSampleVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -48,6 +49,8 @@ public class WxAppFoodSampleController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } foodSampleVO.setSchoolId(userVO.getSchoolId()); + // 图片处理 + foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage())); return foodSampleService.saveVO(foodSampleVO); } @@ -58,6 +61,8 @@ public class WxAppFoodSampleController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } foodSampleVO.setSchoolId(userVO.getSchoolId()); + // 图片处理 + foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage())); return foodSampleService.updateVO(foodSampleVO); } 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 index c94f870..3b732c6 100644 --- 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 @@ -9,6 +9,7 @@ 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.utils.ArrayStringUtils; import com.zf.foodpurchase.fdsafe.vo.RubbishDealVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -49,6 +50,8 @@ public class WxAppRubbishDealController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } rubbishDealVO.setSchoolId(userVO.getSchoolId()); + // 图片处理 + rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImage())); return rubbishDealService.saveVO(rubbishDealVO); } @@ -59,6 +62,8 @@ public class WxAppRubbishDealController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } rubbishDealVO.setSchoolId(userVO.getSchoolId()); + // 图片处理 + rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImage())); return rubbishDealService.updateVO(rubbishDealVO); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/AccompanyMealServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/AccompanyMealServiceImpl.java index 7ea132f..90d9570 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/AccompanyMealServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/AccompanyMealServiceImpl.java @@ -34,6 +34,7 @@ public class AccompanyMealServiceImpl extends ServiceImpl { String imageStr = item.getAccompanyImageStr(); item.setAccompanyImage(ArrayStringUtils.stringToArray(imageStr)); + item.setWxAccompanyImage(ArrayStringUtils.arrayToWxImgList(item.getAccompanyImage())); }); } return list; diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java index f99c099..99370b2 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java @@ -38,6 +38,7 @@ public class FoodSampleServiceImpl extends ServiceImpl { item.setSaveImg(ArrayStringUtils.stringToArray(item.getSaveImgStr())); + item.setWxSaveImage(ArrayStringUtils.arrayToWxImgList(item.getSaveImg())); // FoodBookVO foodBookVO = this.getFoodBookVOById(item.getBookId()); // if(foodBookVO != null){ // item.setDishNames(foodBookVO.getDishNames()); diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RubbishDealServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RubbishDealServiceImpl.java index 0b872a4..95d03b7 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RubbishDealServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RubbishDealServiceImpl.java @@ -39,6 +39,7 @@ public class RubbishDealServiceImpl extends ServiceImpl{ item.setDealImg(ArrayStringUtils.stringToArray(item.getDealImgStr())); + item.setWxDealImage(ArrayStringUtils.arrayToWxImgList(item.getDealImg())); }); } return list; diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/utils/ArrayStringUtils.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/utils/ArrayStringUtils.java index 19d2780..4bdfb13 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/utils/ArrayStringUtils.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/utils/ArrayStringUtils.java @@ -6,6 +6,10 @@ package com.zf.foodpurchase.fdsafe.utils; */ import com.zf.foodpurchase.common.utils.StringUtils; +import com.zf.foodpurchase.fdsafe.vo.WxImg; + +import java.util.ArrayList; +import java.util.List; /** * 照片转换处理工具类 @@ -38,4 +42,33 @@ public class ArrayStringUtils { } return sb.toString(); } + + /** + * 微信小程序组件图片转url字符串数组 + * @param wxImgList + * @return + */ + public static String[] wxImgToArray(List wxImgList) { + if(wxImgList == null || wxImgList.isEmpty()){ + return new String[0]; + } + String[] strArray = new String[wxImgList.size()]; + for (int i = 0; i < wxImgList.size(); i++) { + strArray[i] = wxImgList.get(i).getUrl(); + } + return strArray; + } + + public static List arrayToWxImgList(String[] strArray){ + if(strArray == null || strArray.length == 0){ + return null; + } + List wxImgList = new ArrayList<>(); + for (int i = 0; i < strArray.length; i++) { + WxImg wxImg = new WxImg(); + wxImg.setUrl(strArray[i]); + wxImgList.add(wxImg); + } + return wxImgList; + } } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/AccompanyMealVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/AccompanyMealVO.java index 6060289..f2385fa 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/AccompanyMealVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/AccompanyMealVO.java @@ -13,6 +13,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @author:lilj @@ -112,4 +113,8 @@ public class AccompanyMealVO extends CommonVO implements Serializable { */ private Date accompanyTime; + /** + * 微信小程序图片上传组件 + */ + private List wxAccompanyImage; } 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 56a943f..58f6eee 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 @@ -14,6 +14,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @author:lilj @@ -71,6 +72,7 @@ public class FoodSampleVO extends CommonVO implements Serializable { @NotEmpty(message = "留样照片不能为空", groups = {UpdateGroup.class, AddGroup.class}) private String[] saveImg; private String saveImgStr; + private List wxSaveImage; /** * 目测状态:0 异常 1 良好 diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RubbishDealVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RubbishDealVO.java index fcc18d3..2547708 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RubbishDealVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RubbishDealVO.java @@ -13,6 +13,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @author:lilj @@ -75,6 +76,7 @@ public class RubbishDealVO extends CommonVO implements Serializable { */ private String[] dealImg; private String dealImgStr; + private List wxDealImage; /** * 创建时间 diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/WxImg.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/WxImg.java new file mode 100644 index 0000000..2bbe0b4 --- /dev/null +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/WxImg.java @@ -0,0 +1,12 @@ +package com.zf.foodpurchase.fdsafe.vo; + +import lombok.Data; + +/** + * @author:lilj + * @date:2025/6/23 + */ +@Data +public class WxImg { + private String url; +}