群体研判、通讯信息研判(湖南)

service/publicapi/src/main/java/com/founder/publicapi/controller/ZtypService/ZtypController.java

@@ -41,7 +41,7 @@ public class ZtypController {
         model.setPage((model.getPage() - 1) * model.getLimit());
         model.setLimit(model.getLimit());
         int total = ztypService.getZpajxxTotal(model);
-        List<ZpajxxEntity> list = null;
+        List<ZpajxxEntity> list = new ArrayList<>();
         if(total>0){
             list = ztypService.getZpajxx(model);
         }

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

@@ -901,7 +901,7 @@ public class ZtypServiceImpl implements ZtypService {
             node1.setLabel(root.getName());
             KsjResultPojo.Nodes.Properties properties = new KsjResultPojo.Nodes.Properties();
             BeanUtils.copyProperties(node1, properties);
-            properties.setBoderColor("");// 高亮
+            properties.setBoderColor("#FA0505");// 高亮
             properties.setImgType(root.getType());// 图标
             node1.setProperties(properties);
             nodes.add(node1);
@@ -1182,8 +1182,8 @@ public class ZtypServiceImpl implements ZtypService {
         for (int i = 0; i < 6; i++) {
             Jzxx jzxx = new Jzxx();
             jzxx.setXm("黄存新");
-            jzxx.setAddress("湖南省浏阳市" + i);
-            jzxx.setZjhm("43012196510265891" + i);
+            jzxx.setAddress("湖南省浏阳市");
+            jzxx.setZjhm("430123196510265891");
             list.add(jzxx);
         }
         return list;
@@ -1219,8 +1219,8 @@ public class ZtypServiceImpl implements ZtypService {
         Map<String, Object> map = new HashMap<>();
         List<NaoTuHdXx> hdList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date start = sdf.parse(txxxParam.getKssj());
-        Date end = sdf.parse(txxxParam.getJssj());
+/*        Date start = sdf.parse(txxxParam.getKssj());
+        Date end = sdf.parse(txxxParam.getJssj());*/
         // 根据标识号查看是否为演示数据  演示数据直接走数据库
         if (skTextUtilServiceImpl.queryText(txxxParam.getPhoneNum()).size() > 0) {
             JSONArray jsonArray = JsonUtils.readJsonFromClassPath("data/getHdfx.json", JSONArray.class);
@@ -1230,8 +1230,8 @@ public class ZtypServiceImpl implements ZtypService {
             HttpClient httpClientCar = new HttpClient();
             JSONObject params = new JSONObject();
             params.put("sjhm",txxxParam.getPhoneNum());
-            params.put("kssj",start);
-            params.put("jssj",end);
+            params.put("kssj",txxxParam.getKssj());
+            params.put("jssj",txxxParam.getJssj());
             JSONObject resultPhone  = httpClientCar.doPostJsonHunan(hunanUrl+hdUrl,params.toJSONString());
             if(resultPhone!=null) {
                 if ("success".equals(resultPhone.getString("status"))) {