平方米转亩

README.md

@@ -13,4 +13,7 @@
 INSERT INTO "base"."t_table" ( "id", "table_name", "table_describe", "table_type", "is_exist", "create_time", "delete_time", "create_user_id", "delete_user_id", "version" )
 VALUES
 ( replace(uuid_generate_v4()::text, '-', ''), 'TB_TYYDCS', '体育运动场所', 0, 0, now(), NULL, '1', NULL, '20240711172001' );
-```
+```
+
+INSERT INTO "base"."t_fzss_fzxz_factor" ("id", "bsm", "level", "parent_id", "status", "condition_info", "name", "order_index") VALUES ('5e008c32506b47ffb1ea83009aba1ed2', '', 0, '', 2, '""', '防控因子', '1');
+INSERT INTO "base"."t_fzss_fzxz_factor" ("id", "bsm", "level", "parent_id", "status", "condition_info", "name", "order_index") VALUES ('2e0e51252d7e46a697edf8b97dbd0bce', '', 0, '', 2, '""', '地形因子', '2');

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -4,6 +4,7 @@ import com.onemap.analyse.domain.calculation.FzxzCalc;
 import com.onemap.analyse.domain.vo.SelectPilotVo;
 import com.onemap.analyse.service.IFzssService;
 import com.onemap.analyse.domain.HgxfxEntityDTO;
+import com.onemap.analyse.utils.UnitsUtil;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +42,13 @@ public class FzssController extends BaseController {
     @PostMapping("/AddFzxz")
     public RequestResult AddFzxz(@RequestBody SelectPilotVo selectPilotVo) {
         // TODO xmlx:项目类型
+        if (selectPilotVo.getYdmjbegin() != null) {
+            selectPilotVo.setYdmjbegin((float) (UnitsUtil.m2ToMu(selectPilotVo.getYdmjbegin())));
+        }
+        if (selectPilotVo.getYdmjend() != null) {
+            selectPilotVo.setYdmjend((float) (UnitsUtil.m2ToMu(selectPilotVo.getYdmjend())));
+        }
+
         // 存储规划参数
         FzxzCalc fzxzCalc = fzssService.saveScheduleParam(selectPilotVo);
         // 开始规划任务
@@ -73,6 +81,7 @@ public class FzssController extends BaseController {
         RequestResult res = fzssService.GetXzResList(startTime, endTime, name, pageNum, pageSize);
         return res;
     }
+
     /**
      * 删除选址结果
      *
@@ -83,6 +92,7 @@ public class FzssController extends BaseController {
         RequestResult res = fzssService.DelXzRes(bsm);
         return res;
     }
+
     /**
      * 通过选择的方案生成报告
      *

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/utils/UnitsUtil.java

@@ -0,0 +1,11 @@
+package com.onemap.analyse.utils;
+
+public class UnitsUtil {
+    // 平方米转亩函数
+    public static double m2ToMu(Float m2) {
+        if (m2 == null) {
+            return 0;
+        }
+        return m2 * 0.0015;
+    }
+}