Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +31,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * iot设备管理实现层
+ *
  * @author ma_sh
  */
 @Service
@@ -283,6 +285,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 获取定位
+     *
      * @param iotDto
      * @return
      */
@@ -314,6 +317,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 查询行程
+     *
      * @param iotLocationVo
      * @return
      */
@@ -342,6 +346,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 查询停留点
+     *
      * @param iotLocationVo
      * @return
      */
@@ -374,6 +379,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 解析停留点返回报文
+     *
      * @param res
      * @return
      */
@@ -396,6 +402,8 @@ public class IotMachineServiceImpl implements IotMachineService {
                     iotLocationVo.setBeginTime(jsonObject.getString("starttime"));
                     iotLocationVo.setEndTime(jsonObject.getString("endtime"));
                     iotLocationVo.setAddress(jsonObject.getString("address"));
+                    iotLocationVo.setCallat(new BigDecimal(jsonObject.getString("callat")));
+                    iotLocationVo.setCallon(new BigDecimal(jsonObject.getString("callon")));
                     iotLocationVoList.add(iotLocationVo);
                 }
             }
@@ -405,6 +413,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 绑定设备APP
+     *
      * @param iotDto
      * @return
      */
@@ -445,6 +454,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 报警记录
+     *
      * @param iotLocationVo
      * @return
      */
@@ -481,6 +491,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 解析报警返回报文
+     *
      * @param res
      * @return
      */
@@ -512,6 +523,7 @@ public class IotMachineServiceImpl implements IotMachineService {
 
     /**
      * 解析定位返回报文
+     *
      * @param res
      * @return
      */

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml

@@ -126,7 +126,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND mt.level IN ('1','2','3','4')
             </if>
         </if>
-        ORDER BY mt.create_time
     </select>
     <!--资产属性-->
     <select id="getAssetAttributesCbx" resultType="com.bonus.sgzb.system.domain.SelectVo">