|
|
@ -18,6 +18,8 @@ import java.util.Map; |
|
|
|
import java.util.UUID; |
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.*; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.*; |
|
|
|
|
|
|
|
import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel; |
|
|
|
|
|
|
|
import com.palnet.biz.scheduler.ctr.service.CtrTrnsLctnService; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.json.simple.JSONObject; |
|
|
|
import org.json.simple.JSONObject; |
|
|
|
import org.json.simple.parser.JSONParser; |
|
|
|
import org.json.simple.parser.JSONParser; |
|
|
@ -67,7 +69,8 @@ public class CtrCntrlService { |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private JwtTokenUtil jwtTokenUtil; |
|
|
|
private JwtTokenUtil jwtTokenUtil; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
private CtrTrnsLctnService ctrTrnsLctnService; |
|
|
|
private final CtrCntrlQueryRepository query; |
|
|
|
private final CtrCntrlQueryRepository query; |
|
|
|
private final CtrCntrlBasRepository cntrlBasRepository; |
|
|
|
private final CtrCntrlBasRepository cntrlBasRepository; |
|
|
|
private final CtrCntrlHstryRepository cntrlHstryRepository; |
|
|
|
private final CtrCntrlHstryRepository cntrlHstryRepository; |
|
|
@ -635,10 +638,19 @@ public class CtrCntrlService { |
|
|
|
while ((line = rd.readLine()) != null) { |
|
|
|
while ((line = rd.readLine()) != null) { |
|
|
|
sb.append(line); |
|
|
|
sb.append(line); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
CtrTrnsLctnModel weatherResult = ctrTrnsLctnService.convertLatlonToAddress(rq.getNx(),rq.getNy()); |
|
|
|
|
|
|
|
log.info("weatherResult >>>> : {}", weatherResult); |
|
|
|
|
|
|
|
|
|
|
|
String str = sb.toString(); |
|
|
|
String str = sb.toString(); |
|
|
|
JSONParser parser = new JSONParser(); |
|
|
|
JSONParser parser = new JSONParser(); |
|
|
|
JSONObject jsonObject = (JSONObject) parser.parse(str); |
|
|
|
JSONObject jsonObject = (JSONObject) parser.parse(str); |
|
|
|
|
|
|
|
if(weatherResult != null) { |
|
|
|
|
|
|
|
jsonObject.put("area1",weatherResult.getArea1()); |
|
|
|
|
|
|
|
jsonObject.put("area2",weatherResult.getArea2()); |
|
|
|
|
|
|
|
jsonObject.put("area3",weatherResult.getArea3()); |
|
|
|
|
|
|
|
jsonObject.put("landNm",weatherResult.getLandNm()); |
|
|
|
|
|
|
|
jsonObject.put("landNum",weatherResult.getLandNum()); |
|
|
|
|
|
|
|
} |
|
|
|
rd.close(); |
|
|
|
rd.close(); |
|
|
|
conn.disconnect(); |
|
|
|
conn.disconnect(); |
|
|
|
log.info(sb.toString()); |
|
|
|
log.info(sb.toString()); |
|
|
|