Merge branch 'master' of http://192.168.0.56:3000/bonus/cqdevicemgt
This commit is contained in:
commit
31a50dea05
|
|
@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
@ -407,6 +408,8 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
iotLocationVo.setBeginTime(jsonObject.getString("starttime"));
|
iotLocationVo.setBeginTime(jsonObject.getString("starttime"));
|
||||||
iotLocationVo.setEndTime(jsonObject.getString("endtime"));
|
iotLocationVo.setEndTime(jsonObject.getString("endtime"));
|
||||||
iotLocationVo.setAddress(jsonObject.getString("address"));
|
iotLocationVo.setAddress(jsonObject.getString("address"));
|
||||||
|
iotLocationVo.setCallat(new BigDecimal(jsonObject.getString("callat")));
|
||||||
|
iotLocationVo.setCallon(new BigDecimal(jsonObject.getString("callon")));
|
||||||
iotLocationVoList.add(iotLocationVo);
|
iotLocationVoList.add(iotLocationVo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue