接口添加，以及参数更改

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/TGdbhYjjbntController.java

@@ -1,21 +1,13 @@
 package com.onemap.apply.controller.gdbh;
 
-import com.onemap.apply.domain.gdbh.TGdbhJctb;
 import com.onemap.apply.domain.gdbh.TGdbhYjjbntServerDTO;
-import com.onemap.apply.service.gdbh.ITGdbhJctbService;
 import com.onemap.apply.service.gdbh.ITGdbhYjjbntService;
 import com.onemap.common.core.utils.StringUtils;
-import com.onemap.common.core.utils.poi.ExcelUtil;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.AjaxResult;
-import com.onemap.common.core.web.page.TableDataInfo;
-import com.onemap.common.log.annotation.Log;
-import com.onemap.common.log.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 耕地保护-永久基本农田Controller
@@ -39,29 +31,30 @@ public class TGdbhYjjbntController extends BaseController {
     }
 
     @GetMapping("/ntzl")
-    public AjaxResult ntzllist(String yaer, String xzqhdm, String dlbm) {
-        if (StringUtils.isEmpty(yaer)) {
+    public AjaxResult ntzllist(String year, String xzqhdm, String dlbm) {
+        if (StringUtils.isEmpty(year)) {
             return error("参数缺失");
         }
         if (StringUtils.isEmpty(xzqhdm)) {
             return error("参数缺失");
         }
-        return success(itGdbhYjjbntService.ntzllist(yaer, xzqhdm, dlbm));
+        return success(itGdbhYjjbntService.ntzllist(year, xzqhdm, dlbm));
     }
 
     @GetMapping("/ntzlfl")
-    public AjaxResult ntzlfl(String yaer, String xzqhdm, String dlbm) {
-        if (StringUtils.isEmpty(yaer)) {
+    public AjaxResult ntzlfl(String year, String xzqhdm, String dlbm) {
+        if (StringUtils.isEmpty(year)) {
             return error("参数缺失");
         }
         if (StringUtils.isEmpty(xzqhdm)) {
             return error("参数缺失");
         }
-        return success(itGdbhYjjbntService.ntzlfl(yaer, xzqhdm, dlbm));
+        return success(itGdbhYjjbntService.ntzlfl(year, xzqhdm, dlbm));
     }
 
     /**
      * 变化规律
+     *
      * @param sourceyaer
      * @param targeyaer
      * @param xzqhdm
@@ -69,24 +62,23 @@ public class TGdbhYjjbntController extends BaseController {
      * @return
      */
     @GetMapping("/ntzlbhqk")
-    public AjaxResult ntzlbhqk(String sourceyaer, String targeyaer, String xzqhdm, String dlbm) {
-        if (StringUtils.isEmpty(sourceyaer)) {
+    public AjaxResult ntzlbhqk(String sourceyear, String targeyear, String xzqhdm, String dlbm) {
+        if (StringUtils.isEmpty(sourceyear)) {
             return error("参数缺失");
         }
-        if (StringUtils.isEmpty(targeyaer)) {
+        if (StringUtils.isEmpty(targeyear)) {
             return error("参数缺失");
         }
         if (StringUtils.isEmpty(xzqhdm)) {
             return error("参数缺失");
         }
-        return success(itGdbhYjjbntService.ntzlbhqk(sourceyaer, targeyaer, xzqhdm, dlbm));
+        return success(itGdbhYjjbntService.ntzlbhqk(sourceyear, targeyear, xzqhdm, dlbm));
     }
 
 
     /**
      * 变化规律
-     * @param sourceyaer
-     * @param targeyaer
+     *
      * @param xzqhdm
      * @param dlbm
      * @return
@@ -96,70 +88,18 @@ public class TGdbhYjjbntController extends BaseController {
         if (StringUtils.isEmpty(xzqhdm)) {
             return error("参数缺失");
         }
-        return success(itGdbhYjjbntService.ntzllnbhqk( xzqhdm, dlbm));
+        return success(itGdbhYjjbntService.ntzllnbhqk(xzqhdm, dlbm));
     }
 
-//    /**
-//     * 导出耕地保护-检测图标数据详情表列表
-//     */
-//    @Log(title = "耕地保护-检测图标数据详情表", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, TGdbhJctb tGdbhJctb) {
-//        List<TGdbhJctb> list = tGdbhJctbService.selectTGdbhJctbList(tGdbhJctb);
-//        ExcelUtil<TGdbhJctb> util = new ExcelUtil<TGdbhJctb>(TGdbhJctb.class);
-//        util.exportExcel(response, list, "耕地保护-检测图标数据详情表数据");
-//    }
-//
-//    /**
-//     * 获取耕地保护-检测图标数据详情表详细信息
-//     */
-//    @GetMapping(value = "/{id}")
-//    public AjaxResult getInfo(@PathVariable("id") String id) {
-//        return success(tGdbhJctbService.selectTGdbhJctbById(id));
-//    }
-//
-//    /**
-//     * 新增耕地保护-检测图标数据详情表
-//     */
-//    @Log(title = "耕地保护-检测图标数据详情表", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody TGdbhJctb tGdbhJctb) {
-//        return toAjax(tGdbhJctbService.insertTGdbhJctb(tGdbhJctb));
-//    }
-//
-//    /**
-//     * 修改耕地保护-检测图标数据详情表
-//     */
-//    @Log(title = "耕地保护-检测图标数据详情表", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody TGdbhJctb tGdbhJctb) {
-//        return toAjax(tGdbhJctbService.updateTGdbhJctb(tGdbhJctb));
-//    }
-//
-//    /**
-//     * 删除耕地保护-检测图标数据详情表
-//     */
-//    @Log(title = "耕地保护-检测图标数据详情表", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable String[] ids) {
-//        return toAjax(tGdbhJctbService.deleteTGdbhJctbByIds(ids));
-//    }
-//
-//
-//    /**
-//     * 新增耕地保护-检测图标数据入库
-//     */
-//    @Log(title = "耕地保护-检测图标数据入库", businessType = BusinessType.INSERT)
-//    @PostMapping("/store")
-//    public AjaxResult addStore(String uploadShpId) {
-//        tGdbhJctbService.handleUploadShpGdbhJctb(uploadShpId);
-//        return toAjax(1);
-//    }
-//
-//
-//    @GetMapping("/date/list")
-//    public AjaxResult QueryDateList(Integer yearNumber) {
-//        return success(tGdbhJctbService.QueryDateList(yearNumber));
-//    }
+    @GetMapping("/ntzlqxfl")
+    public AjaxResult ntzlqxfl(String year, String xzqhdm, String dlbm) {
+        if (StringUtils.isEmpty(year)) {
+            return error("参数缺失");
+        }
+        if (StringUtils.isEmpty(xzqhdm)) {
+            return error("参数缺失");
+        }
+        return success(itGdbhYjjbntService.ntzlqxfl(year, xzqhdm, dlbm));
+    }
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhYjjbntMapper.java

@@ -17,10 +17,11 @@ public interface TGdbhYjjbntMapper {
 
     public List<Map<String, Object>> ntzlfl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
+    public List<Map<String, Object>> qxfl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
+
+
     public Map<String, Object> ntzlbhyear(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
     public Map<String, Object> ntzllnbh(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
 
-    public Map<String, Object> qxfl(@Param("sjy") String sjy, @Param("areacolumn") String areacolumn, @Param("yaer") String yaer, @Param("xzqhdm") String xzqhdm, @Param("dlbm") String dlbm);
-
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/ITGdbhYjjbntService.java

@@ -16,12 +16,15 @@ public interface ITGdbhYjjbntService {
 
     public List<TGdbhYjjbntServerDTO> selectTGdbhYjjbntServerList(TGdbhYjjbntServerDTO tGdbhJctb);
 
-    Map<String, Object> ntzllist(String yaer, String xzqhdm, String dlbm);
+    Map<String, Object> ntzllist(String year, String xzqhdm, String dlbm);
 
-    public List<Map<String, Object>> ntzlfl(String yaer, String xzqhdm, String dlbm);
+    public List<Map<String, Object>> ntzlfl(String year, String xzqhdm, String dlbm);
 
-    Map<String, Object> ntzlbhqk(String sourceyaer, String targetyaer, String xzqhdm, String dlbm);
+    Map<String, Object> ntzlbhqk(String sourceyear, String targetyear, String xzqhdm, String dlbm);
 
     List<Map<String, Object>> ntzllnbhqk(String xzqhdm, String dlbm);
 
+    List<Map<String, Object>> ntzlqxfl(String year, String xzqhdm, String dlbm);
+
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhYjjbntServiceImpl.java

@@ -123,4 +123,19 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         return retList;
     }
 
+    @Override
+    public List<Map<String, Object>> ntzlqxfl(String yaer, String xzqhdm, String dlbm) {
+        TGdbhYjjbntServerDTO d0_tGdbhYjjbntServer = new TGdbhYjjbntServerDTO();
+        d0_tGdbhYjjbntServer.setYear(yaer);
+        List<TGdbhYjjbntServerDTO> d1 = selectTGdbhYjjbntServerList(d0_tGdbhYjjbntServer);
+        if (d1 == null || d1.size() == 0) {
+            return null;
+        }
+        TGdbhYjjbntServerDTO d2 = d1.get(0);
+        String areacolumn = d2.getAreaColumn();
+        String sjy = d2.getSjy();
+        List<Map<String, Object>> retMap = tGdbhYjjbntMapper.qxfl(sjy, areacolumn, yaer, xzqhdm, dlbm);
+        return retMap;
+    }
+
 }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhYjjbntMapper.xml

@@ -4,9 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.apply.mapper.gdbh.TGdbhYjjbntMapper">
 
-    <select id="ntzl" parameterType="String"  resultType="map">
+    <select id="ntzl" parameterType="String" resultType="map">
         select t2.*, round(mj*0.0015,2) mj_m, round(mj*0.0001,2) mj_gq, round(mj*0.000001,2) mj_qm from (
-        select round((coalesce(sum(mj::numeric), 0)),2)  mj ,count(*) gs from (
+        select round((coalesce(sum(mj::numeric), 0)),2) mj ,count(*) gs from (
         select "${areacolumn}" as mj from vector."${sjy}"
         <if test="dlbm!=null and dlbm!='' ">
             where dlbm = #{dlbm}
@@ -14,14 +14,27 @@
         )t1)t2
     </select>
 
-    <select id="ntzlfl" parameterType="String"  resultType="map">
-        select t2.*, round(t2.mj*0.0015,2) mj_m, round(t2.mj*0.0001,2) mj_gq, round(t2.mj*0.000001,2) mj_qm,t2.dlmc from (
-         select round((coalesce(sum(mj::numeric), 0)),2)  mj ,count(*) gs ,dlmc from (
-         select "${areacolumn}" as mj ,dlmc from vector."${sjy}"
+    <select id="ntzlfl" parameterType="String" resultType="map">
+        select t2.*, round(t2.mj*0.0015,2) mj_m, round(t2.mj*0.0001,2) mj_gq, round(t2.mj*0.000001,2) mj_qm,t2.dlmc from
+        (
+        select round((coalesce(sum(mj::numeric), 0)),2) mj ,count(*) gs ,dlmc from (
+        select "${areacolumn}" as mj ,dlmc from vector."${sjy}"
         <if test="dlbm!=null and dlbm!='' ">
             where dlbm = #{dlbm}
         </if>
         )t1 group by dlmc)t2
     </select>
 
+    <select id="qxfl" parameterType="String" resultType="map">
+        select t2.*, round(t2.mj*0.0015,2) mj_m, round(t2.mj*0.0001,2) mj_gq, round(t2.mj*0.000001,2) mj_qm,t2.xzqdm ,
+        t3.name xqdmc from (
+        select round((coalesce(sum(mj::numeric), 0)),2) mj ,count(*) gs ,xzqdm from (
+        select "${areacolumn}" as mj ,dlmc,substr(xzqdm,1,6) xzqdm from vector."${sjy}"
+        <if test="dlbm!=null and dlbm!='' ">
+            where dlbm = #{dlbm}
+        </if>
+        )t1 group by xzqdm)t2 left join vector.xzqh t3 on t3.id = t2.xzqdm
+    </select>
+
+
 </mapper>