综合统计-道路技术等级-获取最新年份的数据

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGljsdjqk.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-12 08:37:12
  */
 @Data
-@TableName("T_ZHTJ_GLJSDJQK")
+@TableName("t_zhtj_gljsdjqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGljsdjqk extends Model<ZhtjGljsdjqk> {
 private static final long serialVersionUID = 1L;

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

@@ -16,5 +16,6 @@ import java.util.Map;
  * @date 2019-03-11 17:24:55
  */
 public interface ZhtjGljsdjqkMapper extends BaseMapper<ZhtjGljsdjqk> {
-
+   //查詢普通公路覆蓋情況
+   List<ZhtjGljsdjqk> selectZhtjGljsdjqk(String area,String type);
 }

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

@@ -88,7 +88,7 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
          *     普通公路不计算高速
          */
         ZhtjGllmqk ptglZhtjGllmqk = super.getOne(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getArea,"合计").eq(ZhtjGllmqk::getType,"总计"));
-        ZhtjGljsdjqk zhtjGljsdjqk = zhtjGljsdjqkMapper.selectOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"总计"));
+        ZhtjGljsdjqk zhtjGljsdjqk = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'总计'").get(0);
         resultMap.put("ptgl",new HashMap<String,Object>(){{
             put("serieData",new ArrayList<Object>(){{
                 add(zhtjGljsdjqk.getSecondRoad());
@@ -102,7 +102,7 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
          *   国省道包含高速公路
          */
         ZhtjGllmqk gsdZhtjGllmqk = super.getOne(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getArea,"合计").eq(ZhtjGllmqk::getType,"国省道合计"));
-        ZhtjGljsdjqk gsdGljsdjqk = zhtjGljsdjqkMapper.selectOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"国省道合计"));
+        ZhtjGljsdjqk gsdGljsdjqk = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'国省道合计'").get(0);
         resultMap.put("gsd",new HashMap<String,Object>(){{
             put("serieData",new ArrayList<Object>(){{
                 add(gsdGljsdjqk.getSecondRoad());
@@ -127,7 +127,7 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
          * 查询农村公路覆盖情况
          */
         List<ZhtjGllmqk>  ncglZhtjGllmqks = super.list(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getArea,"合计").in(ZhtjGllmqk::getType,"县道","乡道","专用公路","村道"));
-        List<ZhtjGljsdjqk> ncglGljsdjqks = zhtjGljsdjqkMapper.selectList(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"县道","乡道","专用公路","村道"));
+        List<ZhtjGljsdjqk> ncglGljsdjqks = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'县道','乡道','专用公路','村道'");
         Double secondRoad = 0.0,total=0.0,ypzlmLqhnt=0.0;
         for(ZhtjGllmqk zhtjGllmqk : ncglZhtjGllmqks){
             ypzlmLqhnt+=zhtjGllmqk.getYpzlmLqhnt();

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
-    password: 123456
+    password: root
   cache:
     type: redis
   redis:

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

@@ -27,4 +27,10 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="selectZhtjGljsdjqk" resultMap="zhtjGljsdjqkMap">
+            SELECT * FROM `t_zhtj_gljsdjqk` as tsd where area=#{area} and type in (${type}) and year = (
+          select max(year) maxyear from `t_zhtj_gljsdjqk`
+         )
+
+      </select>
 </mapper>