松原党建中间件

src/main/java/com/zjj/config/URLConfig.java

@@ -59,21 +59,4 @@ public class URLConfig {
     public static String appCollectionSave = url + "/app/collection/appCollection/save";// 我的-收藏—保存
     public static String appSuggestionSave = url + "/app/suggestion/appSuggestion/save";// 我的-意见反馈
 
-
-/*******************************************集安党建学习平台系统edu开始**************************************************/
-    public static final String eduUrl = "http://localhost:8885/edu/a";
-    public static String EDUNEWSDATA = eduUrl + "/base/eduNews/data";//在线课堂-远教 通知公告 党史
-    public static String EDUCOLUMNGETDATA = eduUrl + "/base/eduColumn/getData";// 在线课堂-专题栏目
-    public static String EDUVIDEONEWSDATA = eduUrl + "/base/eduVideoNews/data";//  在线课堂-远教
-    public static String EDUCOLUMNNEWSDATA = eduUrl + "/base/eduColumnNews/data";//	 在线课堂-专题栏目列表
-    public static String EDUPAPERGETDATA = eduUrl + "/exam/eduPaper/getData";//	在线课堂-在线考评—试卷列表
-    public static String EDUQUESTIONGETDATA = eduUrl + "/exam/eduQuestion/getData";//	在线课堂-在线考评—试卷列表试题
-    public static String EDUPAPERGETFINISH = eduUrl + "/exam/eduPaper/getFinish";//	在线课堂-在线考评—试卷列表 已考
-    public static String EDUQUESTIONRETEST = eduUrl + "/exam/eduQuestion/retest";//	在线课堂-在线考评—试卷列表 重新考试
-    public static String EDUQUESTIONNAIREGETDATA = eduUrl + "/questionnaire/eduQuestionnaire/getData";//	 平台服务—问卷调查-问卷列表
-    public static String EDUQUESTIONNAIREQUESTIONGETDATA = eduUrl + "/questionnaire/eduQuestionnaireQuestion/getData";//	平台服务—问卷调查-问卷内容
-    public static String EDUUSERQUESTIONNAIRESAVE = eduUrl + "/questionnaire/eduUserQuestionnaire/save";//	 平台服务—问卷调查-问卷提交
-    public static String EDUUSERTESTSSAVE = eduUrl + "/exam/eduUserTests/save";//	在线课堂-在线考评—试卷列表试题提交
-
-
 }

src/main/java/com/zjj/controller/AppInterfaceController.java

@@ -1,18 +1,11 @@
 package com.zjj.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.zjj.config.HttpUtil;
 import com.zjj.config.URLConfig;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,8 +22,8 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/sys/register/register")
-    public String register(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.REGISTER,param,new HashMap<>());
+    public String register(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.REGISTER,param,new HashMap<>());
     }
 
     @PostMapping("/sys/register/getCode")
@@ -62,15 +55,9 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.display,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping(value = "/app/news/appConsultation/data")
-    public String appConsultationData(ceshi param){
-        HashMap hashMap = new HashMap<>();
-//        hashMap.put("pageNo",pageNo);
-//        hashMap.put("pageSize",pageSize);
-//        JSONObject param = new JSONObject();
-//        param.put("",);
-//        return HttpUtil.sendPostJson(URLConfig.appConsultationData,param, hashMap);
-        return null;
+    @PostMapping("/app/news/appConsultation/data")
+    public String appConsultationData(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appConsultationData,param, new HashMap<>());
     }
 
     @PostMapping("/app/url/appConsultationLink/url")
@@ -107,11 +94,8 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/base/appBaseNews/dataList")
-    public String dataList(@RequestBody JSONObject param){
-        HashMap hashMap = new HashMap<>();
-        hashMap.put("pageNo",param.getString("pageNo"));
-        hashMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.dataList,param, hashMap);
+    public String dataList(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.dataList,param, new HashMap<>());
     }
 
     @PostMapping("/app/base/appBaseNews/getNav")
@@ -127,20 +111,17 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/complaint/appComplaintInfo/save")
-    public String save(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.save,param,new HashMap<>());
+    public String save(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.save,param,new HashMap<>());
     }
     @PostMapping("/app/info/appInfo/getByType")
-    public String getByType(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.getByType,param,new HashMap<>());
+    public String getByType(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.getByType,param,new HashMap<>());
     }
 
     @PostMapping("/leader/activity/leaderActivity/threeSessions")
-    public String threeSessions(@RequestBody JSONObject param){
-        HashMap hashMap = new HashMap<>();
-        hashMap.put("pageNo",param.getString("pageNo"));
-        hashMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.threeSessions,param,hashMap);
+    public String threeSessions(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.threeSessions,param,new HashMap<>());
     }
 
     @PostMapping("/app/record/appActivityRecord/activityList")
