Merge branch 'dev-2.11.0' of depot-qinghai/depot-device-qinghai into dev

src/main/java/com/chinaitop/depot/device/controller/BusinessImPurchaseSaleController.java

@@ -1,20 +1,28 @@
 package com.chinaitop.depot.device.controller;
 
 
+import com.chinaitop.depot.device.model.BusinessImAsset;
 import com.chinaitop.depot.device.model.BusinessImPurchaseSale;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleAddParam;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleEditParam;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSalePageParam;
 import com.chinaitop.depot.device.service.BusinessImPurchaseSaleService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 智能管理-综合业务管理-采购销售管理表 前端控制器
@@ -38,17 +46,32 @@ public class BusinessImPurchaseSaleController {
         return ResponseEntity.ok(businessImPurchaseSaleService.getList(pageParam));
     }
 
-    @PostMapping("/save")
-    @ApiOperation(value = "采购销售管理-新增", notes = "新增")
-    public ResponseEntity save(@Validated @RequestBody BusinessImPurchaseSaleAddParam param) {
-        return ResponseEntity.ok(businessImPurchaseSaleService.saveData(param));
+    @PostMapping("/saveAndUpdate")
+    @ApiOperation(value="采购销售管理-保存/修改", notes = "保存/修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="businessImPurchaseSaleJson", value="表数据", paramType="form")
+    })
+    public Map<String, Object> save(String businessImPurchaseSaleJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            BusinessImPurchaseSale businessImPurchaseSale = (BusinessImPurchaseSale)mapper.readValue(businessImPurchaseSaleJson, BusinessImPurchaseSale.class);
+            businessImPurchaseSaleService.saveOrUpdate(businessImPurchaseSale);
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存/修改失败！");
+            e.printStackTrace();
+        }
+        return modelMap;
     }
 
-    @PutMapping("/update")
+  /*  @PutMapping("/update")
     @ApiOperation(value = "采购销售管理-修改", notes = "修改")
     public ResponseEntity update(@Validated @RequestBody BusinessImPurchaseSaleEditParam param) {
         return ResponseEntity.ok(businessImPurchaseSaleService.updateData(param));
-    }
+    }*/
 
     @DeleteMapping("/delete/{id}")
     @ApiOperation(value = "采购销售管理-删除", notes = "id删除")