奥体项目实时数据增加仪表排序

@@ -50,6 +50,9 @@ public class WhatStructData {
 	/**备注*/
 	/**备注*/
 	@ApiModelProperty(value = "备注")
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	private String remark;
+	/**排序*/
+	@ApiModelProperty(value = "排序")
+	private Integer monitorSort;
 	/**创建人id*/
 	/**创建人id*/
     @ApiModelProperty(value = "创建人id")
     @ApiModelProperty(value = "创建人id")
 	private String createBy;
 	private String createBy;

@@ -3,7 +3,7 @@
 <mapper namespace="com.skua.modules.business.mapper.WhatStructDataMapper">
 <mapper namespace="com.skua.modules.business.mapper.WhatStructDataMapper">
 
 
     <select id="getList" resultType="com.skua.modules.business.entity.WhatStructData">
     <select id="getList" resultType="com.skua.modules.business.entity.WhatStructData">
-        select * from what_struct_data
+        select * from what_struct_data order by monitor_sort
     </select>
     </select>
 
 
     <select id="getListForUE" resultType="com.skua.modules.business.entity.WhatStructData">
     <select id="getListForUE" resultType="com.skua.modules.business.entity.WhatStructData">

@@ -45,51 +45,51 @@ public class YwLocationServiceImpl implements ILocationService {
         HashMap<String,Object> pMap = new HashMap<>();
         HashMap<String,Object> pMap = new HashMap<>();
         pMap.put("username", username);
         pMap.put("username", username);
         pMap.put("password", password);
         pMap.put("password", password);
-//        String get = HttpUtil.get(url+"open/information/getRealGps.do",pMap);
-        String get = "{\n" +
-                "\"data\":\n" +
-                "[{\n" +
-                "\"empName\":\"贾伟峰\",\n" +
-                "\"area\":\"2\",\n" +
-                "\"deviceNo\":\"16a7ebee\",\n" +
-                "\"crossY\":\"2564\",\n" +
-                "\"crossX\":\"1508\",\n" +
-                "\"longitude\":104.04438600000114,\n" +
-                "\"latitude\":30.630693000000115,\n" +
-                "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
-                "\"layer\":\"-1\",\n" +
-                "\"empNo\":\"108036\",\n" +
-                "\"specifictype\":\"0\"\n" +
-                "},\n" +
-                "{\n" +
-                "\"empName\":\"宋锡园\",\n" +
-                "\"area\":\"2\",\n" +
-                "\"deviceNo\":\"169c1502\",\n" +
-                "\"crossY\":\"2584\",\n" +
-                "\"crossX\":\"1538\",\n" +
-                "\"longitude\":104.04438600000114,\n" +
-                "\"latitude\":30.630693000000115,\n" +
-                "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
-                "\"layer\":\"-1\",\n" +
-                "\"empNo\":\"108037\",\n" +
-                "\"specifictype\":\"0\"\n" +
-                "},\n" +
-                "{\n" +
-                "\"empName\":\"何成翔\",\n" +
-                "\"area\":\"2\",\n" +
-                "\"deviceNo\":\"169c0cba\",\n" +
-                "\"crossY\":\"2564\",\n" +
-                "\"crossX\":\"2816\",\n" +
-                "\"longitude\":124.01230000114,\n" +
-                "\"latitude\":31.6301230000115,\n" +
-                "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
-                "\"layer\":\"-1\",\n" +
-                "\"empNo\":\"147258\",\n" +
-                "\"specifictype\":\"0\"\n" +
-                "}],\n" +
-                "\"status\":0,\n" +
-                "\"msginfo\":\"接口调用成功！\"\n" +
-                "}";
+        String get = HttpUtil.get(url+"open/information/getRealGps.do",pMap);
+//        String get = "{\n" +
+//                "\"data\":\n" +
+//                "[{\n" +
+//                "\"empName\":\"贾伟峰\",\n" +
+//                "\"area\":\"2\",\n" +
+//                "\"deviceNo\":\"16a7ebee\",\n" +
+//                "\"crossY\":\"2564\",\n" +
+//                "\"crossX\":\"1508\",\n" +
+//                "\"longitude\":104.04438600000114,\n" +
+//                "\"latitude\":30.630693000000115,\n" +
+//                "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
+//                "\"layer\":\"-1\",\n" +
+//                "\"empNo\":\"108036\",\n" +
+//                "\"specifictype\":\"0\"\n" +
+//                "},\n" +
+//                "{\n" +
+//                "\"empName\":\"宋锡园\",\n" +
+//                "\"area\":\"2\",\n" +
+//                "\"deviceNo\":\"169c1502\",\n" +
+//                "\"crossY\":\"2584\",\n" +
+//                "\"crossX\":\"1538\",\n" +
+//                "\"longitude\":104.04438600000114,\n" +
+//                "\"latitude\":30.630693000000115,\n" +
+//                "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
+//                "\"layer\":\"-1\",\n" +
+//                "\"empNo\":\"108037\",\n" +
+//                "\"specifictype\":\"0\"\n" +
+//                "},\n" +
+//                "{\n" +
+//                "\"empName\":\"何成翔\",\n" +
+//                "\"area\":\"2\",\n" +
+//                "\"deviceNo\":\"169c0cba\",\n" +
+//                "\"crossY\":\"2564\",\n" +
+//                "\"crossX\":\"2816\",\n" +
+//                "\"longitude\":124.01230000114,\n" +
+//                "\"latitude\":31.6301230000115,\n" +
+//                "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
+//                "\"layer\":\"-1\",\n" +
+//                "\"empNo\":\"147258\",\n" +
+//                "\"specifictype\":\"0\"\n" +
+//                "}],\n" +
+//                "\"status\":0,\n" +
+//                "\"msginfo\":\"接口调用成功！\"\n" +
+//                "}";
         JSONObject json = JSONObject.parseObject(get);
         JSONObject json = JSONObject.parseObject(get);
         List<UserLocationYwResult> getList = JSONObject.parseArray(json.get("data").toString(), UserLocationYwResult.class);
         List<UserLocationYwResult> getList = JSONObject.parseArray(json.get("data").toString(), UserLocationYwResult.class);
         getLocationBasicInfo();//坐标转换基础信息
         getLocationBasicInfo();//坐标转换基础信息
@@ -118,29 +118,29 @@ public class YwLocationServiceImpl implements ILocationService {
         pMap.put("begintime", startTime);
         pMap.put("begintime", startTime);
         pMap.put("endtime", endTime);
         pMap.put("endtime", endTime);
         pMap.put("deveuis", deviceCode);
         pMap.put("deveuis", deviceCode);
-//        String get = HttpUtil.get(url+"open/information/getHis.do",pMap);
-        String get = "{\n" +
-                "\"data\":[\n" +
-                "{\n" +
-                "\"name\":\"贾伟峰\",\n" +
-                "\"time\":\"2020-04-20 00:02:35\",\n" +
-                "\"x\":\"3539.05\",\n" +
-                "\"y\":\"2711.93\",\n" +
-                "\"lat\":32.54224453987491,\n" +
-                "\"lon\":121.05223514735032\n" +
-                "},\n" +
-                "{\n" +
-                "\"name\":\"贾伟峰\",\n" +
-                "\"time\":\"2020-04-20 00:02:45\",\n" +
-                "\"x\":\"3536.05\",\n" +
-                "\"y\":\"2611.93\",\n" +
-                "\"lat\":32.54212353987491,\n" +
-                "\"lon\":121.05123514735032\n" +
-                "}\n" +
-                "],\n" +
-                "\"msginfo\":\"成功！\",\n" +
-                "\"status\":0\n" +
-                "}";
+        String get = HttpUtil.get(url+"open/information/getHis.do",pMap);
+//        String get = "{\n" +
+//                "\"data\":[\n" +
+//                "{\n" +
+//                "\"name\":\"贾伟峰\",\n" +
+//                "\"time\":\"2020-04-20 00:02:35\",\n" +
+//                "\"x\":\"3539.05\",\n" +
+//                "\"y\":\"2711.93\",\n" +
+//                "\"lat\":32.54224453987491,\n" +
+//                "\"lon\":121.05223514735032\n" +
+//                "},\n" +
+//                "{\n" +
+//                "\"name\":\"贾伟峰\",\n" +
+//                "\"time\":\"2020-04-20 00:02:45\",\n" +
+//                "\"x\":\"3536.05\",\n" +
+//                "\"y\":\"2611.93\",\n" +
+//                "\"lat\":32.54212353987491,\n" +
+//                "\"lon\":121.05123514735032\n" +
+//                "}\n" +
+//                "],\n" +
+//                "\"msginfo\":\"成功！\",\n" +
+//                "\"status\":0\n" +
+//                "}";
         JSONObject json = JSONObject.parseObject(get);
         JSONObject json = JSONObject.parseObject(get);
         List<UserLocationHistoryYwResult> getList = JSONObject.parseArray(json.get("data").toString(), UserLocationHistoryYwResult.class);
         List<UserLocationHistoryYwResult> getList = JSONObject.parseArray(json.get("data").toString(), UserLocationHistoryYwResult.class);
         getLocationBasicInfo();//坐标转换基础信息
         getLocationBasicInfo();//坐标转换基础信息
@@ -166,30 +166,30 @@ public class YwLocationServiceImpl implements ILocationService {
         map.put("page",1);
         map.put("page",1);
         map.put("rows",1000);
         map.put("rows",1000);
         map.put("emp","");
         map.put("emp","");
-//        String post = HttpUtil.get(url+"open/information/getEmp.do",map);
-        String post = "{\n" +
-                "\t\"data\": {\n" +
-                "\t\t\"total\": 3,\n" +
-                "\t\t\"rows\": [{\n" +
-                "\t\t\t\"id\": 1,\n" +
-                "\t\t\t\"empno\": \"108036\",\n" +
-                "\t\t\t\"empname\": \"贾伟峰\",\n" +
-                "\t\t\t\"deviceno\": \"16a7ebee\"\n" +
-                "\t\t},{\n" +
-                "\t\t\t\"id\": 2,\n" +
-                "\t\t\t\"empno\": \"108037\",\n" +
-                "\t\t\t\"empname\": \"宋锡园\",\n" +
-                "\t\t\t\"deviceno\": \"169c1502\"\n" +
-                "\t\t},{\n" +
-                "\t\t\t\"id\": 3,\n" +
-                "\t\t\t\"empno\": \"147258\",\n" +
-                "\t\t\t\"empname\": \"何成翔\",\n" +
-                "\t\t\t\"deviceno\": \"169c0cba\"\n" +
-                "\t\t}]\n" +
-                "\t},\n" +
-                "\t\"msginfo\": \"成功！\",\n" +
-                "\t\"status\": 0\n" +
-                "} ";
+        String post = HttpUtil.get(url+"open/information/getEmp.do",map);
+//        String post = "{\n" +
+//                "\t\"data\": {\n" +
+//                "\t\t\"total\": 3,\n" +
+//                "\t\t\"rows\": [{\n" +
+//                "\t\t\t\"id\": 1,\n" +
+//                "\t\t\t\"empno\": \"108036\",\n" +
+//                "\t\t\t\"empname\": \"贾伟峰\",\n" +
+//                "\t\t\t\"deviceno\": \"16a7ebee\"\n" +
+//                "\t\t},{\n" +
+//                "\t\t\t\"id\": 2,\n" +
+//                "\t\t\t\"empno\": \"108037\",\n" +
+//                "\t\t\t\"empname\": \"宋锡园\",\n" +
+//                "\t\t\t\"deviceno\": \"169c1502\"\n" +
+//                "\t\t},{\n" +
+//                "\t\t\t\"id\": 3,\n" +
+//                "\t\t\t\"empno\": \"147258\",\n" +
+//                "\t\t\t\"empname\": \"何成翔\",\n" +
+//                "\t\t\t\"deviceno\": \"169c0cba\"\n" +
+//                "\t\t}]\n" +
+//                "\t},\n" +
+//                "\t\"msginfo\": \"成功！\",\n" +
+//                "\t\"status\": 0\n" +
+//                "} ";
         JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
         JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
         List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
         List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
         for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {
         for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {