Skip to content

A
aroad_aqsc
提交 b4a0fae2 authored 作者: Phyday's avatar Phyday
浏览文件
操作

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

上级 7d330f04 7e70a650
隐藏空白字符变更
内嵌 并排
正在显示 包含 127 行增加 和 231 行删除
src/main/java/com/elephant/framework/galaxy/aroad/module/common/getInterfaceData/GetZhjsInterfaceData.java
浏览文件 @ b4a0fae2
......@@ -35,10 +35,13 @@ public class GetZhjsInterfaceData {
private final ZhjsZqzfzsMxService zhjsZqzfzsMxService;
@Scheduled(cron = "59 59 23 ? * *")
//@Scheduled(cron = "0/5 * * * * ?")
// @Scheduled(cron = "0/5 * * * * ?")
public void scheduledSaveEvent() throws Exception{
String token = zhjsGcxmService.getTokenData();
String createDate = getLastTimestamp().toString();
// String createDate = "0";
addGcxmData(getXmData(token,createDate));
addGcHtData(getHtData(token, createDate));
addZqjlzfData(getZqjlzfData(token, createDate));
......@@ -135,6 +138,7 @@ public class GetZhjsInterfaceData {
while (it.hasNext()) {
String key = (String) it.next();
Object object = o1.get(key);
if(key.toLowerCase().indexOf("_")>-1) {
String keyLower = key.toLowerCase();
String startKey = keyLower.substring(0, keyLower.indexOf("_"));
......@@ -145,6 +149,9 @@ public class GetZhjsInterfaceData {
o2.accumulate(key.toLowerCase(), object);
}
}
if(o2.get("xy")!=null && !"".equals(o2.get("xy"))) {
o2.put("xy", "'"+o2.get("xy").toString()+"'");
}
return o2;
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgLzglCxysxkController.java
浏览文件 @ b4a0fae2
......@@ -86,24 +86,25 @@ public class ZhjgLzglCxysxkController extends BaseController {
*/
@GetMapping("/cxysSjfx")
public CxysDataAnalysis selectCxysSjfx(Double startLong, Double endLong,
Double startWidth, Double endWidth,
Double startHeight, Double endHeight,
Double startWeight, Double endWeight,
String startDate, String endDate) {
System.out.println("startLong :"+startLong);
System.out.println("endLong :"+endLong);
System.out.println("startWidth :"+startWidth);
System.out.println("endWidth :"+endWidth);
System.out.println("startHeight :"+startHeight);
System.out.println("endHeight :"+endHeight);
System.out.println("startWeight :"+startWeight);
System.out.println("endWeight :"+endWeight);
System.out.println("startDate :"+startDate);
System.out.println("endDate :"+endDate);
Double startWidth, Double endWidth,
Double startHeight, Double endHeight,
Double startWeight, Double endWeight,
String startDate, String endDate) {
return zhjgLzglCxysxkService.selectCxysSjfx(startLong,endLong,startWidth,endWidth,startHeight,endHeight,startWeight,endWeight,startDate,endDate);
}
/**
* 超限运输数据分析页面统计数据(英文版)
*/
@GetMapping("/cxysSjfx2")
public CxysDataAnalysis selectCxysSjfx2(Double startLong, Double endLong,
Double startWidth, Double endWidth,
Double startHeight, Double endHeight,
Double startWeight, Double endWeight,
String startDate, String endDate) {
return zhjgLzglCxysxkService.selectCxysSjfx2(startLong,endLong,startWidth,endWidth,startHeight,endHeight,startWeight,endWeight,startDate,endDate);
}
/**
* 查询某时间段内数据
* @param startDate
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgLzglCxysxkService.java
浏览文件 @ b4a0fae2
......@@ -61,6 +61,15 @@ public interface ZhjgLzglCxysxkService extends IService<ZhjgLzglCxysxk> {
Double startWeight, Double endWeight,
String startDate, String endDate);
/**
* 超限运输数据分析页面统计数据(英文版)
*/
CxysDataAnalysis selectCxysSjfx2(Double startLong, Double endLong,
Double startWidth, Double endWidth,
Double startHeight, Double endHeight,
Double startWeight, Double endWeight,
String startDate, String endDate);
/**
* 超限运输综合展示页面
* @param startDate
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgLzglCxysxkServiceImpl.java
浏览文件 @ b4a0fae2
......@@ -358,7 +358,97 @@ public class ZhjgLzglCxysxkServiceImpl extends ServiceImpl<ZhjgLzglCxysxkMapper,
}
}
}
return slspData;
}
/**
* 超限运输数据分析页面统计数据(英文版)
* @param startLong
* @param endLong
* @param startWidth
* @param endWidth
* @param startHeight
* @param endHeight
* @param startWeight
* @param endWeight
* @param startDate
* @param endDate
* @return
*/
public CxysDataAnalysis selectCxysSjfx2(Double startLong,Double endLong,
Double startWidth,Double endWidth,
Double startHeight,Double endHeight,
Double startWeight,Double endWeight,
String startDate,String endDate) {
CxysDataAnalysis cxysSjfx = new CxysDataAnalysis();
cxysSjfx.setLongBeyond(selectBeyondLong(startLong,endLong,startDate,endDate));
cxysSjfx.setHeightBeyond(selectBeyondHeight(startHeight,endHeight,startDate,endDate));
cxysSjfx.setWeightBeyond(selectBeyondWeight(startWeight,endWeight,startDate,endDate));
cxysSjfx.setWidthBeyond(selectBeyondWidth(startWidth,endWidth,startDate,endDate));
cxysSjfx.setCxysSizeBeyond(selectSizeBeyond(startDate,endDate));
cxysSjfx.setCxysSsspspTj(dealWithSsspSpData2(startDate,endDate));
return cxysSjfx;
}
/**
* 查询省市受理审批数量(英文版)
* @param startDate
* @param endDate
* @return
*/
public List<Map> dealWithSsspSpData2(String startDate,String endDate) {
List<Map> slspData = new ArrayList<Map>();
String areaNames = "莱芜,菏泽,临沂,{聊城,德州,滨州,日照,威海,泰安,济宁,潍坊,烟台,东营,枣庄,淄博,青岛,济南,省厅公路局,";
for(int i=0; i<areaNames.split(",").length; i++){
String areaName = areaNames.split(",")[i];
Map<String,Object> map = new HashMap<String,Object>();
map.put("city",areaName);
map.put("slsmlj",0);
map.put("spsmlj",0);
slspData.add(map);
}
List<ZhjgLzglCxysxk> zhjgLzglCxysxks = findZhjgLzglCxysxkByDate(startDate,endDate);
for(ZhjgLzglCxysxk zhjgLzglCxysxk : zhjgLzglCxysxks){
if("10".equals(zhjgLzglCxysxk.getDwjb().trim())) {
Integer spsm = Integer.parseInt(slspData.get(17).get("spsmlj").toString());
if (slspData.get(17).containsKey("spsmlj")){
//如果存在，可以直接put新的键值对。新的键值会自动覆盖之前的。
slspData.get(17).put("spsmlj",spsm+1);
}
}
if(zhjgLzglCxysxk.getSldw().trim().indexOf("山东省交通运输厅公路局")!=-1) {
Integer slsm = Integer.parseInt(slspData.get(17).get("slsmlj").toString());
if (slspData.get(17).containsKey("slsmlj")){
//如果存在，可以直接put新的键值对。新的键值会自动覆盖之前的。
slspData.get(17).put("slsmlj",slsm+1);
}
}
for(Map map : slspData) {
String area = map.get("city").toString();
if(zhjgLzglCxysxk.getSldw().trim().indexOf(area)!=-1) {
Integer slsm = Integer.parseInt(map.get("slsmlj").toString());
if (map.containsKey("slsmlj")){
//如果存在，可以直接put新的键值对。新的键值会自动覆盖之前的。
map.put("slsmlj",slsm+1);
}
}
if(!"10".equals(zhjgLzglCxysxk.getDwjb())) {
if(zhjgLzglCxysxk.getSldw().trim().indexOf(area)!=-1) {
Integer spsm = Integer.parseInt(map.get("spsmlj").toString());
if (slspData.get(17).containsKey("spsmlj")){
//如果存在，可以直接put新的键值对。新的键值会自动覆盖之前的。
map.put("spsmlj",spsm+1);
}
}
}
}
}
return slspData;
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/controller/ZhjsHzmxController.java deleted 100644 → 0
浏览文件 @ 7d330f04
package com.elephant.framework.galaxy.aroad.module.zhjs.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.common.annotation.SysLog;
import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsHzmx;
import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsHzmxService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
/**
* 智慧建设_汇总明细
*
* @author wangjian
* @date 2019-05-17 17:50:54
*/
@RestController
@AllArgsConstructor
@RequestMapping("/zhj/shzmx")
public class ZhjsHzmxController extends BaseController {
private final ZhjsHzmxService zhjsHzmxService;
/**
* 分页查询
* @param page 分页对象
* @param zhjsHzmx 智慧建设_汇总明细
* @return
*/
@GetMapping("/page")
public R getZhjsHzmxPage(Page page, ZhjsHzmx zhjsHzmx) {
return new R<>(zhjsHzmxService.page(page,Wrappers.query(zhjsHzmx)));
}
/**
* 通过id查询智慧建设_汇总明细
* @param id id
* @return R
*/
@GetMapping("/{id}")
public R getById(@PathVariable("id") String id){
return new R<>(zhjsHzmxService.getById(id));
}
/**
* 新增智慧建设_汇总明细
* @param zhjsHzmx 智慧建设_汇总明细
* @return R
*/
@SysLog("新增智慧建设_汇总明细")
@PostMapping
public R save(@RequestBody ZhjsHzmx zhjsHzmx){
return new R<>(zhjsHzmxService.save(zhjsHzmx));
}
/**
* 修改智慧建设_汇总明细
* @param zhjsHzmx 智慧建设_汇总明细
* @return R
*/
@SysLog("修改智慧建设_汇总明细")
@PutMapping
public R updateById(@RequestBody ZhjsHzmx zhjsHzmx){
return new R<>(zhjsHzmxService.updateById(zhjsHzmx));
}
/**
* 通过id删除智慧建设_汇总明细
* @param id id
* @return R
*/
@SysLog("删除智慧建设_汇总明细")
@DeleteMapping("/{id}")
public R removeById(@PathVariable String id){
return new R<>(zhjsHzmxService.removeById(id));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/entity/ZhjsHzmx.java deleted 100644 → 0
浏览文件 @ 7d330f04
package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
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;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 智慧建设_汇总明细
*
* @author wangjian
* @date 2019-05-17 17:50:54
*/
@Data
@TableName("t_zhjs_hzmx")
@EqualsAndHashCode(callSuper = true)
public class ZhjsHzmx extends Model<ZhjsHzmx> {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId
private String id;
/**
* 项目名称
*/
private String proName;
/**
* 建设年限
*/
private String life;
/**
* 所属期次
*/
private String reportperiodName;
/**
* 项目id
*/
private String proId;
/**
* 项目编码
*/
private String proCode;
/**
* 建设性质
*/
private Integer property;
/**
* 申报日期
*/
private Long reportDate;
/**
* 年
*/
private Integer year;
/**
* 计划建设规模及标准
*/
private String planandscst;
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/entity/ZhjsXmqk.java
浏览文件 @ b4a0fae2
......@@ -31,12 +31,12 @@ public class ZhjsXmqk {
/**
* 计划开工日期
*/
private LocalDateTime planstartdate;
private Long planstartdate;
/**
* 计划完工日期
*/
private LocalDateTime planenddate;
private Long planenddate;
/**
* 项目介绍
......
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/mapper/ZhjsHzmxMapper.java deleted 100644 → 0
浏览文件 @ 7d330f04
package com.elephant.framework.galaxy.aroad.module.zhjs.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsHzmx;
/**
* 智慧建设_汇总明细
*
* @author wangjian
* @date 2019-05-17 17:50:54
*/
public interface ZhjsHzmxMapper extends BaseMapper<ZhjsHzmx> {
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/ZhjsHzmxService.java deleted 100644 → 0
浏览文件 @ 7d330f04
package com.elephant.framework.galaxy.aroad.module.zhjs.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsHzmx;
/**
* 智慧建设_汇总明细
*
* @author wangjian
* @date 2019-05-17 17:50:54
*/
public interface ZhjsHzmxService extends IService<ZhjsHzmx> {
}
src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/impl/ZhjsHzmxServiceImpl.java deleted 100644 → 0
浏览文件 @ 7d330f04
package com.elephant.framework.galaxy.aroad.module.zhjs.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsHzmx;
import com.elephant.framework.galaxy.aroad.module.zhjs.mapper.ZhjsHzmxMapper;
import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsHzmxService;
import org.springframework.stereotype.Service;
/**
* 智慧建设_汇总明细
*
* @author wangjian
* @date 2019-05-17 17:50:54
*/
@Service
public class ZhjsHzmxServiceImpl extends ServiceImpl<ZhjsHzmxMapper, ZhjsHzmx> implements ZhjsHzmxService {
}
src/main/resources/mapper/zhjs/ZhjsGcxmMapper.xml
浏览文件 @ b4a0fae2
......@@ -88,7 +88,8 @@
</select>
<select id="getGcxmAndShape" resultType="com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxmShape">
select g.*,s.shape from t_zhjs_gcxm g LEFT JOIN t_zhjc_xmjc_ghxm_shape s ON substring(g.proname,1,char_length(g.proname)-4)=s.name
select g.*,s.shape from t_zhjs_gcxm g LEFT JOIN t_zhjc_xmjc_ghxm_shape s
ON substring(g.proname,1,char_length(SUBSTRING(g.proname,1,if(LOCATE("（",g.proname)!=0,LOCATE("（",g.proname)-1,char_length(g.proname))))-4)=s.name
<where>
<if test="attribute!=null">
g.attribute=#{attribute}
......
src/main/resources/mapper/zhjs/ZhjsHzmxMapper.xml deleted 100644 → 0
浏览文件 @ 7d330f04
<?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.zhjs.mapper.ZhjsHzmxMapper">
<resultMap id="zhjsHzmxMap" type="com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsHzmx">
<id property="id" column="id"/>
<result property="proName" column="pro_name"/>
<result property="life" column="life"/>
<result property="reportperiodName" column="reportperiod_name"/>
<result property="proId" column="pro_id"/>
<result property="proCode" column="pro_code"/>
<result property="property" column="property"/>
<result property="reportDate" column="report_date"/>
<result property="year" column="year"/>
<result property="planandscst" column="planandscst"/>
</resultMap>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论