Skip to content

T
traffic-signal-platform
Commit 9dcc8a47 authored by duanruiming's avatar duanruiming
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 7f5600ff 9c45500f
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 12 deletions
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesController.java
View file @ 9dcc8a47
......@@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import net.wanji.common.framework.Constants;
import net.wanji.common.framework.i18n.I18nResourceBundle;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.common.framework.rest.Page;
import net.wanji.common.framework.rest.ValidationGroups;
import net.wanji.common.utils.tool.DateUtil;
import net.wanji.common.utils.tool.StringUtils;
import net.wanji.databus.dao.entity.GreenwaveInfoPO;
import net.wanji.databus.dao.mapper.GreenwaveInfoMapper;
......@@ -31,6 +33,7 @@ import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;
......@@ -115,7 +118,17 @@ public class GreenwaveInducesController {
greenwaveDTO.setStrategyId(m.getStrategyId());
greenwaveDTO.setStrategyName(m.getStrategyName());
greenwaveDTO.setDir(m.getDir());
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
if(Objects.nonNull(m.getControlOptTimes()) && m.getControlOptTimes().split("\\|").length>0) {
try {
String startTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":00"))+"-"+endTime.substring(0,endTime.lastIndexOf(":00")));
}catch (ParseException ex){ex.printStackTrace();
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
}
}else {
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
}
greenwaveList.add(greenwaveDTO);
});
induceDTO.setGreenwaveList(greenwaveList);
......@@ -185,7 +198,17 @@ public class GreenwaveInducesController {
greenwaveDTO.setStrategyId(m.getStrategyId());
greenwaveDTO.setStrategyName(m.getStrategyName());
greenwaveDTO.setDir(m.getDir());
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
if(Objects.nonNull(m.getControlOptTimes()) && m.getControlOptTimes().split("\\|").length>0) {
try {
String startTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":00"))+"-"+endTime.substring(0,endTime.lastIndexOf(":00")));
}catch (ParseException ex){ex.printStackTrace();
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
}
}else {
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
}
greenwaveList.add(greenwaveDTO);
});
induceDTO.setGreenwaveList(greenwaveList);
......
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesHistController.java
View file @ 9dcc8a47
......@@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import net.wanji.common.framework.Constants;
import net.wanji.common.framework.i18n.I18nResourceBundle;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.common.framework.rest.Page;
import net.wanji.common.framework.rest.ValidationGroups;
import net.wanji.common.utils.tool.DateUtil;
import net.wanji.common.utils.tool.StringUtils;
import net.wanji.databus.dao.entity.GreenwaveInfoPO;
import net.wanji.databus.dao.mapper.GreenwaveInfoMapper;
......@@ -32,6 +34,7 @@ import javax.validation.constraints.NotBlank;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;
......@@ -100,7 +103,17 @@ public class GreenwaveInducesHistController {
greenwaveInducesDTO.setStrategyName(o.getStrategyName());
greenwaveInducesDTO.setMinSpeed(o.getMinSpeed());
greenwaveInducesDTO.setMinSpeed(o.getMaxSpeed());
greenwaveInducesDTO.setControlOptTimes(o.getControlOptTimes());
if(Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length>0) {
try {
String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveInducesDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":00"))+"-"+endTime.substring(0,endTime.lastIndexOf(":00")));
}catch (ParseException ex){ex.printStackTrace();
greenwaveInducesDTO.setControlOptTimes(o.getControlOptTimes());
}
}else {
greenwaveInducesDTO.setControlOptTimes(o.getControlOptTimes());
}
//获取诱导屏列表
List<InduceDTO> induceDTOList = new ArrayList<>();
greenwaveInducesList.stream().filter(x -> Objects.nonNull(x.getGreenId()) && x.getGreenId().equals(o.getGreenId())).forEach(n -> {
......@@ -174,7 +187,17 @@ public class GreenwaveInducesHistController {
greenwaveInducesDTO.setStrategyName(o.getStrategyName());
greenwaveInducesDTO.setMinSpeed(o.getMinSpeed());
greenwaveInducesDTO.setMinSpeed(o.getMaxSpeed());
greenwaveInducesDTO.setControlOptTimes(o.getControlOptTimes());
if(Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length>0) {
try {
String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveInducesDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":00"))+"-"+endTime.substring(0,endTime.lastIndexOf(":00")));
}catch (ParseException ex){ex.printStackTrace();
greenwaveInducesDTO.setControlOptTimes(o.getControlOptTimes());
}
}else{
greenwaveInducesDTO.setControlOptTimes(o.getControlOptTimes());
}
//获取诱导屏列表
List<InduceDTO> induceDTOList = new ArrayList<>();
greenwaveInducesList.stream().filter(x -> Objects.nonNull(x.getGreenId()) && x.getGreenId().equals(o.getGreenId())).forEach(n -> {
......
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceSendController.java
View file @ 9dcc8a47
......@@ -99,7 +99,7 @@ public class InduceSendController {
param.setEquipCode(greenwaveInduces.getEquipCode());
param.setPlayorder(induceTemplateList.size());
param.setDuration(greenwaveInduces.getDuration());
if (Objects.nonNull(greenwaveInducesHistList) && greenwaveInducesHistList.size() > 0 && Objects.nonNull(greenwaveInducesHistList.get(0).getControlOptTimes()) && greenwaveInducesHistList.get(0).getControlOptTimes().split("|").length > 0 && DateUtil.isBetween(new Date(), DateUtil.parse(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), DateUtil.parse(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND))) {
if (Objects.nonNull(greenwaveInducesHistList) && greenwaveInducesHistList.size() > 0 && Objects.nonNull(greenwaveInducesHistList.get(0).getControlOptTimes()) && greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|").length > 0 && DateUtil.isBetween(new Date(), DateUtil.parse(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), DateUtil.parse(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND))) {
param.setStartTime(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[0]);
param.setEndTime(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[1]);
} else {
......
signal-optimize-service/src/main/java/net/wanji/opt/service/induce/impl/InduceSendServiceImpl.java
View file @ 9dcc8a47
......@@ -293,15 +293,23 @@ public class InduceSendServiceImpl implements InduceSendService {
g.drawString(text[0], x, y);
} else { // 纵向
// 字体高度的70%
int verticalSpacing = (int) (textHeight * 0.7);
int verticalSpacing = (int) (textHeight * 0.95);
// 逐个字符绘制文字
for (int i = 0; i < text.length; i++) {
if (i == 0) {
g.drawString(text[i], x, y);
} else {
g.drawString(text[i], x, y + (i * verticalSpacing));
}
if(text[0].split("-").length==2) {
g.drawString(" "+text[0].split("-")[0], x, y);
g.drawString(" |", x, y + (1 * verticalSpacing));
g.drawString(" "+text[0].split("-")[1].replace("km/h",""), x, y + (2 * verticalSpacing));
g.drawString("km/h", x, y + (3 * verticalSpacing));
}else{
g.drawString(text[0], x, y);
}
// for (int i = 0; i < text[0].split("-")[1]; i++) {
// if (i%2 == 0) {
// g.drawString(text[i], x, y);
// } else {
// g.drawString(text[i], x, y + (i * verticalSpacing));
// }
// }
}
// 释放资源
g.dispose();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment