lchao vor 2 Jahren
Ursprung
Commit
4e7b01d66c

+ 0 - 5
AppInterface_jian.iml

@@ -7,10 +7,6 @@
     <facet type="web" name="Web">
       <configuration>
         <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
       </configuration>
     </facet>
   </component>
@@ -20,7 +16,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

+ 79 - 1
src/main/java/com/zjj/config/URLConfig.java

@@ -10,9 +10,87 @@ package com.zjj.config;
  */
 public class URLConfig {
 
-    public static final String url = "http://localhost:8882/a";
+    public static final String url = "http://localhost:8884/leader/a";
 
     public static String LOGINMOBILE = url + "/loginMobile";//集安党建系统登录接口
     public static String REGISTER = url + "/sys/register/register";//集安党建系统注册接口
     public static String GETCODE = url + "/sys/register/getCode";//集安党建系统注册接口(验证码)
+    public static String GETFIRST = url + "/sys/office/getFirst";//注册-类型 干部一级菜单
+    public static String GETBYPARENT = url + "/sys/office/getByParent";//注册-类型 干部二级菜单
+    public static String NEWSTYPE = url + "/app/type/appConsultationType/newsType";//首页-党建资讯栏目
+    public static String display = url + "/app/news/appConsultation/display";//首页-轮播
+    public static String appConsultationData = url + "/app/news/appConsultation/display";//首页-党建资讯(列表和详情)
+    public static String appConsultationLinkUrl = url + "/app/url/appConsultationLink/url";// 首页-相关链接
+    public static String getChildOrg = url + "/leader/org/leaderOrgNo/getChildOrg";//基层党建—列表2 党组织树列表
+    public static String getFirstOrg = url + "/leader/org/leaderOrgNo/getFirstOrg";//基层党建—列表1 党组织树列表
+    public static String getService = url + "/leader/org/leaderOrgNo/getService";//基层党建—列表1 党组织树列表_非公企业组织
+    public static String getOrg = url + "/leader/org/leaderOrgNo/getOrg";//基层党建—列表1 党组织树列表_非公企业组织(2)
+    public static String dataList = url + "/app/base/appBaseNews/dataList";//基层党建—党支部主页新闻列表  联盟 简介等
+    public static String getNav = url + "/app/base/appBaseNews/getNav";// 基层党建—党支部主页初始化 标题
+    public static String getAllOrg = url + "/leader/org/leaderOrgNo/getAllOrg";// 基层党建—党支部主页初始化 标题
+    public static String save = url + "/app/complaint/appComplaintInfo/save";// 平台服务—12380举报
+    public static String getByType = url + "/app/complaint/appComplaintInfo/save";//  平台服务—信息发布厅
+    public static String threeSessions = url + "/leader/activity/leaderActivity/threeSessions";//平台服务—三会一课 我的会议 待参加,已参加
+    public static String activityList = url + "/app/record/appActivityRecord/activityList";//平台服务—三会一课—会议类型下拉框列表
+    public static String appActivityRecordData = url + "/app/record/appActivityRecord/data";//平台服务—三会一课—会议列表(我记录的,我相关的)
+    public static String appActivityRecordSave = url + "/app/record/appActivityRecord/save";//平台服务—三会一课—新建会议记录
+    public static String partyDay = url + "/leader/activity/leaderActivity/partyDay";//平台服务—党的生日/组织生活会
+    public static String uploadLogs = url + "/leader/logs/leaderLogs/uploadLogs";// 平台服务—驻村情况-驻村日记
+    public static String appLeaveData = url + "/app/leave/appLeave/data";// 平台服务—驻村情况-请假申请列表
+    public static String appLeaveSave = url + "/app/leave/appLeave/save";//平台服务—驻村情况-请假申请
+    public static String approval = url + "/app/leave/appLeave/approval";//平台服务—驻村情况-请假审批
+    public static String leaderVillageSignSave = url + "/leader/sign/leaderVillageSign/save";//平台服务—驻村情况-每日签到
+    public static String leaderLogsPositionUploadLogs = url + "/leader/logs/leaderLogsPosition/uploadLogs";// 平台服务—驻村情况-村支书定位
+    public static String getLogs = url + "/leader/logs/leaderLogsPosition/getLogs";//平台服务—驻村情况-获取村支书定位信息
+    public static String appResourcesData = url + "/leader/activity/leaderActivity/threeSessions";//平台服务—共驻共建-可用资源列表
+    public static String appResourceSave = url + "/app/resources/appResources/save";//平台服务—共驻共建-发布资源
+    public static String AppResourcesApprovalSave = url + "/app/resources/appResourcesApproval/save";//平台服务—共驻共建-申请资源
+    public static String appResourcesApprovalData = url + "/app/resources/appResourcesApproval/data";// 平台服务—共驻共建-申请审批资源列表
+    public static String appResourcesApprovalApproval = url + "/app/resources/appResourcesApproval/approval";// 平台服务—共驻共建-资源审批
+    public static String appReportSave = url + "/app/report/appReport/save";//平台服务—共驻共建-活动上报
+    public static String appPhoneBookData = url + "/app/phonebook/appPhoneBook/data";//我的-通讯录—列表
+    public static String appPhoneBookSave = url + "/app/phonebook/appPhoneBook/save";//我的-通讯录—增加(修改)
+    public static String appPhoneBookDelete = url + "/app/phonebook/appPhoneBook/delete";//我的-通讯录—删除
+    public static String appMemoData = url + "/app/memo/appMemo/data";//我的-备忘录—列表
+    public static String appMemoDelete = url + "/app/memo/appMemo/delete";// 我的-备忘录—删除
+    public static String appMemoSave = url + "/app/memo/appMemo/save";// 我的-备忘录—保存
+    public static String appCollectionData = url + "/app/collection/appCollection/data";// 我的-收藏—列表
+    public static String appCollectionDelete = url + "/app/collection/appCollection/delete";//我的-收藏—删除
+    public static String appCollectionSave = url + "/app/collection/appCollection/save";// 我的-收藏—保存
+    public static String appSuggestionSave = url + "/app/suggestion/appSuggestion/save";// 我的-意见反馈
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

+ 275 - 3
src/main/java/com/zjj/controller/AppInterfaceController.java

@@ -3,9 +3,13 @@ package com.zjj.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.zjj.config.HttpUtil;
 import com.zjj.config.URLConfig;
+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.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,15 +24,283 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.LOGINMOBILE,new HashMap<>(),param);
     }
 
