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

图片修改,必填的进行非空校验;非必填的可以更新为空

Browse Source
This commit is contained in:
林华觞
2025-08-01 09:17:18 +08:00
parent bffa56a4b4
commit 2cc4a5aeb6
17 changed files with 116 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java
View File

@@ -56,10 +56,14 @@ public class SupplierController extends BaseController {
List<WxImg> images = supplierVO.getWxLicenseImg();
if(!CollectionUtils.isEmpty( images)){
supplierVO.setLicenseImg(ArrayStringUtils.wxImgToArray(images));
}else{
supplierVO.setLicenseImg(null);
}
images = supplierVO.getWxFoodLicenseImg();
if(!CollectionUtils.isEmpty( images)){
supplierVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(images));
}else{
supplierVO.setFoodLicenseImg(null);
}
return supplierService.saveVO(supplierVO);
}
@@ -78,10 +82,14 @@ public class SupplierController extends BaseController {
List<WxImg> images = supplierVO.getWxLicenseImg();
if(!CollectionUtils.isEmpty( images)){
supplierVO.setLicenseImg(ArrayStringUtils.wxImgToArray(images));
}else{
supplierVO.setLicenseImg(null);
}
images = supplierVO.getWxFoodLicenseImg();
if(!CollectionUtils.isEmpty( images)){
supplierVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(images));
}else{
supplierVO.setFoodLicenseImg(null);
}
return supplierService.updateVO(supplierVO);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java
View File

@@ -58,6 +58,8 @@ public class AccompanyMealController extends BaseController {
List<WxImg> imageList = accompanyMealVO.getWxAccompanyImage();
if(!CollectionUtils.isEmpty(imageList)){
accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage()));
}else{
accompanyMealVO.setAccompanyImage(null);
}
return accompanyMealService.saveVO(accompanyMealVO);
}
@@ -75,6 +77,8 @@ public class AccompanyMealController extends BaseController {
List<WxImg> imageList = accompanyMealVO.getWxAccompanyImage();
if(!CollectionUtils.isEmpty(imageList)){
accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage()));
}else{
accompanyMealVO.setAccompanyImage(null);
}
return accompanyMealService.updateVO(accompanyMealVO);
}

31
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java
View File

@@ -42,6 +42,12 @@ public class CattenController extends BaseController {
return getDataTable(list);
}
/**
* 营业执照,食品许可证图片不能为空
* @param cattenVO
* @return
*/
@PostMapping("/add")
public AjaxResult add(@Validated(AddGroup.class) @RequestBody CattenVO cattenVO) {
SysUser user = getLoginUser().getUser();
@@ -51,18 +57,29 @@ public class CattenController extends BaseController {
return error("非学校账号无法添加食堂");
}
}
// 图片校验不能为空
// wxImage形式
List<WxImg> imageList = cattenVO.getWxLicenseImg();
if(!CollectionUtils.isEmpty(imageList)){
if(CollectionUtils.isEmpty(imageList)){
return error("营业执照图片不能为空");
}else{
cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
}
imageList = cattenVO.getWxFoodLicenseImg();
if(!CollectionUtils.isEmpty(imageList)){
if(CollectionUtils.isEmpty(imageList)){
return error("食品许可证图片不能为空");
}else{
cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
}
return cattenService.saveVO(cattenVO);
}
/**
* 营业执照,食品许可证图片不能为空
* @param cattenVO
* @return
*/
@PostMapping("/update")
public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody CattenVO cattenVO) {
SysUser user = getLoginUser().getUser();
@@ -72,13 +89,19 @@ public class CattenController extends BaseController {
return error("非学校账号无法修改食堂信息");
}
}
// 图片校验不能为空
// wxImage形式
List<WxImg> imageList = cattenVO.getWxLicenseImg();
if(!CollectionUtils.isEmpty(imageList)){
if(CollectionUtils.isEmpty(imageList)){
return error("营业执照图片不能为空");
}else{
cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
}
imageList = cattenVO.getWxFoodLicenseImg();
if(!CollectionUtils.isEmpty(imageList)){
if(CollectionUtils.isEmpty(imageList)){
return error("食品许可证图片不能为空");
}else{
cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
}
return cattenService.updateVO(cattenVO);

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java
View File

@@ -56,6 +56,8 @@ public class FoodSampleController extends BaseController {
List<WxImg> imageList = foodSampleVO.getWxSaveImg();
if(!CollectionUtils.isEmpty(imageList)){
foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(imageList));
}else{
return error("留样图片不能为空");
}
return foodSampleService.saveVO(foodSampleVO);
}
@@ -73,6 +75,8 @@ public class FoodSampleController extends BaseController {
List<WxImg> imageList = foodSampleVO.getWxSaveImg();
if(!CollectionUtils.isEmpty(imageList)){
foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(imageList));
}else{
return error("留样图片不能为空");
}
return foodSampleService.updateVO(foodSampleVO);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java
View File

@@ -95,6 +95,8 @@ public class MorningInspectionDetailController extends BaseController {
List<WxImg> images = morningInspectionDetailVO.getWxAbnormalImg();
if(!CollectionUtils.isEmpty( images)){
morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(images));
}else{
morningInspectionDetailVO.setAbnormalImg(null);
}
return morningInspectionDetailService.saveVO(morningInspectionDetailVO);
}
@@ -112,6 +114,8 @@ public class MorningInspectionDetailController extends BaseController {
List<WxImg> images = morningInspectionDetailVO.getWxAbnormalImg();
if(!CollectionUtils.isEmpty( images)){
morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(images));
}else{
morningInspectionDetailVO.setAbnormalImg(null);
}
return morningInspectionDetailService.updateVO(morningInspectionDetailVO);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java
View File