@@ -159,8 +140,8 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/record/appActivityRecord/save")
-    public String appActivityRecordSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appActivityRecordSave,param,new HashMap<>());
+    public String appActivityRecordSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appActivityRecordSave,param,new HashMap<>());
     }
 
     @PostMapping("/leader/activity/leaderActivity/partyDay")
@@ -172,8 +153,8 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/leader/logs/leaderLogs/uploadLogs")
-    public String uploadLogs(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.uploadLogs,param,new HashMap<>());
+    public String uploadLogs(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.uploadLogs,param,new HashMap<>());
     }
 
     @PostMapping("/app/leave/appLeave/data")
@@ -185,23 +166,23 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/leave/appLeave/save")
-    public String appLeaveSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appLeaveSave,param,new HashMap<>());
+    public String appLeaveSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appLeaveSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/leave/appLeave/approval")
-    public String approval(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.approval,param,new HashMap<>());
+    public String approval(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.approval,param,new HashMap<>());
     }
 
     @PostMapping("/leader/sign/leaderVillageSign/save")
-    public String leaderVillageSignSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.leaderVillageSignSave,param,new HashMap<>());
+    public String leaderVillageSignSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.leaderVillageSignSave,param,new HashMap<>());
     }
 
     @PostMapping("/leader/logs/leaderLogsPosition/uploadLogs")
-    public String leaderLogsPositionUploadLogs(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.leaderLogsPositionUploadLogs,param,new HashMap<>());
+    public String leaderLogsPositionUploadLogs(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.leaderLogsPositionUploadLogs,param,new HashMap<>());
     }
 
     @PostMapping("/leader/logs/leaderLogsPosition/getLogs")
@@ -212,21 +193,18 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/resources/appResources/data")
-    public String appResourcesData(@RequestBody JSONObject param){
-        HashMap hashMap = new HashMap<>();
-        hashMap.put("pageNo",param.getString("pageNo"));
-        hashMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.appResourcesData,param,hashMap);
+    public String appResourcesData(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appResourcesData,param,new HashMap<>());
     }
 
     @PostMapping("/app/resources/appResources/save")
-    public String appResourceSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appResourceSave,param,new HashMap<>());
+    public String appResourceSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appResourceSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/resources/appResourcesApproval/save")
-    public String AppResourcesApprovalSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.AppResourcesApprovalSave,param,new HashMap<>());
+    public String AppResourcesApprovalSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.AppResourcesApprovalSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/resources/appResourcesApproval/data")
@@ -238,13 +216,13 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/resources/appResourcesApproval/approval")
-    public String appResourcesApprovalApproval(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appResourcesApprovalApproval,param,new HashMap<>());
+    public String appResourcesApprovalApproval(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appResourcesApprovalApproval,param,new HashMap<>());
     }
 
     @PostMapping("/app/report/appReport/save")
-    public String appReportSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appReportSave,param,new HashMap<>());
+    public String appReportSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appReportSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/phonebook/appPhoneBook/data")
@@ -255,13 +233,13 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/phonebook/appPhoneBook/save")
-    public String appPhoneBookSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appPhoneBookSave,param,new HashMap<>());
+    public String appPhoneBookSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appPhoneBookSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/phonebook/appPhoneBook/delete")
-    public String appPhoneBookDelete(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appPhoneBookDelete,param,new HashMap<>());
+    public String appPhoneBookDelete(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appPhoneBookDelete,param,new HashMap<>());
     }
 
     @PostMapping("/app/memo/appMemo/data")
@@ -272,130 +250,35 @@ public class AppInterfaceController {
     }
 
     @PostMapping("/app/memo/appMemo/delete")
-    public String appMemoDelete(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appMemoDelete,param,new HashMap<>());
+    public String appMemoDelete(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appMemoDelete,param,new HashMap<>());
     }
 
     @PostMapping("/app/memo/appMemo/save")
-    public String appMemoSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appMemoSave,param,new HashMap<>());
+    public String appMemoSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appMemoSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/collection/appCollection/data")
-    public String appCollectionData(@RequestBody JSONObject param){
-        HashMap hashMap = new HashMap<>();
-        hashMap.put("pageNo",param.getString("pageNo"));
-        hashMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.appCollectionData,param,hashMap);
+    public String appCollectionData(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appCollectionData,param,new HashMap<>());
     }
 
     @PostMapping("/app/collection/appCollection/delete")
-    public String appCollectionDelete(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appCollectionDelete,param,new HashMap<>());
+    public String appCollectionDelete(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appCollectionDelete,param,new HashMap<>());
     }
 
     @PostMapping("/app/collection/appCollection/save")
-    public String appCollectionSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appCollectionSave,param,new HashMap<>());
+    public String appCollectionSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appCollectionSave,param,new HashMap<>());
     }
 
     @PostMapping("/app/suggestion/appSuggestion/save")
-    public String appSuggestionSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.appSuggestionSave,param,new HashMap<>());
+    public String appSuggestionSave(@RequestParam Map param){
+        return HttpUtil.sendPostForm(URLConfig.appSuggestionSave,param,new HashMap<>());
     }
 
     /*******************************************集安党建系统leader结束**************************************************/
 
