Skip to content

A
aroad_aqsc
提交 2c80735e authored 作者: 朱运伟's avatar 朱运伟
浏览文件
操作

综合统计-综合展示，完善按年份查询操作

添加普通国省道查询
上级 47f453e2
显示空白字符变更
内嵌 并排
正在显示 包含 393 行增加 和 118 行删除
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljbxxGltclcController.java
浏览文件 @ 2c80735e
......@@ -91,4 +91,14 @@ public class ZhtjGljbxxGltclcController extends BaseController {
return new R<>(zhtjGljbxxGltclcService.getTclcEchartData(year));
}
/**
* 综合统计-综合展示-行政等级划分
* @param zhtjGljbxxGltclc zhtjGljbxxGltclc
* @return
*/
@GetMapping("/getxzdj")
public R getxzdj(ZhtjGljbxxGltclc zhtjGljbxxGltclc) {
return new R<>(zhtjGljbxxGltclcService.getxzdj(zhtjGljbxxGltclc));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljsdjqkController.java
浏览文件 @ 2c80735e
......@@ -114,4 +114,15 @@ public class ZhtjGljsdjqkController extends BaseController {
public R getQsgljsxz(){
return new R<>(zhtjGljsdjqkService.getQsgljsxz());
}
/***********************************************************/
/**
* 获取全省公路技术等级
*/
@GetMapping("/gljsdj")
public R getJsdj(ZhtjGljsdjqk zhtjGljsdjqk){
return new R<>(zhtjGljsdjqkService.getGljsdj(zhtjGljsdjqk));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGllmqkController.java
浏览文件 @ 2c80735e
......@@ -66,9 +66,9 @@ public class ZhtjGllmqkController extends BaseController {
* 公路覆蓋情況統計
*/
@GetMapping("/glfgqktj")
public R getGlfgqktj(){
System.out.println("pppppppp");
return new R<>(zhtjGllmqkService.getGlfgqktj());
public R getGlfgqktj(ZhtjGllmqk zhtjGllmqk){
return new R<>(zhtjGllmqkService.getGlfgqktj(zhtjGllmqk));
}
/*******************************************************************/
......@@ -77,7 +77,7 @@ public class ZhtjGllmqkController extends BaseController {
* @param zhtjGllmqk
* @return
*/
@GetMapping("/glmcfl")
@GetMapping("/getLmData")
public R getGLmcfl(ZhtjGllmqk zhtjGllmqk) {
if(zhtjGllmqk.getYear() == null || "".equals(zhtjGllmqk.getYear())){
// 获取最新的时间
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkQlqkController.java
浏览文件 @ 2c80735e
......@@ -51,36 +51,16 @@ public class ZhtjGlqsqkQlqkController extends BaseController {
}
/**
* 新增综合统计_公路桥隧情况_桥梁情况
* @param zhtjGlqsqkQlqk 综合统计_公路桥隧情况_桥梁情况
* @return R
*/
@SysLog("新增综合统计_公路桥隧情况_桥梁情况")
@PostMapping
public R save(@RequestBody ZhtjGlqsqkQlqk zhtjGlqsqkQlqk){
return new R<>(zhtjGlqsqkQlqkService.save(zhtjGlqsqkQlqk));
}
/**
* 修改综合统计_公路桥隧情况_桥梁情况
* @param zhtjGlqsqkQlqk 综合统计_公路桥隧情况_桥梁情况
* @return R
* 综合展示-综合统计-桥梁统计
* @param zhtjGlqsqkQlqk
* @return
*/
@SysLog("修改综合统计_公路桥隧情况_桥梁情况")
@PutMapping
public R updateById(@RequestBody ZhtjGlqsqkQlqk zhtjGlqsqkQlqk){
return new R<>(zhtjGlqsqkQlqkService.updateById(zhtjGlqsqkQlqk));
@GetMapping("/getQlqk")
public R getQlqk(ZhtjGlqsqkQlqk zhtjGlqsqkQlqk) {
if(zhtjGlqsqkQlqk.getYear() == null || "".equals(zhtjGlqsqkQlqk.getYear())){
// 获取最新的时间
zhtjGlqsqkQlqk.setYear(zhtjGlqsqkQlqkService.newYear());
}
/**
* 通过id删除综合统计_公路桥隧情况_桥梁情况
* @param id id
* @return R
*/
@SysLog("删除综合统计_公路桥隧情况_桥梁情况")
@DeleteMapping("/{id}")
public R removeById(@PathVariable Integer id){
return new R<>(zhtjGlqsqkQlqkService.removeById(id));
return new R<>(zhtjGlqsqkQlqkService.getQlqk(zhtjGlqsqkQlqk));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkSdqkController.java
浏览文件 @ 2c80735e
......@@ -2,6 +2,7 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGlqsqkSdqkService;
import com.elephant.framework.galaxy.aroad.response.R;
......@@ -50,37 +51,19 @@ public class ZhtjGlqsqkSdqkController extends BaseController {
return new R<>(zhtjGlqsqkSdqkService.getById(id));
}
/**
* 新增综合统计_公路桥隧情况_隧道情况
* @param zhtjGlqsqkSdqk 综合统计_公路桥隧情况_隧道情况
* @return R
*/
@SysLog("新增综合统计_公路桥隧情况_隧道情况")
@PostMapping
public R save(@RequestBody ZhtjGlqsqkSdqk zhtjGlqsqkSdqk){
return new R<>(zhtjGlqsqkSdqkService.save(zhtjGlqsqkSdqk));
}
/**
* 修改综合统计_公路桥隧情况_隧道情况
* @param zhtjGlqsqkSdqk 综合统计_公路桥隧情况_隧道情况
* @return R
*/
@SysLog("修改综合统计_公路桥隧情况_隧道情况")
@PutMapping
public R updateById(@RequestBody ZhtjGlqsqkSdqk zhtjGlqsqkSdqk){
return new R<>(zhtjGlqsqkSdqkService.updateById(zhtjGlqsqkSdqk));
}
/**
* 通过id删除综合统计_公路桥隧情况_隧道情况
* @param id id
* @return R
* 综合展示-综合统计-隧道统计
* @param zhtjGlqsqkSdqk
* @return
*/
@SysLog("删除综合统计_公路桥隧情况_隧道情况")
@DeleteMapping("/{id}")
public R removeById(@PathVariable Integer id){
return new R<>(zhtjGlqsqkSdqkService.removeById(id));
@GetMapping("/getSdqk")
public R getSdqk(ZhtjGlqsqkSdqk zhtjGlqsqkSdqk) {
if(zhtjGlqsqkSdqk.getYear() == null || "".equals(zhtjGlqsqkSdqk.getYear())){
// 获取最新的时间
zhtjGlqsqkSdqk.setYear(zhtjGlqsqkSdqkService.newYear());
}
return new R<>(zhtjGlqsqkSdqkService.getSdqk(zhtjGlqsqkSdqk));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjZhzsLnsjController.java
浏览文件 @ 2c80735e
......@@ -55,37 +55,16 @@ public class ZhtjZhzsLnsjController extends BaseController {
return new R<>(zhtjZhzsLnsjService.getById(id));
}
/**
* 新增历年数据
* @param zhtjZhzsLnsj 历年数据
* @return R
*/
@SysLog("新增历年数据")
@PostMapping
public R save(@RequestBody ZhtjZhzsLnsj zhtjZhzsLnsj){
return new R<>(zhtjZhzsLnsjService.save(zhtjZhzsLnsj));
}
/**
* 修改历年数据
* @param zhtjZhzsLnsj 历年数据
* @return R
*/
@SysLog("修改历年数据")
@PutMapping
public R updateById(@RequestBody ZhtjZhzsLnsj zhtjZhzsLnsj){
return new R<>(zhtjZhzsLnsjService.updateById(zhtjZhzsLnsj));
}
/**
* 通过id删除历年数据
* @param id id
* @return R
* 查询全省和普通国省道历年数据
* @param zhtjZhzsLnsj 历年数据
* @return
*/
@SysLog("删除历年数据")
@DeleteMapping("/{id}")
public R removeById(@PathVariable Integer id){
return new R<>(zhtjZhzsLnsjService.removeById(id));
@GetMapping("/lnsj")
public R getLnsj(ZhtjZhzsLnsj zhtjZhzsLnsj) {
return new R<>(zhtjZhzsLnsjService.selectLnsj(zhtjZhzsLnsj));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkQlqk.java
浏览文件 @ 2c80735e
......@@ -73,6 +73,34 @@ private static final long serialVersionUID = 1L;
* 小桥（单位：座）
*/
private Integer xqSl;
/**
* 立交桥（单位：米）
*/
private Double ljqCd;
/**
* 立交桥（单位：座）
*/
private Integer ljqSl;
/**
* 危桥（单位：米）
*/
private Double wqCd;
/**
* 危桥（单位：座）
*/
private Integer wqSl;
/**
* 限制交通（单位：米）
*/
private Double xzjtCd;
/**
* 限制交通（单位：座）
*/
private Integer xzjtSl;
/**
* 排序
*/
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkSdqk.java
浏览文件 @ 2c80735e
......@@ -73,6 +73,24 @@ private static final long serialVersionUID = 1L;
* 短隧道数量（单位：座）
*/
private Integer dsdSl;
/**
* 限制交通（单位：米）
*/
private Double xzjtCd;
/**
* 限制交通（单位：座）
*/
private Integer xzjtSl;
/**
* 四五类隧道（单位：米）
*/
private Double swlCd;
/**
* 四五类隧道（单位：座）
*/
private Integer swlSl;
/**
* 排序
*/
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjZhzsZtqk.java
浏览文件 @ 2c80735e
......@@ -29,6 +29,10 @@ private static final long serialVersionUID = 1L;
* 年份
*/
private String year;
/**
* type
*/
private String type;
/**
* 标题
*/
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljbxxGltclcMapper.java
浏览文件 @ 2c80735e
......@@ -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.ZhtjGljbxxGltclc;
import org.apache.ibatis.annotations.Param;
/**
*  公路通车里程表
......@@ -11,4 +12,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljbxxGltclc;
*/
public interface ZhtjGljbxxGltclcMapper extends BaseMapper<ZhtjGljbxxGltclc> {
ZhtjGljbxxGltclc selectOneForPtgsd(@Param("lm") ZhtjGljbxxGltclc tclc);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java
浏览文件 @ 2c80735e
......@@ -18,8 +18,15 @@ import java.util.Map;
*/
public interface ZhtjGljsdjqkMapper extends BaseMapper<ZhtjGljsdjqk> {
//查詢普通公路覆蓋情況
List<ZhtjGljsdjqk> selectZhtjGljsdjqk(String area,String type);
List<ZhtjGljsdjqk> selectZhtjGljsdjqk(String area,String type,String year);
// 查询最新年份
String newYear(@Param("type")String type);
List<ZhyhZhzsKeyValue> getZhyhZhzsGlOne(@Param("year") String year);
/**
* 综合统计-综合展示-公路技术等级-普通国省道
* @param zhtjGljsdjqk
* @return
*/
ZhtjGljsdjqk selectJsdjForPtgsd(@Param("lm") ZhtjGljsdjqk zhtjGljsdjqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGllmqkMapper.java
浏览文件 @ 2c80735e
......@@ -25,5 +25,5 @@ public interface ZhtjGllmqkMapper extends BaseMapper<ZhtjGllmqk> {
* @param zhtjGllmqk
* @return
*/
ZhtjGllmqk selectLmqkForPtgsd(ZhtjGllmqk zhtjGllmqk);
ZhtjGllmqk selectLmqkForPtgsd(@Param("lm")ZhtjGllmqk zhtjGllmqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkQlqkMapper.java
浏览文件 @ 2c80735e
......@@ -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.ZhtjGlqsqkQlqk;
import org.apache.ibatis.annotations.Param;
/**
* 综合统计_公路桥隧情况_桥梁情况
......@@ -12,4 +13,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
public interface ZhtjGlqsqkQlqkMapper extends BaseMapper<ZhtjGlqsqkQlqk> {
// 查询最新的年份
String newYear();
ZhtjGlqsqkQlqk selectOneForPtgsd(@Param("ql") ZhtjGlqsqkQlqk zhtjGlqsqkQlqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkSdqkMapper.java
浏览文件 @ 2c80735e
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.ZhtjGlqsqkQlqk;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
import org.apache.ibatis.annotations.Param;
/**
* 综合统计_公路桥隧情况_隧道情况
......@@ -12,4 +14,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
public interface ZhtjGlqsqkSdqkMapper extends BaseMapper<ZhtjGlqsqkSdqk> {
// 查询最新年份
String newYear();
ZhtjGlqsqkSdqk selectOneForPtgsd(@Param("sd") ZhtjGlqsqkSdqk zhtjGlqsqksdqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjZhzsLnsjMapper.java
浏览文件 @ 2c80735e
......@@ -14,4 +14,11 @@ import java.util.List;
*/
public interface ZhtjZhzsLnsjMapper extends BaseMapper<ZhtjZhzsLnsj> {
List<ZhtjZhzsLnsj> getListByYear(@Param("year") String year);
/**
* 查询普通国省道历年数据
* @param zhtjZhzsLnsj
* @return
*/
List<ZhtjZhzsLnsj> selectListForPtgsd(@Param("lm") ZhtjZhzsLnsj zhtjZhzsLnsj);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljbxxGltclcService.java
浏览文件 @ 2c80735e
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljbxxGltclc;
import com.elephant.framework.galaxy.aroad.module.system.vo.echarts.BarEchartsVo;
import java.util.Map;
/**
*  公路通车里程表
*
......@@ -19,4 +21,11 @@ public interface ZhtjGljbxxGltclcService extends IService<ZhtjGljbxxGltclc> {
*/
BarEchartsVo getTclcEchartData(String year);
/**
* 综合统计-综合展示-行政等级划分
* @param tclc
* @return
*/
Map<String,Object> getxzdj(ZhtjGljbxxGltclc tclc);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljsdjqkService.java
浏览文件 @ 2c80735e
......@@ -40,4 +40,11 @@ public interface ZhtjGljsdjqkService extends IService<ZhtjGljsdjqk> {
* @return
*/
ZhyhZhzsGlData getZhyhZhzsGlData(String year);
/**********************************************************/
/**
*
* @param zhtjGljsdjqk
* @return
*/
Map<String,Object> getGljsdj(ZhtjGljsdjqk zhtjGljsdjqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGllmqkService.java
浏览文件 @ 2c80735e
......@@ -17,7 +17,7 @@ public interface ZhtjGllmqkService extends IService<ZhtjGllmqk> {
/**
* 公路覆蓋情況統計
*/
Map<String,Object> getGlfgqktj();
Map<String,Object> getGlfgqktj(ZhtjGllmqk zhtjGllmqk);
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
浏览文件 @ 2c80735e
......@@ -3,6 +3,8 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
import java.util.Map;
/**
* 综合统计_公路桥隧情况_桥梁情况
*
......@@ -11,4 +13,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
*/
public interface ZhtjGlqsqkQlqkService extends IService<ZhtjGlqsqkQlqk> {
String newYear();
Map<String,ZhtjGlqsqkQlqk> getQlqk(ZhtjGlqsqkQlqk zhtjGlqsqkQlqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkSdqkService.java
浏览文件 @ 2c80735e
......@@ -11,4 +11,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
*/
public interface ZhtjGlqsqkSdqkService extends IService<ZhtjGlqsqkSdqk> {
String newYear();
Object getSdqk(ZhtjGlqsqkSdqk zhtjGlqsqkSdqk);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjZhzsLnsjService.java
浏览文件 @ 2c80735e
......@@ -2,9 +2,9 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
import java.util.Map;
/**
* 历年数据
......@@ -14,4 +14,6 @@ import java.util.List;
*/
public interface ZhtjZhzsLnsjService extends IService<ZhtjZhzsLnsj> {
public List<ZhtjZhzsLnsj> getListByYear(String year);
Map<String, List<ZhtjZhzsLnsj>> selectLnsj(ZhtjZhzsLnsj zhtjZhzsLnsj);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljbxxGltclcServiceImpl.java
浏览文件 @ 2c80735e
......@@ -11,9 +11,7 @@ import com.elephant.framework.galaxy.aroad.module.system.vo.echarts.BarSeriesVo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.*;
/**
*  公路通车里程表
......@@ -85,4 +83,15 @@ public class ZhtjGljbxxGltclcServiceImpl extends ServiceImpl<ZhtjGljbxxGltclcMap
return echartsVo;
}
@Override
public Map<String, Object> getxzdj(ZhtjGljbxxGltclc tclc) {
ZhtjGljbxxGltclc qs = baseMapper.selectOne(Wrappers.query(tclc));
ZhtjGljbxxGltclc ptgsd = zhtjGljbxxGltclcMapper.selectOneForPtgsd(tclc);
Map<String ,Object> map = new HashMap<>();
map.put("qs",qs);
map.put("ptgsd",ptgsd);
return map;
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java
浏览文件 @ 2c80735e
......@@ -30,6 +30,33 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
private final ZhtjGljsdjqkMapper zgtjgljsdjqkMapper;
/**
* 综合统计-综合展示公路技术等级划分
* @param zhtjGljsdjqk
* @return
*/
@Override
public Map<String,Object> getGljsdj(ZhtjGljsdjqk zhtjGljsdjqk) {
ZhtjGljsdjqk qs = baseMapper.selectOne(Wrappers.query(zhtjGljsdjqk));
ZhtjGljsdjqk ptgsd = zgtjgljsdjqkMapper.selectJsdjForPtgsd(zhtjGljsdjqk);
Map<String,Object> map = new HashMap<>();
map.put("qs",qs);
map.put("ptgsd",ptgsd);
return map;
}
/**
* 根据年份查询公路等级总体情况柱状图数据
*
......@@ -161,6 +188,8 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
return zhyhZhzsGlData;
}
public List<ZhyhZhzsKeyValue> getZhyhZhzsGlOne(String year) {
return zgtjgljsdjqkMapper.getZhyhZhzsGlOne(year);
}
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGllmqkServiceImpl.java
浏览文件 @ 2c80735e
......@@ -80,33 +80,49 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
}
@Override
public Map<String,Object> getGlfgqktj() {
public Map<String,Object> getGlfgqktj(ZhtjGllmqk zhtjGllmqk) {
Map<String,Object> resultMap = new HashMap<>();
String[] indicator = new String[]{"二级公路","等级公路","沥青公路"};
/**
* 查詢普通公路覆蓋情況
* 普通公路不计算高速
*/
ZhtjGllmqk ptglZhtjGllmqk = super.getOne(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getArea,"合计").eq(ZhtjGllmqk::getType,"总计"));
ZhtjGljsdjqk zhtjGljsdjqk = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'总计'").get(0);
ZhtjGllmqk ptglZhtjGllmqk = super.getOne(Wrappers.<ZhtjGllmqk>query(zhtjGllmqk).lambda().eq(ZhtjGllmqk::getArea,"合计").eq(ZhtjGllmqk::getType,"总计"));
List<ZhtjGljsdjqk> zhtjGljsdjqk = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'总计'",zhtjGllmqk.getYear());
if(ptglZhtjGllmqk!=null &&zhtjGljsdjqk!=null){
resultMap.put("ptgl",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(zhtjGljsdjqk.getSecondRoad());
add(zhtjGljsdjqk.getTotal()-zhtjGljsdjqk.getHighRoad());
add(zhtjGljsdjqk.get(0).getSecondRoad());
add(zhtjGljsdjqk.get(0).getTotal()-zhtjGljsdjqk.get(0).getHighRoad());
add(ptglZhtjGllmqk.getYpzlmLqhnt());
}});
put("indicator",indicator);
}});
}else{
resultMap.put("ptgl",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(0);
add(0);
add(0);
}});
put("indicator",indicator);
}});
}
/**
* 查询国省道公路覆盖情况
* 国省道包含高速公路
*/
ZhtjGllmqk gsdZhtjGllmqk = super.getOne(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getArea,"合计").eq(ZhtjGllmqk::getType,"国省道合计"));
ZhtjGljsdjqk gsdGljsdjqk = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'国省道合计'").get(0);
ZhtjGllmqk gsdZhtjGllmqk = super.getOne(Wrappers.<ZhtjGllmqk>query(zhtjGllmqk).lambda().eq(ZhtjGllmqk::getArea,"合计").eq(ZhtjGllmqk::getType,"国省道合计"));
List<ZhtjGljsdjqk> gsdGljsdjqk = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'国省道合计'",zhtjGllmqk.getYear());
if (gsdZhtjGllmqk!=null &&gsdGljsdjqk!=null){
resultMap.put("gsd",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(gsdGljsdjqk.getSecondRoad());
add(gsdGljsdjqk.getTotal()+gsdGljsdjqk.getHighRoad());
add(gsdGljsdjqk.get(0).getSecondRoad());
add(gsdGljsdjqk.get(0).getTotal()+gsdGljsdjqk.get(0).getHighRoad());
add(gsdZhtjGllmqk.getYpzlmLqhnt());
}});
put("indicator",indicator);
......@@ -117,20 +133,42 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
*/
resultMap.put("ptgsd",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(gsdGljsdjqk.getSecondRoad());
add(gsdGljsdjqk.getTotal());
add(gsdGljsdjqk.get(0).getSecondRoad());
add(gsdGljsdjqk.get(0).getTotal());
add(gsdZhtjGllmqk.getYpzlmLqhnt());
}});
put("indicator",indicator);
}});
}else {
resultMap.put("gsd",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(0);
add(0);
add(0);
}});
put("indicator",indicator);
}});
resultMap.put("ptgsd",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(0);
add(0);
add(0);
}});
put("indicator",indicator);
}});
}
/**
* 查询农村公路覆盖情况
*/
List<ZhtjGllmqk> ncglZhtjGllmqks = super.list(Wrappers.<ZhtjGllmqk>query().lambda().eq(ZhtjGllmqk::getArea,"合计").in(ZhtjGllmqk::getType,"县道","乡道","专用公路","村道"));
List<ZhtjGljsdjqk> ncglGljsdjqks = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'县道','乡道','专用公路','村道'");
List<ZhtjGllmqk> ncglZhtjGllmqks = super.list(Wrappers.<ZhtjGllmqk>query(zhtjGllmqk).lambda().eq(ZhtjGllmqk::getArea,"合计").in(ZhtjGllmqk::getType,"县道","乡道","专用公路","村道"));
List<ZhtjGljsdjqk> ncglGljsdjqks = zhtjGljsdjqkMapper.selectZhtjGljsdjqk("合计","'县道','乡道','专用公路','村道'",zhtjGllmqk.getYear());
if (ncglZhtjGllmqks !=null &&ncglGljsdjqks!=null){
Double secondRoad = 0.0,total=0.0,ypzlmLqhnt=0.0;
for(ZhtjGllmqk zhtjGllmqk : ncglZhtjGllmqks){
ypzlmLqhnt+=zhtjGllmqk.getYpzlmLqhnt();
for(ZhtjGllmqk lmqk : ncglZhtjGllmqks){
ypzlmLqhnt+=lmqk.getYpzlmLqhnt();
}
for(ZhtjGljsdjqk zhtjGljsdjqk1 : ncglGljsdjqks){
secondRoad+=zhtjGljsdjqk1.getSecondRoad();
......@@ -147,6 +185,18 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
}});
put("indicator",indicator);
}});
}else{
resultMap.put("ncgl",new HashMap<String,Object>(){{
put("serieData",new ArrayList<Object>(){{
add(0);
add(0);
add(0);
}});
put("indicator",indicator);
}});
}
return resultMap;
}
......@@ -169,7 +219,7 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
Map<String, Object> map = new HashMap<>();
map.put("qs",qs_tj);
map.put("ptgsd",qs_tj);
map.put("ptgsd",pggsd_tj);
return map;
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkQlqkServiceImpl.java
浏览文件 @ 2c80735e
package com.elephant.framework.galaxy.aroad.module.zhtj.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
......@@ -7,6 +8,9 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGlqsqkQlqkSer
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
/**
* 综合统计_公路桥隧情况_桥梁情况
*
......@@ -21,4 +25,15 @@ public class ZhtjGlqsqkQlqkServiceImpl extends ServiceImpl<ZhtjGlqsqkQlqkMapper,
public String newYear() {
return zhtjGlqsqkQlqkMapper.newYear();
}
@Override
public Map<String, ZhtjGlqsqkQlqk> getQlqk(ZhtjGlqsqkQlqk zhtjGlqsqkQlqk) {
ZhtjGlqsqkQlqk qs = baseMapper.selectOne(Wrappers.query(zhtjGlqsqkQlqk));
ZhtjGlqsqkQlqk ptgsd = zhtjGlqsqkQlqkMapper.selectOneForPtgsd(zhtjGlqsqkQlqk);
Map<String,ZhtjGlqsqkQlqk> map = new HashMap<>();
map.put("qs",qs);
map.put("ptgsd",ptgsd);
return map;
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkSdqkServiceImpl.java
浏览文件 @ 2c80735e
package com.elephant.framework.galaxy.aroad.module.zhtj.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.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;
import java.util.HashMap;
import java.util.Map;
/**
* 综合统计_公路桥隧情况_隧道情况
*
......@@ -21,4 +26,14 @@ public class ZhtjGlqsqkSdqkServiceImpl extends ServiceImpl<ZhtjGlqsqkSdqkMapper,
public String newYear() {
return zhtjGlqsqkSdqkMapper.newYear();
}
@Override
public Object getSdqk(ZhtjGlqsqkSdqk zhtjGlqsqkSdqk) {
ZhtjGlqsqkSdqk qs = baseMapper.selectOne(Wrappers.query(zhtjGlqsqkSdqk));
ZhtjGlqsqkSdqk ptgsd = zhtjGlqsqkSdqkMapper.selectOneForPtgsd(zhtjGlqsqkSdqk);
Map<String,ZhtjGlqsqkSdqk> map = new HashMap<>();
map.put("qs",qs);
map.put("ptgsd",ptgsd);
return map;
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjZhzsLnsjServiceImpl.java
浏览文件 @ 2c80735e
package com.elephant.framework.galaxy.aroad.module.zhtj.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj;
import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjZhzsLnsjMapper;
......@@ -8,7 +8,9 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjZhzsLnsjServi
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 历年数据
......@@ -27,4 +29,21 @@ public class ZhtjZhzsLnsjServiceImpl extends ServiceImpl<ZhtjZhzsLnsjMapper, Zht
List<ZhtjZhzsLnsj> aaa = zhtjZhzsLnsjMapper.getListByYear(year);
return aaa;
}
/**
* 获取全省与普通国省道历年数据
* @param zhtjZhzsLnsj
* @return
*/
@Override
public Map<String, List<ZhtjZhzsLnsj>> selectLnsj(ZhtjZhzsLnsj zhtjZhzsLnsj) {
List<ZhtjZhzsLnsj> qs = zhtjZhzsLnsjMapper.getListByYear(zhtjZhzsLnsj.getYear());
List<ZhtjZhzsLnsj> ptgsd = zhtjZhzsLnsjMapper.selectListForPtgsd(zhtjZhzsLnsj);
Map<String,List<ZhtjZhzsLnsj>> map = new HashMap<>();
map.put("qs",qs);
map.put("ptgsd",ptgsd);
return map;
}
}
src/main/resources/mapper/zhtj/ZhtjGljbxxGltclcMapper.xml
浏览文件 @ 2c80735e
......@@ -24,4 +24,16 @@
<result property="delFlag" column="del_flag"/>
<result property="remarks" column="remarks"/>
</resultMap>
<select id="selectOneForPtgsd" resultMap="zhtjGljbxxGltclcMap">
SELECT * FROM t_zhtj_gljbxx_gltclc_ptgsd
<where>
<if test="lm.year!=null and lm.year!=''">
and year=#{lm.year}
</if>
<if test="lm.area!=null and lm.area!=''">
and area=#{lm.area}
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml
浏览文件 @ 2c80735e
......@@ -31,9 +31,7 @@
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 = (
<include refid="maxYear"/>
)
SELECT * FROM `t_zhtj_gljsdjqk` as tsd where area=#{area} and type in (${type}) and year=#{year}
</select>
<select id="newYear" resultType="string">
......@@ -49,4 +47,20 @@
area='合计' and year=#{year} and (type="国道" or type="省道")
</where>
</select>
<select id="selectJsdjForPtgsd" resultMap="zhtjGljsdjqkMap">
SELECT * FROM t_zhtj_gljsdjqk_ptgsd
<where>
<if test="lm.year!=null and lm.year!=''">
and year=#{lm.year}
</if>
<if test="lm.area!=null and lm.area!=''">
and area=#{lm.area}
</if>
<if test="lm.type!=null and lm.type!=''">
and type=#{lm.type}
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/zhtj/ZhtjGllmqkMapper.xml
浏览文件 @ 2c80735e
......@@ -43,7 +43,8 @@
</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})
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=(
<include refid="maxYear"/>
......@@ -67,8 +68,14 @@
<select id="selectLmqkForPtgsd" resultMap="zhtjGllmqkMap">
SELECT * FROM t_zhtj_gllmqk_ptgsd
<where>
<if test="year!=null and year!=''">
and year=#{year}
<if test="lm.year!=null and lm.year!=''">
and year=#{lm.year}
</if>
<if test="lm.area!=null and lm.area!=''">
and area=#{lm.area}
</if>
<if test="lm.type!=null and lm.type!=''">
and type=#{lm.type}
</if>
</where>
</select>
......
src/main/resources/mapper/zhtj/ZhtjGlqsqkQlqkMapper.xml
浏览文件 @ 2c80735e
......@@ -18,6 +18,12 @@
<result property="zqSl" column="zq_sl"/>
<result property="xqCd" column="xq_cd"/>
<result property="xqSl" column="xq_sl"/>
<result property="ljqCd" column="ljq_cd"/>
<result property="ljqSl" column="ljq_sl"/>
<result property="wqCd" column="wq_cd"/>
<result property="wqSl" column="wq_sl"/>
<result property="xzjtCd" column="xzjt_sl"/>
<result property="xzjtSl" column="xzjt_sl"/>
<result property="sort" column="sort"/>
<result property="creator" column="creator"/>
<result property="createTime" column="create_time"/>
......@@ -29,5 +35,18 @@
</resultMap>
<select id="newYear" resultType="string">
select max(year) from t_zhtj_glqsqk_qlqk
</select>
<select id="selectOneForPtgsd" resultType="com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk">
select * from t_zhtj_glqsqk_qlqk_ptgsd
<where>
<if test="ql.year !=null and ql.year!=''">
year =#{ql.year}
</if>
<if test="ql.area !=null and ql.area!=''">
and area =#{ql.area}
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/zhtj/ZhtjGlqsqkSdqkMapper.xml
浏览文件 @ 2c80735e
......@@ -18,6 +18,10 @@
<result property="zsdSl" column="zsd_sl"/>
<result property="dsdCd" column="dsd_cd"/>
<result property="dsdSl" column="dsd_sl"/>
<result property="xzjtCd" column="xzjt_cd"/>
<result property="xzjtSl" column="xzjt_sl"/>
<result property="swlCd" column="swl_cd"/>
<result property="swlSl" column="swl_sl"/>
<result property="sort" column="sort"/>
<result property="creator" column="creator"/>
<result property="createTime" column="create_time"/>
......@@ -29,5 +33,18 @@
</resultMap>
<select id="newYear" resultType="string">
select max(year) from t_zhtj_glqsqk_sdqk
</select>
<select id="selectOneForPtgsd" resultType="com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk">
select * from t_zhtj_glqsqk_sdqk_ptgsd
<where>
<if test="sd.year !=null and sd.year!=''">
year =#{sd.year}
</if>
<if test="sd.area !=null and sd.area!=''">
and area =#{sd.area}
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/zhtj/ZhtjZhzsLnsjMapper.xml
浏览文件 @ 2c80735e
......@@ -31,5 +31,13 @@
</if>
</where>
</select>
<select id="selectListForPtgsd" resultMap="zhtjZhzsLnsjMap">
select * from t_zhtj_zhzs_lnsj_ptgsd
<where>
<if test="lm.year != null and lm.year != ''">
year >= #{lm.year}
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/ZhtjZhzsZtqkMapper.xml → src/main/resources/mapper/zhtj/ZhtjZhzsZtqkMapper.xml
浏览文件 @ 2c80735e
......@@ -7,6 +7,7 @@
<resultMap id="zhtjZhzsZtqkMap" type="com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsZtqk">
<id property="id" column="id"/>
<result property="year" column="year"/>
<result property="type" column="type"/>
<result property="title" column="title"/>
<result property="content" column="content"/>
<result property="other" column="other"/>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论