比价相关的bug修复

admin

2020-07-22 73a3d86a47d8da711b609cd224c63526f7d00f9b

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -9,11 +9,8 @@
import java.util.UUID;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import com.yeshi.fanli.entity.accept.AdminAcceptData;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -23,28 +20,27 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

import org.yeshi.utils.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/upload")

public class UploadController {



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private OrderService orderService;

@@ -74,13 +70,13 @@
   // private static final String ORDERFAILURE = "订单失效";



   @RequestMapping(value = "uploadImg", method = RequestMethod.POST)

   public void uploadImg(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

   public void uploadImg(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      try {

         InputStream inputStream = file.getInputStream();

         String contentType = file.getContentType();

         String type = contentType.substring(contentType.indexOf("/") + 1);

         String uploadFilePath = COSManager.getInstance()

               .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();

               .uploadFile(inputStream, FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();

         out.print(JsonUtil.loadTrueResult(uploadFilePath));

      } catch (IOException e) {

         e.printStackTrace();

@@ -97,13 +93,13 @@
    * @param out

    */

   @RequestMapping(value = "uploadInstallApk")

   public void uploadInstallApk(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

   public void uploadInstallApk(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      try {

         InputStream inputStream = file.getInputStream();

         String contentType = file.getContentType();

         String type = contentType.substring(contentType.indexOf("/") + 1);

         String uploadFilePath = COSManager.getInstance()

               .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")

               .uploadFile(inputStream, FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")

               .getUrl();

         out.print(JsonUtil.loadTrueResult(uploadFilePath));

      } catch (Exception e) {

@@ -113,7 +109,7 @@
   }



   @RequestMapping(value = "uploadfImg")

   public void uploadfImg(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

   public void uploadfImg(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      try {

         InputStream inputStream = file.getInputStream();

         long timeMillis = System.currentTimeMillis();

@@ -121,7 +117,7 @@
         String contentType = file.getContentType();

         String type = contentType.substring(contentType.indexOf("/") + 1);

         String uploadFilePath = COSManager.getInstance()

               .uploadFile(inputStream, "section/" + date + "/" + timeMillis + "." + type).getUrl();

               .uploadFile(inputStream, FilePathEnum.section.getPath() + timeMillis + "." + type).getUrl();

         JSONObject data = new JSONObject();

         data.put("original", file.getOriginalFilename());

         data.put("name", file.getOriginalFilename());

@@ -155,7 +151,7 @@
            while (its.hasNext()) {

               String key = its.next();

               List<TaoBaoOrder> orders = map.get(key);

               String redisKey = "addorderqueue-" + key;

               String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, key);

               // redis做频率限制

               if (Constant.IS_OUTNET) {

                  try {

@@ -168,7 +164,7 @@
                  }

               }



               CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);

               CMQManager.getInstance().addTaoBaoOrderMsg(key);

               try {

                  // 6小时内不再处理

                  if (Constant.IS_OUTNET) {

@@ -189,7 +185,7 @@
   }



   @RequestMapping(value = "uploadOrder", method = RequestMethod.POST)

   public void uploadOrder(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

   public void uploadOrder(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      if (file != null) {

         try {

            List<TaoBaoOrder> orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());

@@ -218,28 +214,12 @@


   /**

    * 新后台端 上传订单文件

    * 
    * @param acceptData

    * @param file

    *            excel文件

    * @param uid

    *            当前用户id

    * @param request

    * @param response

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadOrderFile")

   public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletRequest request,

         HttpServletResponse response, PrintWriter out) {



      response.setHeader("Access-Control-Allow-Origin", "*");

      response.setHeader("Access-Control-Allow-Methods", "*");



      AdminUser admin = adminUserService.selectByPrimaryKey(uid);

      if (admin == null) {

         out.print(JsonUtil.loadFalseResult("用户验证未通过"));

         return;

      }

   public void uploadOrderFile(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {



      if (file == null) {

         out.print(JsonUtil.loadFalseResult("上传文件不能为空"));

@@ -279,10 +259,8 @@
    * @param file

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadPicture")

   public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, HttpServletResponse response,

         PrintWriter out) {

   public void uploadPicture(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {



      if (file == null) {

         out.print(JsonUtil.loadFalseResult("上传文件为空"));

@@ -294,7 +272,7 @@
         String contentType = file.getContentType();

         String type = contentType.substring(contentType.indexOf("/") + 1);

         // 上传文件相对位置

         String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type;

         String fileUrl=FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;

         

         String uploadPath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();

         

@@ -320,17 +298,7 @@
    * @param out

    */

   @RequestMapping(value = "installPackage")

   public void installPackage(@RequestParam("file") CommonsMultipartFile file, Long uid, 
         HttpServletResponse response, PrintWriter out) {

		
      response.setHeader("Access-Control-Allow-Origin", "*");

      response.setHeader("Access-Control-Allow-Methods", "*");

		
      AdminUser admin = adminUserService.selectByPrimaryKey(uid);

      if (admin == null) {

         out.print(JsonUtil.loadFalseResult("当前账户验证失败"));

         return;

      }

   public void installPackage(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      

      if (file == null) {

         out.print(JsonUtil.loadFalseResult("上传文件为空"));

@@ -343,7 +311,7 @@
         String type = contentType.substring(contentType.indexOf("/") + 1);

         

         // 上传文件相对位置

         String fileUrl="/apk/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";

         String fileUrl= FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";

         

         String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();