Administrator 3 年 前
コミット
44aee121ac

+ 8 - 0
mybusiness/src/main/java/com/sooka/system/controller/TUSfzController.java

@@ -1,5 +1,6 @@
 package com.sooka.system.controller;
 package com.sooka.system.controller;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import com.sooka.common.annotation.Log;
 import com.sooka.common.annotation.Log;
@@ -63,9 +64,16 @@ public class TUSfzController extends BaseController {
         tUSfz.setOs(os);
         tUSfz.setOs(os);
         tUSfz.setIpaddress(ipaddress);
         tUSfz.setIpaddress(ipaddress);
         List<TUSfz> list = tUSfzService.selectTUSfzList(tUSfz);
         List<TUSfz> list = tUSfzService.selectTUSfzList(tUSfz);
+//        if(list == null){
+//            TableDataInfo dataInfo = getDataTable(new ArrayList<>());
+//            dataInfo.setMsg("秘钥不正确或已过期,请联系管理员");
+//            return dataInfo;
+//        }
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
+
+
     /**
     /**
      * 导出身份证列表
      * 导出身份证列表
      */
      */

+ 41 - 39
mybusiness/src/main/java/com/sooka/system/service/impl/TUSfzServiceImpl.java

@@ -63,48 +63,50 @@ public class TUSfzServiceImpl implements ITUSfzService {
     @Override
     @Override
     public List<TUSfz> selectTUSfzList(TUSfz tUSfz) {
     public List<TUSfz> selectTUSfzList(TUSfz tUSfz) {
         Map map = new HashMap();
         Map map = new HashMap();
-        map.put("accessId", "1625205696412");
-        map.put("stringToSign", "4ab54dea9926f3386b56fd5fe51b35ae0fe1405a");
+        map.put("secretKey", "0f0806f206544597840df9cade4127bb");
         String r = HttpUtil.doGet("http://127.0.0.1:88/api/test/sfz", "", map);
         String r = HttpUtil.doGet("http://127.0.0.1:88/api/test/sfz", "", map);
         JSONObject jsonpObject = JSONObject.parseObject(r);
         JSONObject jsonpObject = JSONObject.parseObject(r);
-        JSONArray array = jsonpObject.getJSONObject("data").getJSONArray("data");
-        List ls = new ArrayList();
-        for (int i = 0; i < array.size(); i++) {
-            JSONObject obj = array.getJSONObject(i);
-            TUSfz s = new TUSfz();
-            tUSfz.setId(UUID.fastUUID().toString());
-            tUSfz.setLicenceIssue(obj.getString("licenceIssue"));
-            tUSfz.setName(obj.getString("name"));
-            tUSfz.setGender(obj.getString("gender"));
-            tUSfz.setNationality(obj.getString("nationality"));
-            tUSfz.setBirthDate(obj.getString("birthDate"));
-            tUSfz.setIdcardNo(obj.getString("idcardNo"));
-            tUSfz.setAddressPermanent(obj.getString("addressPermanent"));
-            tUSfz.setPhotos(obj.getString("photos"));
-            tUSfz.setPhotograph(obj.getString("photograph"));
-            tUSfzMapper.insertTUSfz(tUSfz);
-            ls.add(tUSfz);
-        }
-        //添加操作日志
-        SysUser sysUser = userInfoUtil.getLoginUserInfo();
-        //
-        TULog tuLog = new TULog();
-        tuLog.setId(UUID.fastUUID().toString());
-        tuLog.setBrowser(tUSfz.getBrowser());
-        tuLog.setInterfaceinfoId("1294c112-d5d9-48e2-a794-f1e8453e6516");
-        tuLog.setInterfaceinfoName("吉林省-人口基础信息-数据查询接口");
-        tuLog.setIpaddress(tUSfz.getIpaddress());
-        tuLog.setLoginUser(sysUser.getUserId());
-        tuLog.setLoginName(sysUser.getUserName());
-        tuLog.setOperationQuantity(new Long(ls.size()));
-        tuLog.setOs(tUSfz.getOs());
-        tuLog.setBrowser(tUSfz.getBrowser());
-        //共享接口
-        tuLog.setPlatformInterfacetype("platform_interfacetype_1");
-        tuLogMapper.insertTULog(tuLog);
-
-        return ls;
+        if(jsonpObject != null && jsonpObject.getString("code").equals("1000")){
+            JSONArray array = jsonpObject.getJSONObject("data").getJSONArray("data");
+            List ls = new ArrayList();
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject obj = array.getJSONObject(i);
+                TUSfz s = new TUSfz();
+                tUSfz.setId(UUID.fastUUID().toString());
+                tUSfz.setLicenceIssue(obj.getString("licenceIssue"));
+                tUSfz.setName(obj.getString("name"));
+                tUSfz.setGender(obj.getString("gender"));
+                tUSfz.setNationality(obj.getString("nationality"));
+                tUSfz.setBirthDate(obj.getString("birthDate"));
+                tUSfz.setIdcardNo(obj.getString("idcardNo"));
+                tUSfz.setAddressPermanent(obj.getString("addressPermanent"));
+                tUSfz.setPhotos(obj.getString("photos"));
+                tUSfz.setPhotograph(obj.getString("photograph"));
+                tUSfzMapper.insertTUSfz(tUSfz);
+                ls.add(tUSfz);
+            }
+            //添加操作日志
+            SysUser sysUser = userInfoUtil.getLoginUserInfo();
+            //
+            TULog tuLog = new TULog();
+            tuLog.setId(UUID.fastUUID().toString());
+            tuLog.setBrowser(tUSfz.getBrowser());
+            tuLog.setInterfaceinfoId("1294c112-d5d9-48e2-a794-f1e8453e6516");
+            tuLog.setInterfaceinfoName("吉林省-人口基础信息-数据查询接口");
+            tuLog.setIpaddress(tUSfz.getIpaddress());
+            tuLog.setLoginUser(sysUser.getUserId());
+            tuLog.setLoginName(sysUser.getUserName());
+            tuLog.setOperationQuantity(new Long(ls.size()));
+            tuLog.setOs(tUSfz.getOs());
+            tuLog.setBrowser(tUSfz.getBrowser());
+            //共享接口
+            tuLog.setPlatformInterfacetype("platform_interfacetype_1");
+            tuLogMapper.insertTULog(tuLog);
 
 
+            return ls;
+        }else{
+            return null;
+        }
 //        return tUSfzMapper.selectTUSfzList(tUSfz);
 //        return tUSfzMapper.selectTUSfzList(tUSfz);
     }
     }