|
|
@@ -11,10 +11,7 @@ import com.poteviohealth.cgp.common.facade.time.MethodTime;
|
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
|
import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
|
|
|
import com.poteviohealth.cgp.common.model.VaultsResponse;
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.DishesOrderWebInDTO;
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.OrderCostWebInDTO;
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.OrderServiceWebInDTO;
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.OrderWebInDTO;
|
|
|
+import com.poteviohealth.cgp.statistics.model.indto.*;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.DishesOrderWebOutDTO;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderExcelDTO;
|
|
|
@@ -26,13 +23,9 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.log4j.Log4j2;
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
-import org.springframework.util.MultiValueMap;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
-import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -196,12 +189,9 @@ public class OrderController extends BaseWebController {
|
|
|
|
|
|
@RequestMapping(value = "/uploadArrayFile", method = RequestMethod.POST)
|
|
|
@ApiOperation(value = "阿里云图片上传")
|
|
|
- @ResponseBody
|
|
|
@MethodTime
|
|
|
- public VaultsResponse uploadArrayFile(HttpServletRequest request, HttpServletRequest response, @RequestParam("list") String list){
|
|
|
- MultipartHttpServletRequest multipartRequest=(MultipartHttpServletRequest) request;
|
|
|
- MultiValueMap<String, MultipartFile> multipartFile = multipartRequest.getMultiFileMap();
|
|
|
- log.info(multipartFile);
|
|
|
+ public VaultsResponse uploadArrayFile(@RequestBody List<PriceUploadDto> list){
|
|
|
+ log.info(list);
|
|
|
/* VaultsResponse<List<PriceUploadDto>> vaultsResponse = ossUtils.uploadArrayFile(list);
|
|
|
if(vaultsResponse.validate()){
|
|
|
return orderService.updateOrderUrl(list);
|
qin