@@ -56,6 +56,8 @@ public class RubbishDealController extends BaseController {
List<WxImg> imageList = rubbishDealVO.getWxDealImg();
if(!CollectionUtils.isEmpty(imageList)){
rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
}else{
rubbishDealVO.setDealImg(null);
}
return rubbishDealService.saveVO(rubbishDealVO);
}
@@ -73,6 +75,8 @@ public class RubbishDealController extends BaseController {
List<WxImg> imageList = rubbishDealVO.getWxDealImg();
if(!CollectionUtils.isEmpty(imageList)){
rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
}else{
rubbishDealVO.setDealImg(null);
}
return rubbishDealService.updateVO(rubbishDealVO);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java
View File

@@ -61,6 +61,8 @@ public class SchoolStaffController extends BaseController {
List<WxImg> imageList = schoolStaffVO.getWxHealthCertImg();
if(!CollectionUtils.isEmpty(imageList)){
schoolStaffVO.setHealthCertImg(ArrayStringUtils.wxImgToArray(schoolStaffVO.getWxHealthCertImg()));
}else{
return error("健康证图片不能为空");
}
return schoolStaffService.saveVO(schoolStaffVO);
}
@@ -78,6 +80,8 @@ public class SchoolStaffController extends BaseController {
List<WxImg> imageList = schoolStaffVO.getWxHealthCertImg();
if(!CollectionUtils.isEmpty(imageList)){
schoolStaffVO.setHealthCertImg(ArrayStringUtils.wxImgToArray(schoolStaffVO.getWxHealthCertImg()));
}else{
return error("健康证图片不能为空");
}
return schoolStaffService.updateVO(schoolStaffVO);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java
View File

@@ -60,6 +60,8 @@ public class SelfInspectionRecordController extends BaseController {
List<WxImg> images = selfInspectionDetailVO.getWxAbnormalImg();
if(!CollectionUtils.isEmpty( images)){
selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(images));
}else{
selfInspectionDetailVO.setAbnormalImg(null);
}
}
}
@@ -82,6 +84,8 @@ public class SelfInspectionRecordController extends BaseController {
List<WxImg> images = selfInspectionDetailVO.getWxAbnormalImg();
if(!CollectionUtils.isEmpty( images)){
selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(images));
}else{
selfInspectionDetailVO.setAbnormalImg(null);
}
}
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryItemController.java
View File

@@ -67,6 +67,8 @@ public class SupplierDeliveryItemController extends BaseController {
List<WxImg> images = supplierDeliveryItemUpdateVO.getWxCheckReportImage();
if(!CollectionUtils.isEmpty( images)){
supplierDeliveryItemUpdateVO.setCheckReportImage(ArrayStringUtils.wxImgToArray(images));
}else{
supplierDeliveryItemUpdateVO.setCheckReportImage(null);
}
return supplierDeliveryItemService.updateVO(supplierDeliveryItemUpdateVO);
}