路网指数

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/SaveAttendanceDto.java

@@ -25,7 +25,7 @@ public class SaveAttendanceDto<T> implements Serializable {
 
     private int shiftId;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date time;
 
     private int unitId;

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcPtgsdLwzsController.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcPtgsdLwzs;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcPtgsdLwzsService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 普通国道路线平均行程车速
+ *
+ * @author zyw
+ * @date 2019-05-06 14:29:11
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjc/lwzs")
+public class ZhjcPtgsdLwzsController extends BaseController  {
+
+  private final ZhjcPtgsdLwzsService zhjcPtgsdLwzsService;
+
+  /**
+   * 查询路网指数数据
+   * @param page
+   * @param lwjcPtgdlxpjxscs
+   * @return
+   */
+  @GetMapping("/list")
+  public R getLwzsList(Page page, ZhjcPtgsdLwzs lwjcPtgdlxpjxscs) {
+
+
+
+    return  new R<>(zhjcPtgsdLwzsService.selectLwzs(lwjcPtgdlxpjxscs));
+  }
+
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcPtgsdLwzs.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 普通国道路线平均行程车速
+ *
+ * @author zyw
+ * @date 2019-05-06 14:29:11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZhjcPtgsdLwzs extends Model<ZhjcPtgsdLwzs> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  private Integer id;
+  /**
+   * 路线编号
+   */
+  private String lxbh;
+  /**
+   * 路线名称
+   */
+  private String lxmc;
+  /**
+   * 观测里程 (公里）
+   */
+  private Double gcsl;
+  /**
+   * 平均行驶速度 (公里/小时)
+   */
+  private Double pjss;
+  /**
+   * 年
+   */
+  private Integer year;
+
+  /**
+   * 拥挤度
+   */
+  private Double yjd;
+  /**
+   * 适应交通量
+   */
+  private Integer syjtl;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcPtgsdLwzsMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcPtgsdLwzs;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 普通国道路线平均行程车速
+ *
+ * @author zyw
+ * @date 2019-05-06 14:29:11
+ */
+public interface ZhjcPtgsdLwzsMapper extends BaseMapper<ZhjcPtgsdLwzs> {
+    /**
+     * 国道路网指数
+     * @param year
+     * @return
+     */
+    List<ZhjcPtgsdLwzs> selectGdlwzs(@Param("year") Integer year);
+
+
+    /**
+     * 省道路网指数
+     * @param year
+     * @return
+     */
+    List<ZhjcPtgsdLwzs> selectSdlwzs(@Param("year") Integer year);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcPtgsdLwzsService.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcPtgsdLwzs;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 普通国道路线平均行程车速
+ *
+ * @author zyw
+ * @date 2019-05-06 14:29:11
+ */
+public interface ZhjcPtgsdLwzsService extends IService<ZhjcPtgsdLwzs> {
+
+    Map<String, List<ZhjcPtgsdLwzs>> selectLwzs(ZhjcPtgsdLwzs lwjcPtgdlxpjxscs);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcPtgsdLwzsServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcPtgsdLwzs;
+import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcPtgsdLwzsMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcPtgsdLwzsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 普通国道路线平均行程车速
+ *
+ * @author zyw
+ * @date 2019-05-06 14:29:11
+ */
+@Service
+@AllArgsConstructor
+public class ZhjcPtgsdLwzsServiceImpl extends ServiceImpl<ZhjcPtgsdLwzsMapper, com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcPtgsdLwzs> implements ZhjcPtgsdLwzsService {
+
+    private final  ZhjcPtgsdLwzsMapper zhjcPtgsdLwzsMapper;
+
+    @Override
+    public Map<String, List<ZhjcPtgsdLwzs>> selectLwzs(ZhjcPtgsdLwzs lwzs) {
+
+        Map<String,List<ZhjcPtgsdLwzs>> map = new HashMap<>();
+
+        List<ZhjcPtgsdLwzs> GdList = zhjcPtgsdLwzsMapper.selectGdlwzs(lwzs.getYear());
+        List<ZhjcPtgsdLwzs> SdList = zhjcPtgsdLwzsMapper.selectSdlwzs(lwzs.getYear());
+        List<ZhjcPtgsdLwzs> GSdList = new ArrayList<>();
+        GSdList.addAll(GdList);
+        GSdList.addAll(SdList);
+
+        // 定义一个比较器，用于排序
+        Comparator<ZhjcPtgsdLwzs> comparator = Comparator.comparingDouble(ZhjcPtgsdLwzs::getYjd);
+
+        GSdList.sort(comparator.reversed());
+        map.put("gdList",GdList);
+        map.put("sdList",SdList);
+        map.put("gsdList",GSdList);
+
+
+        return map;
+    }
+}

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

@@ -62,38 +62,6 @@ public class ZhtjGllmqkController extends BaseController  {
     return new R<>(zhtjGllmqkService.getById(id));
   }
 
-  /**
-   * 新增综合统计_公路路面情况
-   * @param zhtjGllmqk 综合统计_公路路面情况
-   * @return R
-   */
-  @SysLog("新增综合统计_公路路面情况")
-  @PostMapping
-  public R save(@RequestBody ZhtjGllmqk zhtjGllmqk){
-    return new R<>(zhtjGllmqkService.save(zhtjGllmqk));
-  }
-
-  /**
-   * 修改综合统计_公路路面情况
-   * @param zhtjGllmqk 综合统计_公路路面情况
-   * @return R
-   */
-  @SysLog("修改综合统计_公路路面情况")
-  @PutMapping
-  public R updateById(@RequestBody ZhtjGllmqk zhtjGllmqk){
-    return new R<>(zhtjGllmqkService.updateById(zhtjGllmqk));
-  }
-
-  /**
-   * 通过id删除综合统计_公路路面情况
-   * @param id id
-   * @return R
-   */
-  @SysLog("删除综合统计_公路路面情况")
-  @DeleteMapping("/{id}")
-  public R removeById(@PathVariable Integer id){
-    return new R<>(zhtjGllmqkService.removeById(id));
-  }
   /**
    * 公路覆蓋情況統計
    */
@@ -102,4 +70,19 @@ public class ZhtjGllmqkController extends BaseController  {
     System.out.println("pppppppp");
     return new R<>(zhtjGllmqkService.getGlfgqktj());
   }
+
+  /*******************************************************************/
+  /**
+   * 公路面层分类查询
+   * @param zhtjGllmqk
+   * @return
+   */
+  @GetMapping("/glmcfl")
+  public R getGLmcfl(ZhtjGllmqk zhtjGllmqk) {
+    if(zhtjGllmqk.getYear() == null || "".equals(zhtjGllmqk.getYear())){
+      // 获取最新的时间
+      zhtjGllmqk.setYear(zhtjGllmqkService.newYear(zhtjGllmqk.getType()));
+    }
+    return  new R<>(zhtjGllmqkService.getGlmcfl(zhtjGllmqk));
+  }
 }

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

@@ -19,4 +19,11 @@ public interface ZhtjGllmqkMapper extends BaseMapper<ZhtjGllmqk> {
     Map<String, Object> selectOrdinary(String type, String year, String area);
 // 查询数据最新年份
     String newYear(@Param("type") String type);
+
+    /**
+     *普通国省道路面情况
+     * @param zhtjGllmqk
+     * @return
+     */
+    ZhtjGllmqk selectLmqkForPtgsd(ZhtjGllmqk zhtjGllmqk);
 }

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

@@ -20,4 +20,11 @@ public interface ZhtjGllmqkService extends IService<ZhtjGllmqk> {
     Map<String,Object> getGlfgqktj();
     Map<String, Object> getOrdinary(String type, String year, String area);
     String newYear(String type);
+
+    /**
+     * 公路面层统计(总计、普通国省道)
+     * @param zhtjGllmqk
+     * @return
+     */
+    Map<String,Object> getGlmcfl(ZhtjGllmqk zhtjGllmqk);
 }

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

@@ -160,4 +160,16 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
     public String newYear(String type) {
         return zhtjGllmqkMapper.newYear(type);
     }
+
+    @Override
+    public Map<String, Object> getGlmcfl(ZhtjGllmqk zhtjGllmqk) {
+
+        ZhtjGllmqk  qs_tj = baseMapper.selectOne(Wrappers.query(zhtjGllmqk));
+        ZhtjGllmqk  pggsd_tj = zhtjGllmqkMapper.selectLmqkForPtgsd(zhtjGllmqk);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("qs",qs_tj);
+        map.put("ptgsd",qs_tj);
+        return map;
+    }
 }

src/main/resources/mapper/zhjc/ZhjcPtgsdLwzsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcPtgsdLwzsMapper">
+
+    <resultMap id="ZhjcPtgsdLwzsMap" type="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcPtgsdLwzs">
+
+    </resultMap>
+
+
+    <select id="selectGdlwzs" resultMap="ZhjcPtgsdLwzsMap">
+        SELECT
+        cs.id,
+        cs.luxianbianhao as lxbh,
+        cs.luxianmingcheng as lxmc,
+        cs.pingjunxingshisudu as pjss,
+        cs.guancelicheng as gclc,
+        cs.nian as `year`,
+        jtl.jiaotongyongjidu as yjd,
+        jtl.shiyingjiaotongliang as syjtl
+        FROM
+        t_lwjc_ptgdlxpjxscs cs,
+        t_lwjc_gdlxjtl jtl
+        <where>
+            cs.luxianbianhao = jtl.luxianbianhao
+            AND cs.nian = jtl.nian
+            <if test="year !=null">
+                AND jtl.nian =#{year}
+            </if>
+        </where>
+        order by yjd desc
+    </select>
+
+    <select id="selectSdlwzs" resultMap="ZhjcPtgsdLwzsMap">
+        SELECT
+        cs.id,
+        cs.luxianbianhao as lxbh,
+        cs.luxianmingcheng as lxmc,
+        cs.pingjunxingshisudu as pjss,
+        cs.guancelicheng as gclc,
+        cs.nian as `year`,
+        jtl.jiaotongyongjidu as yjd,
+        jtl.shiyingjiaotongliang as syjtl
+        FROM
+        t_lwjc_ptsdlxpjxscs cs,
+        t_lwjc_sdlxjtl jtl
+        <where>
+            cs.luxianbianhao = jtl.luxianbianhao
+            AND cs.nian = jtl.nian
+            <if test="year !=null">
+                AND jtl.nian =#{year}
+            </if>
+        </where>
+        order by yjd desc
+    </select>
+</mapper>

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

@@ -62,4 +62,14 @@
                 where type=#{type}
             </if>
       </select>
+
+
+    <select id="selectLmqkForPtgsd" resultMap="zhtjGllmqkMap">
+        SELECT * FROM t_zhtj_gllmqk_ptgsd
+       <where>
+        <if test="year!=null and year!=''">
+            and year=#{year}
+        </if>
+       </where>
+    </select>
 </mapper>