Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/FaceServiceImpl.java

@@ -3,8 +3,11 @@ package com.bonus.canteen.core.android.service.impl;
 import com.bonus.canteen.core.android.dto.AppDTO;
 import com.bonus.canteen.core.android.mapper.FaceMapper;
 import com.bonus.canteen.core.android.service.FaceService;
+import com.bonus.canteen.core.kitchen.utils.FileCommonUtils;
 import com.bonus.canteen.core.user.domain.UserFace;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.system.api.RemoteFileService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -18,9 +21,14 @@ import java.util.List;
 public class FaceServiceImpl implements FaceService {
     @Resource
     private FaceMapper mapper;
+    @Autowired
+    RemoteFileService remoteFileService;
     @Override
     public AjaxResult getFaceFeatureList(AppDTO dto) {
         List<UserFace> list = mapper.getFaceFeatureList(dto);
+         for (UserFace userFace : list){
+             userFace.setPhotoUrl(remoteFileService.getFullFileUrl(FileCommonUtils.getFullFileUrl(userFace.getPhotoUrl())));
+         }
         return AjaxResult.success(list);
     }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteMealServiceImpl.java

@@ -7,6 +7,8 @@ import com.bonus.canteen.core.kitchen.utils.FileCommonUtils;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.system.api.RemoteFileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.kitchen.mapper.KitchenWasteMealMapper;
@@ -21,6 +23,7 @@ import com.bonus.canteen.core.kitchen.service.IKitchenWasteMealService;
  */
 @Service
 public class KitchenWasteMealServiceImpl implements IKitchenWasteMealService {
+    private static final Logger log = LoggerFactory.getLogger(KitchenWasteMealServiceImpl.class);
     @Autowired
     private KitchenWasteMealMapper kitchenWasteMealMapper;
 
@@ -47,8 +50,10 @@ public class KitchenWasteMealServiceImpl implements IKitchenWasteMealService {
     public List<KitchenWasteMeal> selectKitchenWasteMealList(KitchenWasteMeal kitchenWasteMeal) {
         List<KitchenWasteMeal> kitchenWasteMeals = kitchenWasteMealMapper.selectKitchenWasteMealList(kitchenWasteMeal);
             for (KitchenWasteMeal item : kitchenWasteMeals) {
+                log.error("后台获取的url"+item.getFileUrl());
                     item.setFileUrl(remoteFileService.getFullFileUrl(
                             FileCommonUtils.getFullFileUrl(item.getFileUrl())));
+                log.error("处理之后的url"+item.getFileUrl());
             }
         return kitchenWasteMeals;
     }