111

AppInterface_jian.iml

@@ -27,7 +27,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.5" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
@@ -37,7 +36,6 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.5" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
@@ -56,5 +54,21 @@
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.9" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.5.0" level="project" />
   </component>
 </module>

pom.xml

@@ -36,6 +36,16 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.6</version>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.5.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -42,7 +42,7 @@ public class URLConfig {
     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 appResourcesData = url + "/app/resources/appResources/data";//平台服务—共驻共建-可用资源列表
     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";// 平台服务—共驻共建-申请审批资源列表
@@ -61,7 +61,7 @@ public class URLConfig {
 
 
 /*******************************************集安党建学习平台系统edu开始**************************************************/
-    public static final String eduUrl = "http://localhost:8882/a";
+    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";//  在线课堂-远教

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

@@ -1,8 +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;
@@ -59,12 +62,15 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.display,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/app/news/appConsultation/data")
-    public String appConsultationData(@RequestBody JSONObject param){
+    @PostMapping(value = "/app/news/appConsultation/data")
+    public String appConsultationData(ceshi param){
         HashMap hashMap = new HashMap<>();
-        hashMap.put("pageNo",param.getString("pageNo"));
-        hashMap.put("pageSize",param.getString("pageSize"));
-        return HttpUtil.sendPostJson(URLConfig.appConsultationData,param, 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/url/appConsultationLink/url")
@@ -120,13 +126,6 @@ public class AppInterfaceController {
         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<>());
@@ -212,7 +211,7 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.getLogs,new HashMap<>(),param);
     }
 
-    @PostMapping("/leader/activity/leaderActivity/threeSessions")
+    @PostMapping("/app/resources/appResources/data")
     public String appResourcesData(@RequestBody JSONObject param){
         HashMap hashMap = new HashMap<>();
         hashMap.put("pageNo",param.getString("pageNo"));