小程序、app图片优化。根据String【】 是否为空判断是来自于小程序还是app。并做出相应的处理

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

@@ -5,11 +5,8 @@ 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.utils.ArrayStringUtils;
 import com.zf.foodpurchase.fdsafe.vo.AccompanyMealVO;
@@ -54,7 +51,11 @@ public class WxAppAccompanyMealController extends BaseController {
         }
         accompanyMealVO.setSchoolId(userVO.getSchoolId());
         // 参数处理,照片字段转换处理
-        accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage()));
+        // 如果图片字段为空说明从小程序段传过来的，则需要转换成数组
+        String[] images=accompanyMealVO.getAccompanyImage();
+        if(images == null){
+            accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage()));
+        }
         return accompanyMealService.saveVO(accompanyMealVO);
     }
 
@@ -66,7 +67,11 @@ public class WxAppAccompanyMealController extends BaseController {
         }
         accompanyMealVO.setSchoolId(userVO.getSchoolId());
         // 参数处理,照片字段转换处理
-        accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage()));
+        // 如果图片字段为空说明从小程序段传过来的，则需要转换成数组
+        String[] images=accompanyMealVO.getAccompanyImage();
+        if(images == null){
+            accompanyMealVO.setAccompanyImage(ArrayStringUtils.wxImgToArray(accompanyMealVO.getWxAccompanyImage()));
+        }
         return accompanyMealService.updateVO(accompanyMealVO);
     }
 

fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppCattenController.java

@@ -5,9 +5,6 @@ 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.common.valigroud.WxAddGroup;
 import com.zf.foodpurchase.common.valigroud.WxUpdateGroup;
 import com.zf.foodpurchase.fdsafe.service.ICattenService;
@@ -59,8 +56,14 @@ public class WxAppCattenController extends BaseController {
             return error("食品许可证图片不能为空");
         }
         cattenVO.setSchoolId(userVO.getSchoolId());
-        cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
+        String[] images1=cattenVO.getFoodLicenseImg();
-        cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
+        String[] images2=cattenVO.getLicenseImg();
+        if(images1 == null){
+            cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
+        }
+        if(images2 == null){
+            cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
+        }
         return cattenService.saveVO(cattenVO);
     }
 
@@ -78,8 +81,14 @@ public class WxAppCattenController extends BaseController {
             return error("食品许可证图片不能为空");
         }
         cattenVO.setSchoolId(userVO.getSchoolId());
-        cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
+        String[] images1=cattenVO.getFoodLicenseImg();
-        cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
+        String[] images2=cattenVO.getLicenseImg();
+        if(images1 == null){
+            cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
+        }
+        if(images2 == null){
+            cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
+        }
         return cattenService.updateVO(cattenVO);
     }
 

fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppDeliveryController.java

@@ -5,13 +5,11 @@ 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.utils.ArrayStringUtils;
 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;
@@ -52,6 +50,10 @@ public class WxAppDeliveryController extends BaseController {
         if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
             return AjaxResult.error("非学校人员账号无法操作");
         }
+        String[] images = schoolDeliveryVO.getSignImage();
+        if(images == null){
+            schoolDeliveryVO.setSignImage(ArrayStringUtils.wxImgToArray(schoolDeliveryVO.getWxSignImage()));
+        }
         schoolDeliveryVO.setSchoolId(userVO.getSchoolId());
         return supplierDeliveryService.schoolUpdateDelivery(schoolDeliveryVO);
     }

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

@@ -5,9 +5,6 @@ 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.common.valigroud.WxAddGroup;
 import com.zf.foodpurchase.common.valigroud.WxUpdateGroup;
 import com.zf.foodpurchase.fdsafe.service.IFoodSampleService;
@@ -57,7 +54,10 @@ public class WxAppFoodSampleController extends BaseController {
         }
         foodSampleVO.setSchoolId(userVO.getSchoolId());
         // 图片处理
-        foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
+        String[] images = foodSampleVO.getSaveImg();
+        if(images == null){
+            foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
+        }
         return foodSampleService.saveVO(foodSampleVO);
     }
 
@@ -73,7 +73,10 @@ public class WxAppFoodSampleController extends BaseController {
         }
         foodSampleVO.setSchoolId(userVO.getSchoolId());
         // 图片处理
