冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

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

@@ -7,7 +7,6 @@


import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



@@ -18,6 +17,7 @@
import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.multipart.MultipartHttpServletRequest;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -27,8 +27,6 @@
import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;

import com.yeshi.fanli.service.inter.lable.LabelClassService;

import com.yeshi.fanli.util.StringUtil;

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

import org.yeshi.utils.JsonUtil;



@Controller

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

@@ -47,13 +45,9 @@
    * @param request

    * @param out

    */

   @RequestNoLogin()

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

   public void saveAdd(String callback, Long pid, Integer type, GoodsSubClass goodsSubClass, 

         HttpServletRequest request, HttpServletResponse response, PrintWriter out) {



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

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

         HttpServletRequest request, PrintWriter out) {

      try {



         String name = goodsSubClass.getName();

@@ -61,7 +55,6 @@
            out.print(JsonUtil.loadFalseResult("类别名称不能为空"));

            return;

         }





         if (pid == null) {

            out.print(JsonUtil.loadFalseResult("上级id为空"));

@@ -225,30 +218,23 @@
    * @param out

    * @param response

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadPicture")

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



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

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



   public void uploadPicture(Long id, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      if (file == null) {

         out.print(JsonUtil.loadFalseResult("图片文件不能为空"));

         return;

      }

		
      try {



         GoodsSubClass goodsSubClass = goodsSubClassService.selectByPrimaryKey(id);



         if (goodsSubClass == null) {

            out.print(JsonUtil.loadFalseResult("该类别不存在或已被删除"));

            return;

         }



         if (file == null) {

            out.print(JsonUtil.loadFalseResult("图片文件不能为空"));

            return;

         }



         int result = goodsSubClassService.uploadPicture(goodsSubClass, file);



         if (result == 1) {

            out.print(JsonUtil.loadTrueResult("上传成功"));

         } else {

@@ -256,11 +242,9 @@
         }



      } catch (Exception e) {

         // TODO Auto-generated catch block

         e.printStackTrace();

         out.print(JsonUtil.loadFalseResult("操作异常"));

      }



   }



   /**