Browse Source

后台界面 -- 公务用车模块 json上传接口调整

zhanghao 1 month ago
parent
commit
51849664fe

+ 4 - 2
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePublicCarController.java

@@ -15,6 +15,8 @@ import org.springframework.web.multipart.MultipartFile;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Arrays;
+import java.util.Map;
+
 @RestController
 @RestController
 @RequestMapping("/zcustom/public")
 @RequestMapping("/zcustom/public")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -60,7 +62,7 @@ public class LargePublicCarController extends BaseController {
     }
     }
 
 
     @PostMapping("/upload")
     @PostMapping("/upload")
-    public AjaxResult upload(@RequestParam("type") String type, @RequestParam("json") String json) {
-        return toAjax(largePlatPublicCarService.upload(type, json));
+    public AjaxResult upload(@RequestParam("type") String type, @RequestBody Map<String, Object> obj) {
+        return toAjax(largePlatPublicCarService.upload(type, obj));
     }
     }
 }
 }

+ 2 - 1
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargePublicCarService.java

@@ -7,6 +7,7 @@ import com.project.common.core.domain.search.PageParamVo;
 import com.project.zcustom.domain.addional.LargeCar;
 import com.project.zcustom.domain.addional.LargeCar;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 public interface ILargePublicCarService extends IService<LargeCar> {
 public interface ILargePublicCarService extends IService<LargeCar> {
 
 
@@ -77,6 +78,6 @@ public interface ILargePublicCarService extends IService<LargeCar> {
      */
      */
     public void checkFieldExist(String field, String filedValue,String tips,Long id);
     public void checkFieldExist(String field, String filedValue,String tips,Long id);
 
 
-    int upload(String type, String json);
+    int upload(String type, Map<String, Object> json);
 
 
 }
 }

+ 3 - 3
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePublicCarServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
 @Service
 public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper, LargeCar> implements ILargePublicCarService {
 public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper, LargeCar> implements ILargePublicCarService {
@@ -223,10 +224,9 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
         }
         }
     }
     }
 
 
-    public int upload(String type, String json){
+    public int upload(String type, Map<String, Object> json){
         try {
         try {
-            String str = URLDecoder.decode(json, "UTF-8");
-            List<LargeCar> list = JSON.parseArray(JSONObject.parseObject(str).getString("data"), LargeCar.class);
+            List<LargeCar> list = JSON.parseArray(JSON.toJSONString(json.get("data")), LargeCar.class);
             for (LargeCar largeCar : list){
             for (LargeCar largeCar : list){
                 LargeCar car = this.getOne(new QueryWrapper<LargeCar>().eq("app_encode", largeCar.getAppEncode()));
                 LargeCar car = this.getOne(new QueryWrapper<LargeCar>().eq("app_encode", largeCar.getAppEncode()));
                 if (car != null) {
                 if (car != null) {