|
|
|
@ -12,6 +12,8 @@ import java.time.LocalTime;
|
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
|
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 io.swagger.annotations.ApiImplicitParam; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag; |
|
|
|
@ -41,6 +43,8 @@ public class CtrCntrlController {
|
|
|
|
|
|
|
|
|
|
private final CtrCntrlService service; |
|
|
|
|
|
|
|
|
|
private CtrTrnsLctnService ctrTrnsLctnService; |
|
|
|
|
|
|
|
|
|
public CtrCntrlController(CtrCntrlService service) { |
|
|
|
|
this.service = service; |
|
|
|
|
} |
|
|
|
@ -197,6 +201,7 @@ public class CtrCntrlController {
|
|
|
|
|
coord.setX(rs.getNx()); |
|
|
|
|
coord.setY(rs.getNy()); |
|
|
|
|
returnCoord = service.wheather(coord); |
|
|
|
|
CtrTrnsLctnModel weatherResult = ctrTrnsLctnService.convertLatlonToAddress(returnCoord.x,returnCoord.y); |
|
|
|
|
|
|
|
|
|
double nx = returnCoord.getX(); |
|
|
|
|
double ny = returnCoord.getY(); |
|
|
|
@ -227,6 +232,9 @@ public class CtrCntrlController {
|
|
|
|
|
while ((line = rd.readLine()) != null) { |
|
|
|
|
sb.append(line); |
|
|
|
|
} |
|
|
|
|
sb.append(weatherResult.getArea1()); |
|
|
|
|
sb.append(weatherResult.getArea2()); |
|
|
|
|
sb.append(weatherResult.getArea3()); |
|
|
|
|
String str = sb.toString(); |
|
|
|
|
JSONParser parser = new JSONParser(); |
|
|
|
|
JSONObject jsonObject = (JSONObject) parser.parse(str); |
|
|
|
|