-        foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
+        String[] images = foodSampleVO.getSaveImg();
+        if(images == null){
+            foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
+        }
         return foodSampleService.updateVO(foodSampleVO);
     }
 

fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningInspectionDetailController.java

@@ -5,7 +5,6 @@ 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;
@@ -88,7 +87,10 @@ public class WxAppMorningInspectionDetailController extends BaseController {
         if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
             return AjaxResult.error("非学校人员账号无法操作");
         }
-        morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(morningInspectionDetailVO.getWxAbnormalImg()));
+        String[] images = morningInspectionDetailVO.getAbnormalImg();
+        if(images == null){
+            morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(morningInspectionDetailVO.getWxAbnormalImg()));
+        }
         return morningInspectionDetailService.saveVO(morningInspectionDetailVO);
     }
 
@@ -98,7 +100,10 @@ public class WxAppMorningInspectionDetailController extends BaseController {
         if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
             return AjaxResult.error("非学校人员账号无法操作");
         }
-        morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(morningInspectionDetailVO.getWxAbnormalImg()));
+        String[] images = morningInspectionDetailVO.getAbnormalImg();
+        if(images == null){
+            morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(morningInspectionDetailVO.getWxAbnormalImg()));
+        }
         return morningInspectionDetailService.updateVO(morningInspectionDetailVO);
     }
 

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

@@ -5,7 +5,6 @@ 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;
@@ -51,7 +50,10 @@ public class WxAppRubbishDealController extends BaseController {
         }
         rubbishDealVO.setSchoolId(userVO.getSchoolId());
         // 图片处理
-        rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
+        String[] images = rubbishDealVO.getDealImg();
+        if(images == null){
+            rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
+        }
         return rubbishDealService.saveVO(rubbishDealVO);
     }
 
@@ -63,7 +65,10 @@ public class WxAppRubbishDealController extends BaseController {
         }
         rubbishDealVO.setSchoolId(userVO.getSchoolId());
         // 图片处理
-        rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
+        String[] images = rubbishDealVO.getDealImg();
+        if(images == null){
+            rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
+        }
         return rubbishDealService.updateVO(rubbishDealVO);
     }
 

fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSchoolStaffController.java

@@ -5,10 +5,10 @@ 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.utils.ArrayStringUtils;
 import com.zf.foodpurchase.fdsafe.vo.SchoolStaffVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -47,6 +47,10 @@ public class WxAppSchoolStaffController extends BaseController {
         if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
             return AjaxResult.error("非学校人员账号无法操作");
         }
+        String[] images = schoolStaffVO.getHealthCertImg();
+        if(images == null){
+            schoolStaffVO.setHealthCertImg(ArrayStringUtils.wxImgToArray(schoolStaffVO.getWxHealthCertImg()));
+        }
         schoolStaffVO.setSchoolId(userVO.getSchoolId());
         return schoolStaffService.saveVO(schoolStaffVO);
     }
@@ -57,6 +61,10 @@ public class WxAppSchoolStaffController extends BaseController {
         if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
             return AjaxResult.error("非学校人员账号无法操作");
         }
+        String[] images = schoolStaffVO.getHealthCertImg();
+        if(images == null){
+            schoolStaffVO.setHealthCertImg(ArrayStringUtils.wxImgToArray(schoolStaffVO.getWxHealthCertImg()));
+        }
         schoolStaffVO.setSchoolId(userVO.getSchoolId());
        return schoolStaffService.updateVO(schoolStaffVO);
     }

fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSelfInspectionRecordController.java

@@ -5,7 +5,6 @@ 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;
@@ -77,7 +76,10 @@ public class WxAppSelfInspectionRecordController extends BaseController {
         List<SelfInspectionDetailVO> selfInspectionDetailVOList = selfInspectionRecordVO.getSelfInspectionDetailVOList();
         if(!CollectionUtils.isEmpty(selfInspectionDetailVOList)){
             for (SelfInspectionDetailVO selfInspectionDetailVO : selfInspectionDetailVOList) {
-                selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(selfInspectionDetailVO.getWxAbnormalImg()));
+                String[] images = selfInspectionDetailVO.getAbnormalImg();
+                if(images == null){
+                    selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(selfInspectionDetailVO.getWxAbnormalImg()));
+                }
             }
         }
         return selfInspectionRecordService.saveVO(selfInspectionRecordVO);
