|
|
@@ -4,9 +4,9 @@ import cn.hutool.core.date.DateField;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
+
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.alibaba.fastjson.TypeReference;
|
|
|
+
|
|
|
import com.zoniot.ccrc.commom.Constants;
|
|
|
import com.zoniot.ccrc.commom.utils.HttpRequest;
|
|
|
import com.zoniot.ccrc.commom.utils.RedisUtil;
|
|
|
@@ -14,7 +14,7 @@ import com.zoniot.ccrc.commom.utils.SnowflakeIdWorker;
|
|
|
import com.zoniot.ccrc.dao.CommunityMapper;
|
|
|
import com.zoniot.ccrc.dao.MeterReadRecordMapper;
|
|
|
import com.zoniot.ccrc.dao.MeterRecordMapper;
|
|
|
-import com.zoniot.ccrc.dto.CommunityDto;
|
|
|
+
|
|
|
import com.zoniot.ccrc.entity.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -99,11 +99,11 @@ public class SyncData {
|
|
|
}
|
|
|
private String[] getInfoFromGaode(String name,String city){
|
|
|
String request = apiUrl+"?key="+apikey+"&address="+name+"&city="+city;
|
|
|
- String[] tts=null;;
|
|
|
+ String[] tts=null;
|
|
|
try {
|
|
|
String jsonContent = HttpRequest.doGet(request);
|
|
|
JSONObject parse = (JSONObject)JSON.parse(jsonContent);
|
|
|
- Integer count = Integer.parseInt((String)parse.get("count"));
|
|
|
+ int count = Integer.parseInt((String)parse.get("count"));
|
|
|
if(count != 0) {
|
|
|
JSONObject geocodes=parse.getJSONArray("geocodes").getJSONObject(0);
|
|
|
String rtnContent =geocodes.get("location").toString();
|
|
|
@@ -263,7 +263,7 @@ public class SyncData {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- protected Double calculateTodayCost(String currentReading,Double lastValid,MeterReadRecord record){
|
|
|
+ private Double calculateTodayCost(String currentReading,Double lastValid,MeterReadRecord record){
|
|
|
|
|
|
|
|
|
Double currentValid = new Double(currentReading);
|
hym