综合统计-普通国省道数据接口

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGllmqkController.java

@@ -39,10 +39,15 @@ public class ZhtjGllmqkController extends BaseController  {
    *  获取总体情况柱状图统计信息
    */
   @GetMapping("/barzt")
-  public R getBarZtData(@RequestParam String type){
-     return  new R <>(zhtjGllmqkService.getBarZtData(type));
+  public R getBarZtData(@RequestParam("type") String type,@RequestParam("year") String year){
+
+     return  new R <>(zhtjGllmqkService.getBarZtData(type,year));
   }
 
+  @GetMapping("/ordinary")
+  public R getOrdinary(@RequestParam("type") String type,@RequestParam("year")String year,@RequestParam("area")String area){
+    return  new R <>(zhtjGllmqkService.getOrdinary(type,year,area));
+  }
   /**
    * 通过id查询综合统计_公路路面情况
    * @param id id

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGllmqkMapper.java

@@ -2,6 +2,8 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGllmqk;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 综合统计_公路路面情况
@@ -10,5 +12,8 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGllmqk;
  * @date 2019-03-12 11:04:15
  */
 public interface ZhtjGllmqkMapper extends BaseMapper<ZhtjGllmqk> {
+// 根据年份、类型查询各地市路面情况
+    List<ZhtjGllmqk> electZhtjGllmqks(String year, String type,String area);
+    Map<String, Object> selectOrdinary(String type, String year, String area);
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGllmqkService.java

@@ -3,7 +3,6 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.system.vo.echarts.BarEchartsVo;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGllmqk;
-
 import java.util.Map;
 
 /**
@@ -14,9 +13,10 @@ import java.util.Map;
  */
 public interface ZhtjGllmqkService extends IService<ZhtjGllmqk> {
     // 获取总体情况柱状图统计信息
-    BarEchartsVo getBarZtData(String type);
+    BarEchartsVo getBarZtData(String type,String year);
     /**
      * 公路覆蓋情況統計
      */
     Map<String,Object> getGlfgqktj();
+    Map<String, Object> getOrdinary(String type, String year, String area);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGllmqkServiceImpl.java

@@ -25,11 +25,11 @@ import java.util.*;
 @AllArgsConstructor
 public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGllmqk> implements ZhtjGllmqkService {
     private  final ZhtjGljsdjqkMapper zhtjGljsdjqkMapper;
-
+    private  final ZhtjGllmqkMapper zhtjGllmqkMapper;
     @Override
-    public BarEchartsVo getBarZtData(String type) {
+    public BarEchartsVo getBarZtData(String type,String year) {
         BarEchartsVo barEchartsVo = new BarEchartsVo();
-         List<ZhtjGllmqk> zhtjGllmqkList =  super.list(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getType ,type));
+         List<ZhtjGllmqk> zhtjGllmqkList =  zhtjGllmqkMapper.electZhtjGllmqks(year,type,null);
          List<String> legends = new ArrayList<>(Arrays.asList("沥青混凝土","水泥混凝土","简易铺装路面","未铺装路面"));
          barEchartsVo.setLegendData(legends);
         List<String> yAxisData  = new ArrayList<>();
@@ -80,7 +80,7 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
     }
 
     @Override
-    public Map<String, Object> getGlfgqktj() {
+    public Map<String,Object>  getGlfgqktj() {
         Map<String,Object> resultMap = new HashMap<>();
         String[] indicator = new String[]{"二级公路","等级公路","沥青公路"};
         /**
@@ -149,4 +149,10 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
         }});
         return resultMap;
     }
+
+    @Override
+    public Map<String, Object> getOrdinary(String type, String year, String area) {
+        Map<String, Object> mapOrdinary =  zhtjGllmqkMapper.selectOrdinary(type,year,area);
+        return mapOrdinary;
+    }
 }

src/main/resources/mapper/zhtj/ZhtjGllmqkMapper.xml

@@ -25,4 +25,32 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="electZhtjGllmqks" resultMap="zhtjGllmqkMap">
+            SELECT * FROM `t_zhtj_gllmqk` where type = #{type}
+             <if test="year==null or year==''">
+                   and year=(
+                   select max(year) maxyear from `t_zhtj_gllmqk`
+                   )
+             </if>
+            <if test="year!=null and year!=''">
+                  and year=#{year}
+            </if>
+            <if test="area!=null and area!=''">
+                  and area=#{area}
+            </if>
+      </select>
+      <select id="selectOrdinary" resultType="Map">
+            SELECT sum(ypzlm_lqhnt) as ypzlm_lqhnt,sum(ypzlm_snhnt) as ypzlm_snhnt,sum(jypzlm) as jypzlm,sum(wpzlm) as wpzlm FROM `t_zhtj_gllmqk` where type in (${type})
+            <if test="year==null or year==''">
+                  and year=(
+                  select max(year) maxyear from `t_zhtj_gllmqk`
+                  )
+            </if>
+            <if test="year!=null and year!=''">
+                  and year=#{year}
+            </if>
+            <if test="area!=null and area!=''">
+                  and area=#{area}
+            </if>
+      </select>
 </mapper>