Merge remote-tracking branch 'origin/dev' into dev

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

@@ -32,6 +32,10 @@ public class ZhtjGljszkpdController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGljszkpdPage(Page page, ZhtjGljszkpd zhtjGljszkpd) {
+    if(zhtjGljszkpd.getYear() == null || "".equals(zhtjGljszkpd.getYear())){
+      // 获取最新的时间
+      zhtjGljszkpd.setYear(zhtjGljszkpdService.newYear(zhtjGljszkpd.getType()));
+    }
     return  new R<>(zhtjGljszkpdService.page(page,Wrappers.query(zhtjGljszkpd)));
   }
 

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

@@ -33,6 +33,10 @@ public class ZhtjGllmqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGllmqkPage(Page page, ZhtjGllmqk zhtjGllmqk) {
+    if(zhtjGllmqk.getYear() == null || "".equals(zhtjGllmqk.getYear())){
+      // 获取最新的时间
+      zhtjGllmqk.setYear(zhtjGllmqkService.newYear(zhtjGllmqk.getType()));
+    }
     return  new R<>(zhtjGllmqkService.page(page,Wrappers.query(zhtjGllmqk)));
   }
   /**

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

@@ -32,6 +32,10 @@ public class ZhtjGlqsqkQlqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGlqsqkQlqkPage(Page page, ZhtjGlqsqkQlqk zhtjGlqsqkQlqk) {
+    if(zhtjGlqsqkQlqk.getYear() == null || "".equals(zhtjGlqsqkQlqk.getYear())){
+      // 获取最新的时间
+      zhtjGlqsqkQlqk.setYear(zhtjGlqsqkQlqkService.newYear());
+    }
     return  new R<>(zhtjGlqsqkQlqkService.page(page,Wrappers.query(zhtjGlqsqkQlqk)));
   }
 

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

@@ -32,6 +32,10 @@ public class ZhtjGlqsqkSdqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGlqsqkSdqkPage(Page page, ZhtjGlqsqkSdqk zhtjGlqsqkSdqk) {
+    if(zhtjGlqsqkSdqk.getYear() == null || "".equals(zhtjGlqsqkSdqk.getYear())){
+      // 获取最新的时间
+      zhtjGlqsqkSdqk.setYear(zhtjGlqsqkSdqkService.newYear());
+    }
     return  new R<>(zhtjGlqsqkSdqkService.page(page,Wrappers.query(zhtjGlqsqkSdqk)));
   }
 

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

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface ZhtjGljsdjqkMapper extends BaseMapper<ZhtjGljsdjqk> {
    //查詢普通公路覆蓋情況
    List<ZhtjGljsdjqk> selectZhtjGljsdjqk(String area,String type);
+   // 查询最新年份
+   String newYear(@Param("type")String type);
 }

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

@@ -2,6 +2,7 @@ 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.ZhtjGljszkpd;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 综合统计_公路技术状况评定
@@ -10,5 +11,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
  * @date 2019-03-11 17:58:58
  */
 public interface ZhtjGljszkpdMapper extends BaseMapper<ZhtjGljszkpd> {
-
+    String newYear(@Param("type") String type);
 }

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 org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -15,5 +17,6 @@ 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);
-
+// 查询数据最新年份
+    String newYear(@Param("type") String type);
 }

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

@@ -10,5 +10,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
  * @date 2019-03-12 08:57:24
  */
 public interface ZhtjGlqsqkQlqkMapper extends BaseMapper<ZhtjGlqsqkQlqk> {
-
+    // 查询最新的年份
+    String newYear();
 }

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

@@ -10,5 +10,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
  * @date 2019-03-11 20:53:25
  */
 public interface ZhtjGlqsqkSdqkMapper extends BaseMapper<ZhtjGlqsqkSdqk> {
-
+    // 查询最新年份
+    String newYear();
 }

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

@@ -10,5 +10,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
  * @date 2019-03-11 17:58:58
  */
 public interface ZhtjGljszkpdService extends IService<ZhtjGljszkpd> {
-
+    String newYear(String type);
 }

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

@@ -19,4 +19,5 @@ public interface ZhtjGllmqkService extends IService<ZhtjGllmqk> {
      */
     Map<String,Object> getGlfgqktj();
     Map<String, Object> getOrdinary(String type, String year, String area);
+    String newYear(String type);
 }

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

@@ -10,5 +10,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
  * @date 2019-03-12 08:57:24
  */
 public interface ZhtjGlqsqkQlqkService extends IService<ZhtjGlqsqkQlqk> {
-
+    String newYear();
 }

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

@@ -10,5 +10,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
  * @date 2019-03-11 20:53:25
  */
 public interface ZhtjGlqsqkSdqkService extends IService<ZhtjGlqsqkSdqk> {
-
+    String newYear();
 }

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

@@ -100,13 +100,21 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         return ipage;
     }
 
