zjk/SchoolFood
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

陪餐管理,采样管理,餐余垃圾处理,小程序图片适配

Browse Source
This commit is contained in:
林华觞
2025-06-23 17:26:50 +08:00
parent 4938f0614c
commit 906fbfd389
11 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppAccompanyMealController.java
View File

@@ -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);
}

5
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
View File

@@ -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);
}

5
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppRubbishDealController.java
View File

@@ -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);
}

1
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/AccompanyMealServiceImpl.java
View File

@@ -34,6 +34,7 @@ public class AccompanyMealServiceImpl extends ServiceImpl<AccompanyMealMapper, A
list.forEach(item -> {
String imageStr = item.getAccompanyImageStr();
item.setAccompanyImage(ArrayStringUtils.stringToArray(imageStr));
item.setWxAccompanyImage(ArrayStringUtils.arrayToWxImgList(item.getAccompanyImage()));
});
}
return list;

1
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java
View File

@@ -38,6 +38,7 @@ public class FoodSampleServiceImpl extends ServiceImpl<FoodSampleMapper, FoodSam
if(!CollectionUtils.isEmpty(list)){
list.forEach(item -> {
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());

1
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RubbishDealServiceImpl.java
View File

@@ -39,6 +39,7 @@ public class RubbishDealServiceImpl extends ServiceImpl<RubbishDealMapper, Rubbi
if(!CollectionUtils.isEmpty(list)){
list.forEach(item ->{
item.setDealImg(ArrayStringUtils.stringToArray(item.getDealImgStr()));
item.setWxDealImage(ArrayStringUtils.arrayToWxImgList(item.getDealImg()));
});
}
return list;

33
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/utils/ArrayStringUtils.java
View File

@@ -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<WxImg> 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<WxImg> arrayToWxImgList(String[] strArray){
if(strArray == null || strArray.length == 0){
return null;
}
List<WxImg> wxImgList = new ArrayList<>();
for (int i = 0; i < strArray.length; i++) {
WxImg wxImg = new WxImg();
wxImg.setUrl(strArray[i]);
wxImgList.add(wxImg);
}
return wxImgList;
}
}

5
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/AccompanyMealVO.java
View File

@@ -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<WxImg> wxAccompanyImage;
}

2
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java
View File

@@ -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<WxImg> wxSaveImage;
/**
* 目测状态:0 异常 1 良好

2
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RubbishDealVO.java
View File

@@ -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<WxImg> wxDealImage;
/**
* 创建时间

12
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/WxImg.java Normal file
View File

@@ -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;
}