mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

develop
wangsixiang 9 months ago
parent
44c358234c 59e1001526
commit
1cb65c941f
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      zc-business/src/main/java/com/zc/business/utils/BoardContentUtils.java
  2. 2
      zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

10
zc-business/src/main/java/com/zc/business/utils/BoardContentUtils.java
View File

@ -204,12 +204,12 @@ public class BoardContentUtils {
icon = ImageIO.read(new File(templatePath + "/shoufei.png"));
g.drawImage(icon,70,2,33,40,null);
imgDTO = ImageDTO.createImageDTO("长清大学城收费站",new Color(255,255,0),new Font("Default", Font.BOLD, 20), 105, 2);
imgDTO = ImageDTO.createImageDTO("孝里收费站",new Color(255,255,0),new Font("Default", Font.BOLD, 20), 105, 2);
g.setColor(imgDTO.getColor()); //根据图片的背景设置水印颜色
g.setFont(imgDTO.getFont()); //设置字体
g.drawString(imgDTO.getText(), imgDTO.getX(), imgDTO.getY()); //画出水印
imgDTO = ImageDTO.createImageDTO("14.7KM 10分钟",new Color(255,255,0),new Font("Default", Font.BOLD, 20), 105, 22);
imgDTO = ImageDTO.createImageDTO("15.2KM 10分钟",new Color(255,255,0),new Font("Default", Font.BOLD, 20), 105, 22);
g.setColor(imgDTO.getColor()); //根据图片的背景设置水印颜色
g.setFont(imgDTO.getFont()); //设置字体
g.drawString(imgDTO.getText(), imgDTO.getX(), imgDTO.getY()); //画出水印
@ -230,7 +230,7 @@ public class BoardContentUtils {
g.setFont(imgDTO.getFont()); //设置字体
g.drawString(imgDTO.getText(), imgDTO.getX(), imgDTO.getY()); //画出水印
imgDTO = ImageDTO.createImageDTO("17.7KM 15分钟",new Color(255,255,0),new Font("Default", Font.BOLD, 20), 485, 22);
imgDTO = ImageDTO.createImageDTO("7.7KM 5分钟",new Color(255,255,0),new Font("Default", Font.BOLD, 20), 485, 22);
g.setColor(imgDTO.getColor()); //根据图片的背景设置水印颜色
g.setFont(imgDTO.getFont()); //设置字体
g.drawString(imgDTO.getText(), imgDTO.getX(), imgDTO.getY()); //画出水印
@ -313,10 +313,10 @@ public class BoardContentUtils {
// DcBoardImgLane boardImgLane = new DcBoardImgLane(BoardIconEnum.SPEED_LIMIT_120,BoardIconEnum.SPEED_LIMIT_120,BoardIconEnum.SPEED_LIMIT_100,BoardIconEnum.SPEED_LIMIT_80,BoardIconEnum.EMERGENCY_LANE);
// DcBoardImgLane boardImgLane = new DcBoardImgLane(BoardIconEnum.STRAIGHT_TRAVEL,BoardIconEnum.LEFT_DETOUR,BoardIconEnum.LANE_PROHIBITION,BoardIconEnum.RIGHT_DETOUR,BoardIconEnum.EMERGENCY_LANE);
DcBoardImgLane boardImgLane = new DcBoardImgLane(BoardIconEnum.LANE_PROHIBITION,BoardIconEnum.RIGHT_DETOUR,BoardIconEnum.STRAIGHT_TRAVEL,BoardIconEnum.STRAIGHT_TRAVEL,BoardIconEnum.EMERGENCY_LANE);
//车道通行场景
// BoardContentUtils.writeLaneImage(boardImgLane);
BoardContentUtils.writeLaneImage(boardImgLane);
//服务设施场景

2
zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
View File

@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="installationSite != null and installationSite != ''">and t1.installation_site = #{installationSite}</if>
<if test="useState != null and useState != ''">and t1.use_state = #{useState}</if>
<if test="deviceState != null and deviceState != ''">and t1.device_state = #{deviceState}</if>
<if test="otherConfig != null and otherConfig != ''">and t1.other_config = #{otherConfig}</if>
<if test="otherConfig != null and otherConfig != ''">and json_extract(t1.other_config,'$.childType') = #{otherConfig}</if>
<if test="remark != null and remark != ''">and t1.remark = #{remark}</if>
<if test="createTime != null and createTime != ''">and t1.create_time = #{createTime}</if>
<if test="updateTime != null and updateTime != ''">and t1.update_time = #{updateTime}</if>

Write Preview
Loading…
Cancel
Save