|
|
@@ -1,13 +1,15 @@
|
|
|
package com.siwei.apply.controller;
|
|
|
|
|
|
+import com.siwei.apply.domain.Project;
|
|
|
import com.siwei.apply.service.NodeLandService;
|
|
|
+import com.siwei.apply.service.ProjectService;
|
|
|
import com.siwei.common.core.domain.R;
|
|
|
import com.siwei.common.core.web.controller.BaseController;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.LinkedHashMap;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
@@ -20,6 +22,9 @@ public class NodeLandController extends BaseController {
|
|
|
@Autowired
|
|
|
private NodeLandService nodeLandService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ProjectService projectService;
|
|
|
+
|
|
|
/**
|
|
|
* 根据nodeId和geomDbId创建节点地块关联记录
|
|
|
*
|
|
|
@@ -110,4 +115,35 @@ public class NodeLandController extends BaseController {
|
|
|
return R.fail("删除节点地块关联记录异常:" + e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/projectGeomInfo")
|
|
|
+ public R<Map<String, String>> getProjectGeomInfo(@RequestParam String projectId,
|
|
|
+ @RequestParam String nodeId, @RequestParam String geomId) {
|
|
|
+ try {
|
|
|
+ if (projectId == null || projectId.trim().isEmpty()) {
|
|
|
+ return R.fail(502,"projectId不能为空");
|
|
|
+ }
|
|
|
+ if (geomId == null || geomId.trim().isEmpty()) {
|
|
|
+ return R.fail(502,"geomId不能为空");
|
|
|
+ }
|
|
|
+ Map<String, String> projectGeomInfo = new LinkedHashMap<>();
|
|
|
+ Project project = projectService.get(projectId);
|
|
|
+ Map<String, String> geomInfo = nodeLandService.selectGeomById(geomId);
|
|
|
+ projectGeomInfo.put("projectId", project.getId());
|
|
|
+ projectGeomInfo.put("name", project.getName());
|
|
|
+ projectGeomInfo.put("code", project.getCode());
|
|
|
+ projectGeomInfo.put("immobileCode", project.getId());
|
|
|
+ projectGeomInfo.put("businessCode", project.getId());
|
|
|
+ projectGeomInfo.put("area", String.format("%.1f", geomInfo.get("geom_area")));
|
|
|
+ return R.ok(projectGeomInfo);
|
|
|
+ } catch (Exception e) {
|
|
|
+ logger.error("根据项目与节点表名查询地块几何信息异常", e);
|
|
|
+ return R.fail("查询异常:" + e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|