|
@@ -11,7 +11,10 @@ import com.poteviohealth.cgp.common.facade.time.MethodTime;
|
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
|
import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
|
|
import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
|
|
|
import com.poteviohealth.cgp.common.model.VaultsResponse;
|
|
import com.poteviohealth.cgp.common.model.VaultsResponse;
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.*;
|
|
|
|
|
|
|
+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.outdto.DishesOrderWebOutDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.DishesOrderWebOutDTO;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderExcelDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderExcelDTO;
|
|
@@ -28,6 +31,8 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
+import java.io.IOException;
|
|
|
|
|
+import java.io.InputStream;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
@@ -194,6 +199,15 @@ public class OrderController extends BaseWebController {
|
|
|
public VaultsResponse uploadArrayFile(@RequestPart("files") MultipartFile[] files, @RequestParam("list") String list){
|
|
public VaultsResponse uploadArrayFile(@RequestPart("files") MultipartFile[] files, @RequestParam("list") String list){
|
|
|
log.info(list);
|
|
log.info(list);
|
|
|
log.info(files);
|
|
log.info(files);
|
|
|
|
|
+ for (MultipartFile file : files) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ InputStream inputStream = file.getInputStream();
|
|
|
|
|
+ log.info(inputStream);
|
|
|
|
|
+ log.info(file.getName());
|
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
/* VaultsResponse<List<PriceUploadDto>> vaultsResponse = ossUtils.uploadArrayFile(list);
|
|
/* VaultsResponse<List<PriceUploadDto>> vaultsResponse = ossUtils.uploadArrayFile(list);
|
|
|
if(vaultsResponse.validate()){
|
|
if(vaultsResponse.validate()){
|
|
|
return orderService.updateOrderUrl(list);
|
|
return orderService.updateOrderUrl(list);
|