+    /**
+     * 全省公路技术等级划分Echarts、全省公路行政等级划分Echarts
+     * @return
+     */
     @Override
     public Map<String, Object> getQsgljsxz() {
         Map<String,Object> resultMap = new HashMap<>();
+        // 获取省道最新年份
+        String sdnewYear = zgtjgljsdjqkMapper.newYear("'省道'");
         // 获取全省公路技术等级划分
-        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道"));
+        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道").eq(ZhtjGljsdjqk::getYear,sdnewYear));
+        // 获取全省行政等级最新年份
+        String sdxznewYear = zgtjgljsdjqkMapper.newYear("'国道','省道','县道','乡道','村道','专用公路','总计'");
         // 获取全省行政等级划分
-        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计"));
+        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计").eq(ZhtjGljsdjqk::getYear,sdxznewYear));
         // 存储行政等级处理结果
         List<Map<String,Object>> withinList = new ArrayList<>();
         List<Map<String,Object>> abroadData = new ArrayList<>();
@@ -131,6 +139,7 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         resultMap.put("glxzdjhf",new HashMap<String,Object>(){{
             put("withinList",withinList);
             put("abroadData",abroadData);
+            put("glxzdjhfYear",sdxznewYear);
         }});
         return resultMap;
     }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGljszkpdMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGljszkpdService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
  * @date 2019-03-11 17:58:58
  */
 @Service
+@AllArgsConstructor
 public class ZhtjGljszkpdServiceImpl extends ServiceImpl<ZhtjGljszkpdMapper, ZhtjGljszkpd> implements ZhtjGljszkpdService {
-
+    private final ZhtjGljszkpdMapper zhtjGljszkpdMapper;
+    @Override
+    public String newYear(String type) {
+        return zhtjGljszkpdMapper.newYear(type);
+    }
 }

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

@@ -155,4 +155,9 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
         Map<String, Object> mapOrdinary =  zhtjGllmqkMapper.selectOrdinary(type,year,area);
         return mapOrdinary;
     }
+
+    @Override
+    public String newYear(String type) {
+        return zhtjGllmqkMapper.newYear(type);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGlqsqkQlqkMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGlqsqkQlqkService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
  * @date 2019-03-12 08:57:24
  */
 @Service
+@AllArgsConstructor
 public class ZhtjGlqsqkQlqkServiceImpl extends ServiceImpl<ZhtjGlqsqkQlqkMapper, ZhtjGlqsqkQlqk> implements ZhtjGlqsqkQlqkService {
-
+    private final ZhtjGlqsqkQlqkMapper zhtjGlqsqkQlqkMapper;
+    @Override
+    public String newYear() {
+        return zhtjGlqsqkQlqkMapper.newYear();
+    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGlqsqkSdqkMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGlqsqkSdqkService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
  * @date 2019-03-11 20:53:25
  */
 @Service
+@AllArgsConstructor
 public class ZhtjGlqsqkSdqkServiceImpl extends ServiceImpl<ZhtjGlqsqkSdqkMapper, ZhtjGlqsqkSdqk> implements ZhtjGlqsqkSdqkService {
-
+    private final ZhtjGlqsqkSdqkMapper zhtjGlqsqkSdqkMapper;
+    @Override
+    public String newYear() {
+        return zhtjGlqsqkSdqkMapper.newYear();
+    }
 }

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,10 +27,18 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+    <sql id="maxYear">
+        select max(year) maxyear from `t_zhtj_gljsdjqk`
+    </sql>
       <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`
+            <include refid="maxYear"/>
          )
-
       </select>
+    <select id="newYear" resultType="string">
+        <include refid="maxYear"/>
+        <if test="type != null and type != ''">
+            where type in (${type})
+        </if>
+    </select>
 </mapper>

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

@@ -25,4 +25,10 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="newYear" resultType="string">
+            select max(year) from t_zhtj_gljszkpd
+            <if test="type != null and type != ''">
+                  where type = #{type}
+            </if>
+      </select>
 </mapper>

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

@@ -25,13 +25,16 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <sql id="maxYear">
+            select max(year) maxyear from `t_zhtj_gllmqk`
+      </sql>
       <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 or year==''">
+                   and year=(
+                    <include refid="maxYear"/>
+                   )
+             </if>
             <if test="year!=null and year!=''">
                   and year=#{year}
             </if>
@@ -43,7 +46,7 @@
             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`
+                     <include refid="maxYear"/>
                   )
             </if>
             <if test="year!=null and year!=''">
@@ -53,4 +56,10 @@
                   and area=#{area}
             </if>
       </select>
+      <select id="newYear" resultType="string">
+            <include refid="maxYear"/>
+            <if test="type!=null and type!=''">
+                where type=#{type}
+            </if>
+      </select>
 </mapper>

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

@@ -27,4 +27,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="newYear" resultType="string">
+            select max(year) from t_zhtj_glqsqk_qlqk
+      </select>
 </mapper>

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

@@ -27,4 +27,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="newYear" resultType="string">
+            select max(year) from t_zhtj_glqsqk_sdqk
+      </select>
 </mapper>