同步

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

@@ -12,6 +12,7 @@ import java.util.List;
 public class UserInformationProvincial {
 
 	private String applicantId;
+	private String appId;
 	private String applicantName;
 	private String applicantPhone;
 	private Integer applicantType = 1;

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

@@ -20,6 +20,6 @@ public class UserInformationProvincialFileDeclares {
 	private String stuffSource = "";
 	private Integer stuffStatus = 0;
 	private Integer stuffType = 0;
-	private String subApplyNo = "";
+	private String subApplyNo;
 	private String taskHandleItem = "114210000110971354442200505600001";
 }

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

@@ -129,15 +129,15 @@ public class UiasServiceImpl implements UiasService {
 	@Override
 	public String applyno(String path,String token) {
 		try {
-			HashMap<String, Object> map = new HashMap<>();
-			map.put("sceneNo", "42PCN0010224J1003");
-			map.put("sceneBusiness", 4);
+//			HashMap<String, Object> map = new HashMap<>();
+//			map.put("sceneNo", "42PCN0010224J1003");
+//			map.put("sceneBusiness", 4);
 
 			HashMap<String, String> headersMap = new HashMap<>();
 			headersMap.put("Authorization", token);
 
 			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("sceneNo", "42PC08017123");
+			jsonObject.put("sceneNo", "42PC00079A24");
 			jsonObject.put("sceneBusiness", 4);
 
 			String url = path + "/gateway/api/sbk/declare/ownerDeclare/applyno";

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

@@ -448,7 +448,8 @@
     </select>
     <select id="findOfficeByProvincial" resultType="com.jpsoft.campus.modules.base.entity.UserInformationProvincial">
         SELECT
-        a.id_ AS applicantId,
+        IFNULL(c.user_id,a.id_) AS applicantId,
+        a.id_ as appId,
         c.name_ AS applicantName,
         c.phone_ AS applicantPhone,
         1 AS applicantType,

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -257,6 +258,7 @@ public class UiasApiController {
     @ResponseBody
     public MessageResult<Map> uploadProvincialUser(
             @RequestParam(value="schoolType",defaultValue="test") String status,
+            @RequestParam(value="userId",defaultValue="") String userId,
             @RequestParam(value="limit",defaultValue="10") Integer limit,
             @RequestParam(value="token",defaultValue="") String token
             ) {
@@ -268,9 +270,9 @@ public class UiasApiController {
             String appSecret = "secret_onethingApi_test_ztsbk_421000000000_jyzspt_b3670cf58542411c8605df86cee70a2e";
             if("real".equals(status)) {
                 path = "https://59.208.149.51:10086/";//正式
-                appId = "key_onethingApi_prod_ztsbk_421000000000_jyzspt_50a9bb4e0a80487c9f517672cb3ba36";
+                appId = "key_onethingApi_prod_ztsbk_421000000000_jyzspt_50a9bb4e0a80487c9f517672cb3ba36b";
                 appSecret = "secret_onethingApi_prod_ztsbk_421000000000_jyzspt_764c9a3cf7f94633a0ebf1ff18f0057";
-                //https://59.208.149.51:10086/gateway/api/getToken?key=key_onethingApi_prod_ztsbk_421000000000_jyzspt_50a9bb4e0a80487c9f517672cb3ba36
+//                https://59.208.149.51:10086/gateway/api/getToken?key=key_onethingApi_prod_ztsbk_421000000000_jyzspt_50a9bb4e0a80487c9f517672cb3ba36b
 //                token = uiasService.getProvincialToken(path,appId,appSecret);
             }
 
@@ -287,13 +289,16 @@ public class UiasApiController {
                 subDeclares.setApplicantName(provincial.getApplicantName());
                 subDeclares.setApplicantPhone(provincial.getApplicantPhone());
                 subDeclares.setApplyNo(applyNo);
+                subDeclares.setSubApplyNo(applyNo);
                 subDeclares.setLiceseNo(provincial.getLicenseNo());
                 subDeclares.setTargetId(provincial.getTargetId());
                 subDeclares.setTargetName(provincial.getTargetName());
+                provincial.setApplyNo(applyNo);
                 subDeclares.setSourceId(appId);
 
                 UserInformationProvincialFileDeclares fileDeclares = new UserInformationProvincialFileDeclares();
                 fileDeclares.setApplyNo(applyNo);
+                fileDeclares.setSubApplyNo(applyNo);
                 fileDeclares.setSourceId(appId);
 
                 List<UserInformationProvincialFileDeclares> fileDeclaresList = new ArrayList<>();
@@ -301,9 +306,10 @@ public class UiasApiController {
 
 //                subDeclares.setFileDeclares(fileDeclaresList);
                 provincial.setSourceId(appId);
-                /**
-                provincial.setApplicantId();
-                 **/
+
+                if(StringUtils.isNoneBlank(userId)) {
+                     provincial.setApplicantId(userId);
+                }
 
                 List<UserInformationProvincialSubDeclares> subDeclaresList = new ArrayList<>();
                 subDeclaresList.add(subDeclares);
@@ -319,7 +325,8 @@ public class UiasApiController {
                 System.out.println(code);
                 System.out.println(subNos);
 
-                ApplicationPrimary primary = applicationPrimaryService.get(provincial.getApplicantId());
+
+                ApplicationPrimary primary = applicationPrimaryService.get(provincial.getAppId());
                 primary.setCode(code);
                 primary.setSubNos(subNos);
                 primary.setUpdateTime(new Date());