-    @PostMapping("/register")
-    public String register(JSONObject param){
+    @PostMapping("/sys/register/register")
+    public String register(@RequestBody JSONObject param){
         return HttpUtil.sendPostJson(URLConfig.REGISTER,param,new HashMap<>());
     }
 
-    @PostMapping("/getCode")
+    @PostMapping("/sys/register/getCode")
     public String getCode(String tel){
         Map param = new HashMap<>();
         param.put("tel",tel);
         return HttpUtil.sendPostForm(URLConfig.GETCODE,new HashMap<>(),param);
     }
+
+    @PostMapping("/sys/office/getFirst")
+    public String getFirst(){
+        return HttpUtil.sendPostForm(URLConfig.GETFIRST,new HashMap<>(),new HashMap<>());
+    }
+
+    @PostMapping("/sys/office/getByParent")
+    public String getByParent(String parentId){
+        Map param = new HashMap<>();
+        param.put("parentId",parentId);
+        return HttpUtil.sendPostForm(URLConfig.GETBYPARENT,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/type/appConsultationType/newsType")
+    public String newsType(){
+        return HttpUtil.sendPostForm(URLConfig.NEWSTYPE,new HashMap<>(),new HashMap<>());
+    }
+
+    @PostMapping("/app/news/appConsultation/display")
+    public String display(){
+        return HttpUtil.sendPostForm(URLConfig.display,new HashMap<>(),new HashMap<>());
+    }
+
+    @PostMapping("/app/news/appConsultation/data")
+    public String appConsultationData(@RequestBody JSONObject param){
+        HashMap hashMap = new HashMap<>();
+        hashMap.put("pageNo",param.getString("pageNo"));
+        hashMap.put("pageSize",param.getString("pageSize"));
+        return HttpUtil.sendPostJson(URLConfig.appConsultationData,param, hashMap);
+    }
+
+    @PostMapping("/app/url/appConsultationLink/url")
+    public String appConsultationLinkUrl(){
+        return HttpUtil.sendPostForm(URLConfig.appConsultationLinkUrl,new HashMap<>(),new HashMap<>());
+    }
+
+    @PostMapping("/leader/org/leaderOrgNo/getChildOrg")
+    public String getChildOrg(String parentId,String name,String type){
+        Map param = new HashMap<>();
+        param.put("parentId",parentId);
+        param.put("name",name);
+        param.put("type",type);
+        return HttpUtil.sendPostForm(URLConfig.getChildOrg,new HashMap<>(),param);
+    }
+
+    @PostMapping("/leader/org/leaderOrgNo/getFirstOrg")
+    public String getFirstOrg(){
+        return HttpUtil.sendPostForm(URLConfig.getFirstOrg,new HashMap<>(),new HashMap<>());
+    }
+
+    @PostMapping("/leader/org/leaderOrgNo/getService")
+    public String getService(String name){
+        Map param = new HashMap<>();
+        param.put("name",name);
+        return HttpUtil.sendPostForm(URLConfig.getService,new HashMap<>(),param);
+    }
+
+    @PostMapping("/leader/org/leaderOrgNo/getOrg")
+    public String getOrg(String value){
+        Map param = new HashMap<>();
+        param.put("value",value);
+        return HttpUtil.sendPostForm(URLConfig.getOrg,new HashMap<>(),param);
+    }
+
+    @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);
+    }
+
+    @PostMapping("/app/base/appBaseNews/getNav")
+    public String getNav(String deptId){
+        Map param = new HashMap<>();
+        param.put("deptId",deptId);
+        return HttpUtil.sendPostForm(URLConfig.getNav,new HashMap<>(),param);
+    }
+
+    @PostMapping("/leader/org/leaderOrgNo/getAllOrg")
+    public String getAllOrg(){
+        return HttpUtil.sendPostForm(URLConfig.getAllOrg,new HashMap<>(),new HashMap<>());
+    }
+
+    @PostMapping("/app/base/appBaseNews/getNav")
+    public String save(String deptId){
+        Map param = new HashMap<>();
+        param.put("deptId",deptId);
+        return HttpUtil.sendPostForm(URLConfig.getNav,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/complaint/appComplaintInfo/save")
+    public String save(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.save,param,new HashMap<>());
+    }
+    @PostMapping("/app/info/appInfo/getByType")
+    public String getByType(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(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);
+    }
+
+    @PostMapping("/app/record/appActivityRecord/activityList")
+    public String activityList(String userId){
+        Map param = new HashMap<>();
+        param.put("userId",userId);
+        return HttpUtil.sendPostForm(URLConfig.activityList,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/record/appActivityRecord/data")
+    public String appActivityRecordData(String userId,String tab){
+        Map param = new HashMap<>();
+        param.put("userId",userId);
+        param.put("tab",tab);
+        return HttpUtil.sendPostForm(URLConfig.appActivityRecordData,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/record/appActivityRecord/save")
+    public String appActivityRecordSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appActivityRecordSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/leader/activity/leaderActivity/partyDay")
+    public String partyDay(String types,String userId){
+        Map param = new HashMap<>();
+        param.put("types",types);
+        param.put("userId",userId);
+        return HttpUtil.sendPostForm(URLConfig.partyDay,new HashMap<>(),param);
+    }
+
+    @PostMapping("/leader/logs/leaderLogs/uploadLogs")
+    public String uploadLogs(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.uploadLogs,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/leave/appLeave/data")
+    public String appLeaveData(String userId,String tab){
+        Map param = new HashMap<>();
+        param.put("tab",tab);
+        param.put("userId",userId);
+        return HttpUtil.sendPostForm(URLConfig.appLeaveData,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/leave/appLeave/save")
+    public String appLeaveSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appLeaveSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/leave/appLeave/approval")
+    public String approval(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.approval,param,new HashMap<>());
+    }
+
+    @PostMapping("/leader/sign/leaderVillageSign/save")
+    public String leaderVillageSignSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.leaderVillageSignSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/leader/logs/leaderLogsPosition/uploadLogs")
+    public String leaderLogsPositionUploadLogs(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.leaderLogsPositionUploadLogs,param,new HashMap<>());
+    }
+
+    @PostMapping("/leader/logs/leaderLogsPosition/getLogs")
+    public String getLogs(String orgId){
+        Map param = new HashMap<>();
+        param.put("orgId",orgId);
+        return HttpUtil.sendPostForm(URLConfig.getLogs,new HashMap<>(),param);
+    }
+
+    @PostMapping("/leader/activity/leaderActivity/threeSessions")
+    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);
+    }
+
+    @PostMapping("/app/resources/appResources/save")
+    public String appResourceSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appResourceSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/resources/appResourcesApproval/save")
+    public String AppResourcesApprovalSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.AppResourcesApprovalSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/resources/appResourcesApproval/data")
+    public String appResourcesApprovalData(String applyId,String tab){
+        Map param = new HashMap<>();
+        param.put("applyId",applyId);
+        param.put("tab",tab);
+        return HttpUtil.sendPostForm(URLConfig.appResourcesApprovalData,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/resources/appResourcesApproval/approval")
+    public String appResourcesApprovalApproval(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appResourcesApprovalApproval,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/report/appReport/save")
+    public String appReportSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appReportSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/phonebook/appPhoneBook/data")
+    public String appPhoneBookData(String userId){
+        Map param = new HashMap<>();
+        param.put("applyId",userId);
+        return HttpUtil.sendPostForm(URLConfig.appPhoneBookData,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/phonebook/appPhoneBook/save")
+    public String appPhoneBookSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appPhoneBookSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/phonebook/appPhoneBook/delete")
+    public String appPhoneBookDelete(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appPhoneBookDelete,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/memo/appMemo/data")
+    public String appMemoData(String userId){
+        Map param = new HashMap<>();
+        param.put("applyId",userId);
+        return HttpUtil.sendPostForm(URLConfig.appMemoData,new HashMap<>(),param);
+    }
+
+    @PostMapping("/app/memo/appMemo/delete")
+    public String appMemoDelete(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appMemoDelete,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/memo/appMemo/save")
+    public String appMemoSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(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);
+    }
+
+    @PostMapping("/app/collection/appCollection/delete")
+    public String appCollectionDelete(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appCollectionDelete,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/collection/appCollection/save")
+    public String appCollectionSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appCollectionSave,param,new HashMap<>());
+    }
+
+    @PostMapping("/app/suggestion/appSuggestion/save")
+    public String appSuggestionSave(@RequestBody JSONObject param){
+        return HttpUtil.sendPostJson(URLConfig.appSuggestionSave,param,new HashMap<>());
+    }
 }