Selaa lähdekoodia

release of '素材大盘' on 2021.3.19

jiequan.bi 4 vuotta sitten
vanhempi
commit
56781c0c1a

+ 75 - 45
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialReportOverViewController.java

@@ -173,107 +173,137 @@ public class MaterialReportOverViewController {
     }
 
     @PostMapping("/materialDetailCost")
-    public Result<List<JSONObject>> materialDetailCost(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceCostByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailCost(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("cost",materialReportOverViewMapper.queryBytedanceCostByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailClick")
-    public Result<List<JSONObject>> materialDetailClick(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceClickByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailClick(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("click",materialReportOverViewMapper.queryBytedanceClickByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailMaterialShow")
-    public Result<List<JSONObject>> materialDetailMaterialShow(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceMaterialShowByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailMaterialShow(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("materialShow",materialReportOverViewMapper.queryBytedanceMaterialShowByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailPlay100Rate")
-    public Result<List<JSONObject>> materialDetailPlay100Rate(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedancePlay100RateByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailPlay100Rate(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("play100Rate",materialReportOverViewMapper.queryBytedancePlay100RateByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailLikeMaterial")
-    public Result<List<JSONObject>> materialDetailLikeMaterial(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceLikeMaterialByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailLikeMaterial(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("likeMaterial",materialReportOverViewMapper.queryBytedanceLikeMaterialByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailCommentMaterial")
-    public Result<List<JSONObject>> materialDetailCommentMaterial(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceCommentMaterialByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailCommentMaterial(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("commentMaterial",materialReportOverViewMapper.queryBytedanceCommentMaterialByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailShareMaterial")
-    public Result<List<JSONObject>> materialDetailShareMaterial(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceShareMaterialByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailShareMaterial(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("shareMaterial",materialReportOverViewMapper.queryBytedanceShareMaterialByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailFollow")
-    public Result<List<JSONObject>> materialDetailFollow(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryBytedanceFollowByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailFollow(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("follow",materialReportOverViewMapper.queryBytedanceFollowByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailCharge")
-    public Result<List<JSONObject>> materialDetailCharge(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouChargeByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailCharge(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("charge",materialReportOverViewMapper.queryKuaishouChargeByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailPhotoShow")
-    public Result<List<JSONObject>> materialDetailPhotoShow(@RequestBody JSONObject params){
-        Result<List<JSONObject>>  result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouPhotoShowByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailPhotoShow(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("photoShow",materialReportOverViewMapper.queryKuaishouPhotoShowByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailPhotoClick")
-    public Result<List<JSONObject>> materialDetailPhotoClick(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouPhotoClickByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailPhotoClick(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("photoClick",materialReportOverViewMapper.queryKuaishouPhotoClickByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailAClick")
-    public Result<List<JSONObject>> materialDetailAClick(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouAClickByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailAClick(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("aclick",materialReportOverViewMapper.queryKuaishouAClickByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailBClick")
-    public Result<List<JSONObject>> materialDetailBClick(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouBClickByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailBClick(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("bclick",materialReportOverViewMapper.queryKuaishouBClickByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailActivation")
-    public Result<List<JSONObject>> materialDetailActivation(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouActivationByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailActivation(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("activation",materialReportOverViewMapper.queryKuaishouActivationByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }
     @PostMapping("/materialDetailPlay3sRate")
-    public Result<List<JSONObject>> materialDetailPlay3sRate(@RequestBody JSONObject params){
-        Result<List<JSONObject>> result= new Result<>();
-        result.setResult(materialReportOverViewMapper.queryKuaishouPlay3sRateByMd5(params.getString("md5"),params.getLong("projectId")));
+    public Result<Map<String,Object>> materialDetailPlay3sRate(@RequestBody JSONObject params){
+        Result<Map<String,Object>> result= new Result<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("play3sRate",materialReportOverViewMapper.queryKuaishouPlay3sRateByMd5(params.getString("md5"),params.getLong("projectId")));
+        result.setResult(map);
         result.setSuccess(true);
         return result;
     }

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceNewPlanReportCtrl.java

@@ -93,7 +93,7 @@ public class BytedanceNewPlanReportCtrl {
     }
 
     /**
-     * 查询所有的快手运营
+     * 查询所有的头条运营
      */
     @PostMapping("/report/AllOperator")
     public Result<List<JSONObject>> getAllOperator() {