zhuang пре 11 месеци
родитељ
комит
d1b0f8e74c

+ 2 - 1
business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxApiService.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.dto.RectifyApiDataDto;
 import com.rongwei.bsentity.vo.ZhcxOutsideInspectionVo;
 import com.rongwei.rwcommon.base.R;
@@ -36,5 +37,5 @@ public interface ZhcxApiService {
 
     void initPwd();
 
-    String syncUserData(String data);
+    JSONObject syncUserData(String data);
 }

+ 9 - 3
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxApiServiceImpl.java

@@ -14,7 +14,6 @@ import com.rongwei.bscommon.sys.utils.HwSmsUtil;
 import com.rongwei.bscommon.sys.utils.SmsCodeGenerateUtils;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.dto.RectifyApiDataDto;
-import com.rongwei.bsentity.dto.RectifyDto;
 import com.rongwei.bsentity.vo.ZhcxOutsideInspectionVo;
 import com.rongwei.bsentity.vo.ZhcxProjectRectifyMachineVo;
 import com.rongwei.commonservice.service.RedisService;
@@ -453,8 +452,10 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
     }
 
     @Override
-    public String syncUserData(String data) {
+    public JSONObject syncUserData(String data) {
         Document document = null;
+        JSONObject json = new JSONObject();
+        log.info("一网通办推送用户数据:{}"+data);
         try {
             document = DocumentHelper.parseText(data);
             Element root = document.getRootElement();
@@ -513,10 +514,15 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
                     sysUserService.update(sysUserDo,updateWrapper);
                 }
             }
+            json.put("token","3af123b5-95d4-4828-910b-5a675bf831ca");
+            json.put("type","success");
+            json.put("message","获取成功");
         } catch (DocumentException e) {
             e.printStackTrace();
         }
-        return "success";
+
+
+        return json;
     }
 
     private List<RectifyApiDataDto> processFirstDeptData(List<ZhcxProjectRectifyMachineVo> list, ZhcxProjectManageDo projectManageDo) {

+ 2 - 2
business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxApiController.java

@@ -182,8 +182,8 @@ public class ZhcxApiController {
      * 初始化无密码用户
      */
     @PostMapping("/syncUserData")
-    public String syncUserData(String data){
-        String result = zhcxApiService.syncUserData(data);
+    public JSONObject syncUserData(String data){
+        JSONObject result = zhcxApiService.syncUserData(data);
         return result;
     }
 }