[update] 路口管理，编辑路口增加回显信息

signal-control-service/src/main/java/net/wanji/web/service/impl/CrossManageServiceImpl.java

@@ -241,6 +241,26 @@ public class CrossManageServiceImpl implements CrossManageService {
         List<AreaDetailPOExt> extList = extPageInfo.getList();
         for (AreaDetailPOExt areaDetailPOExt : extList) {
             AreaDetailVO areaDetailVO = new AreaDetailVO();
+            areaDetailVO.setAreaId(areaDetailPOExt.getAreaId());
+            areaDetailVO.setId(areaDetailPOExt.getCrossId());
+            areaDetailVO.setInstallTime(areaDetailPOExt.getInstallTime());
+            areaDetailVO.setName(areaDetailPOExt.getCrossName());
+            areaDetailVO.setAreaName(areaDetailPOExt.getAreaName());
+            areaDetailVO.setCode(areaDetailPOExt.getCode());
+            areaDetailVO.setManufacturerId(areaDetailPOExt.getManufacturerId());
+            areaDetailVO.setManufacturerNick(areaDetailPOExt.getNickName());
+            areaDetailVO.setModel(areaDetailPOExt.getModel());
+            String ip = areaDetailPOExt.getIp();
+            Integer port = areaDetailPOExt.getPort();
+            areaDetailVO.setIpPort(ip + ":" + port);
+            areaDetailVO.setIp(ip);
+            areaDetailVO.setPort(port);
+            areaDetailVO.setLocation(areaDetailPOExt.getLocation());
+            areaDetailVO.setVersion(areaDetailPOExt.getVersion());
+            areaDetailVO.setIsSignal(areaDetailPOExt.getIsSignal());
+            areaDetailVO.setIsStart(areaDetailPOExt.getIsStart());
+            areaDetailVO.setIsSend(areaDetailPOExt.getIsSend());
+
             BeanUtils.copyProperties(areaDetailPOExt, areaDetailVO);
             areaDetailVO.setIpPort(areaDetailPOExt.getIp() + ":" + areaDetailPOExt.getPort());
             // 获取控制模式

wj-databus/src/main/java/net/wanji/databus/po/AreaDetailPOExt.java

 package net.wanji.databus.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @ApiModel(value = "区域详情表连接查询实体")
 public class AreaDetailPOExt {
@@ -25,7 +28,7 @@ public class AreaDetailPOExt {
     @ApiModelProperty(value = "信号机IP")
     private String ip ;
     @ApiModelProperty(value = "信号机端口")
-    private String port ;
+    private Integer port ;
     @ApiModelProperty(value = "是否信控路口：1是；0否")
     private Integer isSignal;
     @ApiModelProperty(value = "控制模式：1定周期；2绿波协调；3黄闪；4全红；5关灯；6单点自适应；7全感应；8半感应；9行人过街")
@@ -35,4 +38,14 @@ public class AreaDetailPOExt {
     @ApiModelProperty(value = "是否下发方案：1是；0否")
     private Integer isSend;
 
+    @ApiModelProperty(value = "安装时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
+    private Date installTime;
+    @ApiModelProperty(value = "信号机位置")
+    private String location ;
+    @ApiModelProperty(value = "厂商ID")
+    private Integer manufacturerId ;
+    @ApiModelProperty(value = "版本号")
+    private String version ;
+
 }
\ No newline at end of file

wj-databus/src/main/java/net/wanji/databus/vo/AreaDetailVO.java

 package net.wanji.databus.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @ApiModel(value = "区域详情")
 public class AreaDetailVO {
@@ -11,19 +14,32 @@ public class AreaDetailVO {
     @ApiModelProperty(value = "区域ID")
     private Integer areaId;
     @ApiModelProperty(value = "路口ID")
-    private String crossId;
+    private String id;
+    @ApiModelProperty(value = "安装时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
+    private Date installTime;
     @ApiModelProperty(value = "路口名称")
-    private String crossName;
+    private String name;
     @ApiModelProperty(value = "区域名称")
     private String areaName;
     @ApiModelProperty(value = "信号机编号")
     private String code;
+    @ApiModelProperty(value = "厂商ID")
+    private Integer manufacturerId ;
     @ApiModelProperty(value = "厂商简称")
-    private String nickName ;
+    private String manufacturerNick ;
     @ApiModelProperty(value = "信号机型号")
     private String model ;
     @ApiModelProperty(value = "信号机IP/端口")
     private String ipPort ;
+    @ApiModelProperty(value = "信号机IP")
+    private String ip ;
+    @ApiModelProperty(value = "信号机端口")
+    private Integer port ;
+    @ApiModelProperty(value = "信号机位置")
+    private String location ;
+    @ApiModelProperty(value = "版本号")
+    private String version ;
     @ApiModelProperty(value = "是否信控路口：1是；0否")
     private Integer isSignal;
     @ApiModelProperty(value = "控制模式：1定周期；2绿波协调；3黄闪；4全红；5关灯；6单点自适应；7全感应；8半感应；9行人过街")

wj-databus/src/main/resources/mapper/BaseAreaInfoMapper.xml

@@ -75,7 +75,9 @@
         SELECT t_area.id AS areaId, t_cross.id AS crossId, t_cross.name as crossName,
                t_area.name AS areaName, t_signal.code AS code, t_manu.nick_name as nickName,
                t_signal.model AS model, t_signal.ip AS ip, t_signal.port AS port,
-               t_cross.is_signal AS isSignal, t_cross.is_start AS isStart, t_cross.is_send AS isSend
+               t_cross.is_signal AS isSignal, t_cross.is_start AS isStart, t_cross.is_send AS isSend,
+               t_signal.install_time AS installTime, t_signal.location AS location, t_signal.manufacturer_id AS manufacturerId,
+               t_signal.version AS version
         FROM t_base_area_info t_area
                  JOIN t_base_area_cross t_area_cross ON t_area.id = t_area_cross.area_id
                  JOIN t_base_cross_info t_cross ON t_area_cross.cross_id = t_cross.id