@@ -94,7 +96,10 @@ public class WxAppSelfInspectionRecordController extends BaseController {
         List<SelfInspectionDetailVO> selfInspectionDetailVOList = selfInspectionRecordVO.getSelfInspectionDetailVOList();
         if(!CollectionUtils.isEmpty(selfInspectionDetailVOList)){
             for (SelfInspectionDetailVO selfInspectionDetailVO : selfInspectionDetailVOList) {
-                selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(selfInspectionDetailVO.getWxAbnormalImg()));
+                String[] images = selfInspectionDetailVO.getAbnormalImg();
+                if(images == null){
+                    selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(selfInspectionDetailVO.getWxAbnormalImg()));
+                }
             }
         }
         return selfInspectionRecordService.updateVO(selfInspectionRecordVO);

fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SchoolStaffServiceImpl.java

@@ -1,17 +1,16 @@
 package com.zf.foodpurchase.fdsafe.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zf.foodpurchase.common.core.domain.AjaxResult;
 import com.zf.foodpurchase.common.utils.bean.BeanUtils;
 import com.zf.foodpurchase.fdsafe.entity.SchoolStaff;
 import com.zf.foodpurchase.fdsafe.mapper.SchoolStaffMapper;
 import com.zf.foodpurchase.fdsafe.service.ISchoolStaffService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
 import com.zf.foodpurchase.fdsafe.vo.SchoolStaffVO;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -32,6 +31,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         if(!CollectionUtils.isEmpty(list)){
             list.forEach(item->{
                 item.setHealthCertImg(ArrayStringUtils.stringToArray(item.getHealthCertImgStr()));
+                item.setWxHealthCertImg(ArrayStringUtils.arrayToWxImgList(item.getHealthCertImg()));
             });
         }
         return list;

fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SupplierDeliveryServiceImpl.java

@@ -180,6 +180,7 @@ public class SupplierDeliveryServiceImpl extends ServiceImpl<SupplierDeliveryMap
         if(!CollectionUtils.isEmpty(list)){
             list.forEach(item -> {
                 item.setSignImage(ArrayStringUtils.stringToArray(item.getSignImageStr()));
+                item.setWxSignImage(ArrayStringUtils.arrayToWxImgList(item.getSignImage()));
             });
         }
         return list;

fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolDeliveryVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author:lilj
@@ -33,6 +34,7 @@ public class SchoolDeliveryVO extends CommonVO implements Serializable {
      */
     private String[] signImage;
     private String signImageStr;
+    private List<WxImg> wxSignImage;
 
     /**
      * 学校id

fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolStaffVO.java

@@ -1,22 +1,16 @@
 package com.zf.foodpurchase.fdsafe.vo;
 
-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.fasterxml.jackson.annotation.JsonFormat;
 import com.zf.foodpurchase.common.valigroud.AddGroup;
 import com.zf.foodpurchase.common.valigroud.UpdateGroup;
 import com.zf.foodpurchase.common.vo.CommonVO;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author:lilj
@@ -92,9 +86,10 @@ public class SchoolStaffVO extends CommonVO implements Serializable {
      * 
      * 健康证照片
      */
-    @NotEmpty(message = "健康证照片不能为空", groups={AddGroup.class, UpdateGroup.class})
+    // @NotEmpty(message = "健康证照片不能为空", groups={AddGroup.class, UpdateGroup.class})
     private String[] healthCertImg;
     private String healthCertImgStr;
+    List<WxImg> wxHealthCertImg;
 
     /**
      * 备注

fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SupplierDeliveryVO.java

@@ -1,15 +1,12 @@
 package com.zf.foodpurchase.fdsafe.vo;
 
-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.vo.CommonVO;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author:lilj
@@ -87,6 +84,7 @@ public class SupplierDeliveryVO extends CommonVO implements Serializable {
      */
     private String[] signImage;
     private String signImageStr;
+    List<WxImg> wxSignImage;
 
     /**
      * 送货单备注