同步

common/src/main/java/com/jpsoft/campus/modules/base/entity/UserInformationProvincialSubDeclares.java

@@ -43,6 +43,4 @@ public class UserInformationProvincialSubDeclares {
 	private String taskHandleName = "新生入学信息采集";
 
 	private List<UserInformationProvincialFileDeclares> fileDeclares;
-
-	
 }

common/src/main/java/com/jpsoft/campus/modules/base/service/UiasService.java

@@ -16,5 +16,5 @@ public interface UiasService {
 	//省级
 	String getProvincialToken(String path,String appId,String appSecret);
 	String applyno(String path,String token);
-	String submitAll(String path, String token, UserInformationProvincial provincial, UserInformationProvincialSubDeclares subDeclares);
+	Map submitAll(String path, String token, UserInformationProvincial provincial, UserInformationProvincialSubDeclares subDeclares);
 }

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/UiasServiceImpl.java

@@ -232,7 +232,7 @@ public class UiasServiceImpl implements UiasService {
 	@Autowired
 	private ApplicationPrimaryService applicationPrimaryService;
 	@Override
-	public String submitAll(String path, String token, UserInformationProvincial provincial, UserInformationProvincialSubDeclares subDeclares){
+	public Map submitAll(String path, String token, UserInformationProvincial provincial, UserInformationProvincialSubDeclares subDeclares){
 		try {
 //			HashMap<String, Object> map = new HashMap<>();
 //			map.put("declare", provincial);
@@ -350,7 +350,10 @@ public class UiasServiceImpl implements UiasService {
 				String code = returnJson.getString("code");
 				String data = returnJson.getString("data");
 
-				return data;
+				Map returnMap = new HashMap();
+				returnMap.put("code",code);
+				returnMap.put("data",data);
+				return returnMap;
 
 
 			} catch (Exception e) {
@@ -359,6 +362,6 @@ public class UiasServiceImpl implements UiasService {
 		}catch (Exception e){
 			e.printStackTrace();
 		}
-		return "";
+		return null;
 	}
 }

common/src/main/resources/mapper/base/ApplicationPrimary.xml

@@ -452,7 +452,6 @@
         c.name_ AS applicantName,
         c.phone_ AS applicantPhone,
         1 AS applicantType,
-        #{applyNo} AS applyNo,
         1 AS applyStatus,
         '' as formContent,
         c.id_card as licenseNo,

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/PersonInfoApiController.java

@@ -679,7 +679,7 @@ public class PersonInfoApiController {
                 List<UserInformationProvincialFileDeclares> fileDeclaresList = new ArrayList<>();
                 fileDeclaresList.add(fileDeclares);
 
-                subDeclares.setFileDeclares(fileDeclaresList);
+//                subDeclares.setFileDeclares(fileDeclaresList);
 
                 List<UserInformationProvincialSubDeclares> subDeclaresList = new ArrayList<>();
                 subDeclaresList.add(subDeclares);

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/UiasApiController.java

@@ -1,6 +1,8 @@
 package com.jpsoft.campus.modules.mobile.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
 import com.jpsoft.campus.modules.base.entity.*;
 import com.jpsoft.campus.modules.base.service.*;
 import com.jpsoft.campus.modules.common.dto.MessageResult;
@@ -26,10 +28,17 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.net.ssl.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 
@@ -217,16 +226,18 @@ public class UiasApiController {
                 path = "https://59.208.149.51:10086/";//正式
                 appId = "key_onethingApi_prod_ztsbk_421000000000_jyzspt_50a9bb4e0a80487c9f517672cb3ba36";
                 appSecret = "secret_onethingApi_prod_ztsbk_421000000000_jyzspt_764c9a3cf7f94633a0ebf1ff18f0057";
+//                token = uiasService.getProvincialToken(path,appId,appSecret);
             }
 
-//            String token = uiasService.getProvincialToken(path,appId,appSecret);
+
 //            String token = "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJrZXkiOiJrZXlfb25ldGhpbmdBcGlfdGVzdF96dHNia180MjEwMDAwMDAwMDBfanl6c3B0XzEzZWUyNGEwYzQyNDRjZGJhMmExMGJkYmY1NDE1MTZlIiwiZXhwIjoxNzI5MzAxNDczfQ._ZT6ceoP4CpWASjQhCC6NU2hO3BQLQPB9GTA90lS1Vx_vQSnpnETzHjIYqrS_6odhAXW2m-ToQ_usXy6qIV2Og";
-//            String applyNo = uiasService.applyno(path,token);
-            String applyNo = "test";
 
-            List<UserInformationProvincial> primaryList = applicationPrimaryService.findOfficeByProvincial(applyNo,limit);
+//            String applyNo = "test";
+
+            List<UserInformationProvincial> primaryList = applicationPrimaryService.findOfficeByProvincial("",limit);
             List<Map> returnList = new ArrayList<>();
             for(UserInformationProvincial provincial : primaryList){
+                String applyNo = uiasService.applyno(path,token);
                 UserInformationProvincialSubDeclares subDeclares = new UserInformationProvincialSubDeclares();
                 subDeclares.setApplicantName(provincial.getApplicantName());
                 subDeclares.setApplicantPhone(provincial.getApplicantPhone());
@@ -243,7 +254,7 @@ public class UiasApiController {
                 List<UserInformationProvincialFileDeclares> fileDeclaresList = new ArrayList<>();
                 fileDeclaresList.add(fileDeclares);
 
-                subDeclares.setFileDeclares(fileDeclaresList);
+//                subDeclares.setFileDeclares(fileDeclaresList);
                 provincial.setSourceId(appId);
 
                 List<UserInformationProvincialSubDeclares> subDeclaresList = new ArrayList<>();
@@ -254,7 +265,17 @@ public class UiasApiController {
                 userMap.put("declare",provincial);
                 returnList.add(userMap);
 
-                String data = uiasService.submitAll(path,token,provincial,subDeclares);
+                Map returnMap = uiasService.submitAll(path,token,provincial,subDeclares);
+                String code = (String)returnMap.get("code");
+                String subNos = (String)returnMap.get("data");
+                System.out.println(code);
+                System.out.println(subNos);
+
+                ApplicationPrimary primary = applicationPrimaryService.get(provincial.getApplicantId());
+                primary.setCode(code);
+                primary.setSubNos(subNos);
+                primary.setUpdateTime(new Date());
+                applicationPrimaryService.update(primary);
             }
 
 //            for(Map map : returnList){
@@ -275,6 +296,7 @@ public class UiasApiController {
 
     public static void main(String[] args) {
 
+            String url = "https://59.208.149.51:10086/?key=key_onethingApi_prod_ztsbk_421000000000_jyzspt_50a9bb4e0a80487c9f517672cb3ba36";
 
     }
 }