-    /*******************************************集安党建学习平台系统edu开始**************************************************/
-
-    @PostMapping("/base/eduNews/data")
-    public String getCode(@RequestBody JSONObject param){
-        HashMap<String,String> headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.getString("pageNo"));
-        headerMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.EDUNEWSDATA,param,headerMap);
-    }
-    @PostMapping("/base/eduColumn/getData")
-    public String getData(@RequestBody JSONObject param){
-        HashMap headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.get("pageNo"));
-        headerMap.put("pageSize",param.get("pageSize"));
-        return HttpUtil.sendPostForm(URLConfig.EDUCOLUMNGETDATA,headerMap,headerMap);
-    }
-
-    @PostMapping("/base/eduVideoNews/data")
-    public String eduVideoNewsData(@RequestBody JSONObject param){
-        HashMap<String,String> headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.getString("pageNo"));
-        headerMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.EDUVIDEONEWSDATA,param,headerMap);
-    }
-
-    @PostMapping("/base/eduColumnNews/data")
-    public String eduColumnNewsData(@RequestBody JSONObject param){
-        HashMap<String,String> headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.getString("pageNo"));
-        headerMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.EDUCOLUMNNEWSDATA,param,headerMap);
-    }
-    @PostMapping("/exam/eduPaper/getData")
-    public String eduPaperGetData(@RequestBody JSONObject param){
-        HashMap<String,String> headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.getString("pageNo"));
-        headerMap.put("pageSize",param.getString("pageSize"));
-        Map<String, String> contentMap = new HashMap<>();
-        contentMap.put("userId",param.getString("userId"));
-        return HttpUtil.sendPostForm(URLConfig.EDUPAPERGETDATA,headerMap,contentMap);
-    }
-    @PostMapping("/exam/eduQuestion/getData")
-    public String eduQuestionGetData(String paperId, String userId){
-        Map<String, String> contentMap = new HashMap<>();
-        contentMap.put("paperId",paperId);
-        contentMap.put("userId",userId);
-        return HttpUtil.sendPostForm(URLConfig.EDUQUESTIONGETDATA,new HashMap<>(),contentMap);
-    }
-    @PostMapping("/exam/eduPaper/getFinish")
-    public String eduPaperGetFinish(@RequestBody JSONObject param){
-        HashMap<String,String> headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.getString("pageNo"));
-        headerMap.put("pageSize",param.getString("pageSize"));
-        Map<String, String> contentMap = new HashMap<>();
-        contentMap.put("userId",param.getString("userId"));
-        contentMap.put("testsType",param.getString("testsType"));
-        return HttpUtil.sendPostForm(URLConfig.EDUPAPERGETFINISH,headerMap,contentMap);
-    }
-    @PostMapping("/exam/eduQuestion/retest")
-    public String eduQuestionRetest(String testsId, String userId){
-        Map<String, String> contentMap = new HashMap<>();
-        contentMap.put("testsId",testsId);
-        contentMap.put("userId",userId);
-        return HttpUtil.sendPostForm(URLConfig.EDUQUESTIONRETEST,new HashMap<>(),contentMap);
-    }
-    @PostMapping("/questionnaire/eduQuestionnaire/getData")
-    public String eduQuestionnaireGetData(@RequestBody JSONObject param){
-        HashMap<String,String> headerMap = new HashMap<>();
-        headerMap.put("pageNo",param.getString("pageNo"));
-        headerMap.put("pageSize",param.getString("pageSize"));
-        Map<String, String> contentMap = new HashMap<>();
-        contentMap.put("userId",param.getString("userId"));
-        contentMap.put("sort",param.getString("sort"));
-        return HttpUtil.sendPostForm(URLConfig.EDUQUESTIONNAIREGETDATA,headerMap,contentMap);
-    }
-    @PostMapping("/questionnaire/eduQuestionnaireQuestion/getData")
-    public String eduQuestionnaireQuestionGetData(String userId, String questionnaireId){
-        Map<String, String> contentMap = new HashMap<>();
-        contentMap.put("questionnaireId",questionnaireId);
-        contentMap.put("userId",userId);
-        return HttpUtil.sendPostForm(URLConfig.EDUQUESTIONNAIREQUESTIONGETDATA,new HashMap<>(),contentMap);
-    }
-
-    @PostMapping("/questionnaire/eduUserQuestionnaire/save")
-    public String eduUserQuestionnaireSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.EDUUSERQUESTIONNAIRESAVE,param,new HashMap<>());
-    }
-    @PostMapping("/exam/eduUserTests/save")
-    public String eduUserTestsSave(@RequestBody JSONObject param){
-        return HttpUtil.sendPostJson(URLConfig.EDUUSERTESTSSAVE,param,new HashMap<>());
-    }
-    /*******************************************集安党建学习平台系统edu结束**************************************************/
 }