机主调整、车轨调整、全国常口调整提交

common/common_utils/src/main/java/com/founder/commonutils/util/KtInterfaceUtils.java

@@ -79,9 +79,6 @@ public class KtInterfaceUtils {
         }
         JSONArray datas = jsonObject.getJSONArray("datas");
         JSONArray fields = jsonObject.getJSONArray("fields");
-        if (datas == null || datas.size() == 0) {
-            return null;
-        }
         for (int i = 0; i < datas.size(); i++) {
             JSONArray data = datas.getJSONArray(i);
             HashMap<String, String> resultMap = new HashMap<>();

pom.xml

@@ -5,9 +5,7 @@
 
     <modules>
         <module>service</module>
-<!--
         <module>serviceapi</module>
--->
         <module>common</module>
     </modules>
     <parent>

service/publicapi/src/main/java/com/founder/publicapi/controller/RyController.java

@@ -61,7 +61,6 @@ public class RyController {
     public MapRestResult getQgckAllxxXml(@RequestBody RyReceiving receiving) throws Exception {
         TbStRy ryxx=new TbStRy();
         if("460003198912096617".equals(receiving.getSfzh()) || StringUtils.endsWithIgnoreCase("琼AD33988",receiving.getCphm()) || "13900757030".equals(receiving.getSfzh())){
-            //                person = JsonUtils.readJsonFromClassPath("data/yczc/ryxxQg.json", JSONObject.class);
             ryxx.setXm("李义");
             ryxx.setMz("汉族");
             ryxx.setXb("男");
@@ -72,6 +71,17 @@ public class RyController {
             ryxx.setHjdqhdz("海南省海口市");
             ryxx.setCsrq("19891209");
             return MapRestResult.build(200,"成功获取全国常口人员信息",ryxx);
+        }else if("460033199303014770".equals(receiving.getSfzh())){
+            ryxx.setXm("黄当");
+            ryxx.setMz("汉族");
+            ryxx.setXb("男");
+            ryxx.setSfzhm("460033199303014770");
+            ryxx.setCsdzmc("海南省乐东黎族自治县");
+            ryxx.setXzzdzmc("海南省乐东黎族自治县");
+            ryxx.setImg("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");
+            ryxx.setHjdqhdz("海南省东黎族自治县");
+            ryxx.setCsrq("199303014");
+            return MapRestResult.build(200,"成功获取全国常口人员信息",ryxx);
         }
 //        else{
 //            if(StringUtils.isNotEmpty(receiving.getCphm())){

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/CarServiceImpl.java

@@ -78,13 +78,14 @@ public class CarServiceImpl implements CarService {
         } catch (JSONException e) {
             e.printStackTrace();
         }
+        List<CarTranslateResult> carList = new ArrayList<>();
+
         //调用科通接口获取车辆卡口轨迹数据
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.CLJGKKXX,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(list == null || list.size() == 0){
-            return null;
+        if(list.size() == 0){
+            return MapRestResult.build(200,"成功获取车辆轨迹",0,carList);
         }
-        List<CarTranslateResult> carList = new ArrayList<>();
         for (Map<String, String> map : list) {
             CarTranslateResult car = new CarTranslateResult();
             //根据设备编号获取其他经纬度和名称信息

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/GjServiceImpl.java

@@ -59,14 +59,14 @@ public class GjServiceImpl implements GjService {
         } catch (JSONException e) {
             e.printStackTrace();
         }
+        List<GjResult> listResult = new ArrayList<>();
 
         // 调用科通接口获取车辆卡口轨迹数据
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.CLJGKKXX,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(list == null || list.size() == 0){
-            return null;
+        if(list.size() == 0){
+            return  MapRestResult.build(200,"成功获取车辆轨迹",0,listResult);
         }
-        List<GjResult> listResult = new ArrayList<>();
         for (Map<String, String> map : list) {
             GjResult gj = new GjResult();
 
@@ -108,7 +108,7 @@ public class GjServiceImpl implements GjService {
         }
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.HBDP,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(list == null || list.size() == 0){
+        if(list.size() == 0){
             return  MapRestResult.build(200,"无航班轨迹信息",0,list);
         }
         for (Map<String, String> map : list) {
@@ -178,7 +178,7 @@ public class GjServiceImpl implements GjService {
         }
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.HCDP,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(list == null || list.size() == 0){
+        if(list.size() == 0){
             return  MapRestResult.build(200,"无火车轨迹信息",0,listResult);
         }
         for (Map<String, String> map : list) {
@@ -241,7 +241,7 @@ public class GjServiceImpl implements GjService {
 
     @Override
     public MapRestResult getSjGjInfo(GjParams gjParams) {
-        return null;
+        return MapRestResult.build(200,"成功获取手机轨迹",0,new ArrayList<>());
     }
 
     private String changeDate(String date){
@@ -266,5 +266,6 @@ public class GjServiceImpl implements GjService {
         }
         return timeResult;
     }
+
 }
 

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/PeopleServiceImpl.java

@@ -204,7 +204,7 @@ public class PeopleServiceImpl implements PeopleService {
         HttpUtil hu=new HttpUtil();
         if ("03".equals(objectType)) {
             //如果是身份证号，就要身份证号查手机号
-            String userParam = "{'approveDeptName':'海南省公安厅','approveName':'刘建民','userName':'刘建民','userIDCard':'220103196204020613','approveId':'220103196204020613','12312':'123123'}";
+            String userParam = "{'approveDeptName':'海南省公安厅','approveName':'黄飞','userName':'黄飞','userIDCard':'460103198501301212','approveId':'460103198501301212','12312':'123123'}";
             String caseInfoParam = "{'caseId':'A4602050300002021120026','caseName':'12.27组织卖淫案','remark':''}";
             String searchParam = "{'sfzh':'"+ objectValue +"','startTime':'','phonenum':'','endTime':''}";
             try {
@@ -231,7 +231,7 @@ public class PeopleServiceImpl implements PeopleService {
         } else if ("04".equals(objectType)) {
             //反之如果是手机号，就要反查身份证号
 //            url = "http://26.3.13.120:8501/nmsj/getMySfSjGl?sjhm=" + objectValue;
-            String userParam = "{'approveDeptName':'海南省公安厅','approveName':'刘建民','userName':'刘建民','userIDCard':'220103196204020613','approveId':'220103196204020613','12312':'123123'}";
+            String userParam = "{'approveDeptName':'海南省公安厅','approveName':'黄飞','userName':'黄飞','userIDCard':'460103198501301212','approveId':'460103198501301212','12312':'123123'}";
             String caseInfoParam = "{'caseId':'A4602050300002021120026','caseName':'12.27组织卖淫案','remark':''}";
             String searchParam = "{'sfzh':'','startTime':'','phonenum':'"+objectValue+"','endTime':''}";
             try {
@@ -386,7 +386,7 @@ public class PeopleServiceImpl implements PeopleService {
         ret.put("btw", changeDate(beginDate) + "," + changeDate(endDate));
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.RYSWXX,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(null == list){
+        if(list.size()==0){
             return result;
         }
         //科通提供的数据中没有经纬度数据，因此...
@@ -450,7 +450,7 @@ public class PeopleServiceImpl implements PeopleService {
         ret.put("btw", changeDate(beginDate) + "," + changeDate(endDate));
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.RYZDXX,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(null == list){
+        if(list.size()==0){
             return result;
         }
         for (Map<String, String> map : list) {
@@ -480,7 +480,7 @@ public class PeopleServiceImpl implements PeopleService {
         ret.put("btw", changeDate(beginDate) + "," + changeDate(endDate));
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.HBDP,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(null == list ){
+        if(list.size()==0 ){
             return result;
         }
         for (Map<String, String> map : list) {
@@ -524,7 +524,7 @@ public class PeopleServiceImpl implements PeopleService {
         ret.put("btw", changeDate(beginDate) + "," + changeDate(endDate));
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.HCDP,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(null == list){
+        if(list.size()==0){
             return result;
         }
         for (Map<String, String> map : list) {
@@ -573,7 +573,7 @@ public class PeopleServiceImpl implements PeopleService {
         ret.put("btw", changeDate(beginDate) + "," + changeDate(endDate));
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.KYCX,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(null == list){
+        if(list.size()==0){
             return result;
         }
         //暂时还没有相关经纬度数据
@@ -595,7 +595,7 @@ public class PeopleServiceImpl implements PeopleService {
         ret.put("btw", changeDate(beginDate) + "," + changeDate(endDate));
         String resultJson = ktInterfaceUtils.getDateByJsonParam(ktInterfaceUtils.GKCX,ret.toString());
         List<Map<String, String>> list = ktInterfaceUtils.getMapByJson(resultJson);
-        if(null == list){
+        if(list.size()==0){
             return result;
         }
         //暂时还没有相关经纬度数据
@@ -622,7 +622,7 @@ public class PeopleServiceImpl implements PeopleService {
         List<Map<String, String>> listDw = ktInterfaceUtils.getMapByJson(resultJsonDw);
         List<Map<String, String>> resultListDw = new ArrayList<>();
 
-        if(null != listDw){
+        if(listDw.size()>0){
             for (Map<String, String> map : listDw) {
                 Map<String, String> mapResult = new HashMap<>();
                 mapResult.put("bh",map.get("SDW_BH"));
@@ -638,7 +638,7 @@ public class PeopleServiceImpl implements PeopleService {
         List<Map<String, String>> listDz = ktInterfaceUtils.getMapByJson(resultJsonDz);
         List<Map<String, String>> resultListDz = new ArrayList<>();
 
-        if(null != listDz) {
+        if(listDz.size()>0) {
             for (Map<String, String> map : listDz) {
                 Map<String, String> mapResult = new HashMap<>();
                 mapResult.put("bh", map.get("META_ADDR_ID"));
@@ -653,7 +653,7 @@ public class PeopleServiceImpl implements PeopleService {
         List<Map<String, String>> listZzrk = ktInterfaceUtils.getMapByJson(resultJsonZzrk);
         List<Map<String, String>> resultListZzrk = new ArrayList<>();
 
-        if(null != listZzrk) {
+        if(listZzrk.size()>0) {
             for (Map<String, String> map : listZzrk) {
                 Map<String, String> mapResult = new HashMap<>();
                 mapResult.put("bh", map.get("PID"));
@@ -669,7 +669,7 @@ public class PeopleServiceImpl implements PeopleService {
         List<Map<String, String>> listRk = ktInterfaceUtils.getMapByJson(resultJsonRk);
         List<Map<String, String>> resultListRk = new ArrayList<>();
 
-        if(null != listRk) {
+        if(listRk.size()>0) {
             for (Map<String, String> map : listRk) {
                 Map<String, String> mapResult = new HashMap<>();
                 mapResult.put("bh", map.get("GMSFHM"));

serviceapi/pom.xml

@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <modules>
-        <module>imageapi</module>
+        <module>resource</module><!--
         <module>carapi</module>
-        <module>peopleapi</module>
+        <module>peopleapi</module>-->
     </modules>
     <artifactId>serviceapi</artifactId>
     <dependencies>