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

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/dto/YHCoordinateDto.java

-package com.elephant.framework.galaxy.aroad.module.roadcondition.dto;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @program:
- * @description: 坐标类
- * @author: songwenjie
- * @create: 2019-04-02 10:55
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class YHCoordinateDto implements Serializable {
-  /** */
-  @TableId
-  private Integer id;
-  /** 路线编码 */
-  private String roadCode;
-  /** 路线名称 */
-  private String roadName;
-  /** 开始桩号 */
-  private String startm;
-  /** 结束桩号 */
-  private String endm;
-  /** 事件类型 */
-  private String eventType;
-  /** 事件标题 */
-  private String eventTitle;
-  /** 事件详情 */
-  private String eventContent;
-  /** 影响程度 */
-  private String influence;
-  /** 压车长度 */
-  private String carsLength;
-  /** 绕行方案 */
-  private String solution;
-  /** 发布时间 */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  //  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private Date startTime;
-  /** 发布单位 */
-  private String startUnit;
-  /** 发布人 */
-  private String startPerson;
-  /** 预撤时间 */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  //  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private Date preEndTime;
-  /** 撤销时间 */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  //  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private Date endTime;
-  /** 撤销单位 */
-  private String endUnit;
-  /** 撤销原因 */
-  private String endReason;
-
-  private Long current;
-  /**
-   * 经度
-   */
-  private String longitude;
-  /**
-   * 纬度
-   */
-  private String latitude;
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/mapper/RoadConditionEventMapper.java

@@ -32,7 +32,7 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
 
   List<CoordinateDto> getTQCoordinates();
 
-  List<YHCoordinateDto> getYHCoordinates();
+  List<CoordinateDto> getYHCoordinates();
 
   List<CoordinateDto> getSFZCoordinates();
 

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/RoadConditionEventService.java

@@ -93,7 +93,7 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
 
 	RoadConditionEvent getById(Integer id);
 
-	List<YHCoordinateDto> getYHCoordinates();
+	List<CoordinateDto> getYHCoordinates();
 
 	List<CoordinateDto> getSFZCoordinates();
 

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/impl/RoadConditionEventServiceImpl.java

@@ -103,7 +103,7 @@ public class RoadConditionEventServiceImpl
     }
 
     @Cacheable(value = "yhCoordinates")
-    public List<YHCoordinateDto> getYHCoordinates() {
+    public List<CoordinateDto> getYHCoordinates() {
         return baseMapper.getYHCoordinates();
     }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/controller/roadNetZhjcController.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.controller;
-
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.service.roadNetZhjcService;
-import com.elephant.framework.galaxy.aroad.response.R;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * 智慧养护_综合展示
- *
- * @author wangjian
- * @date 2019-04-26 11:51:59
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/roadnetzhjc")
-public class roadNetZhjcController extends BaseController  {
-
-  private final roadNetZhjcService roadNetZhjcService;
-
-  /**
-   * 智慧养护综合展示根据年份进行数据查询
-   * @param year 年份
-   * @return
-   */
-  @GetMapping("/getroadnetzhjcdata")
-  public R getRoadNetZhjcData(String year) {
-    return new R<>(roadNetZhjcService.getRoadNetZhjcData(year));
-  }
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/entity/ZhyhZhzs.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.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.time.LocalDateTime;
-
-/**
- * 智慧养护_综合展示
- *
- * @author wangjian
- * @date 2019-04-26 11:51:59
- */
-@Data
-@TableName("t_zhyh_zhzs")
-@EqualsAndHashCode(callSuper = true)
-public class ZhyhZhzs extends Model<ZhyhZhzs> {
-private static final long serialVersionUID = 1L;
-
-  /**
-   * 主键
-   */
-  @TableId
-  private String id;
-  /**
-   * 年份
-   */
-  private String year;
-  /**
-   * 字段名称
-   */
-  private String name;
-  /**
-   * 数值
-   */
-  private String value;
-  /**
-   * 类别
-   */
-  private String type;
-  /**
-   * 创建人
-   */
-  private String creator;
-  /**
-   * 创建时间
-   */
-  private LocalDateTime createTime;
-  /**
-   * 更新人
-   */
-  private String updatePerson;
-  /**
-   * 更新时间
-   */
-  private LocalDateTime updateTime;
-  /**
-   * 状态：根据具体需求定义
-   */
-  private String status;
-  /**
-   * 是否删除  -1：已删除  0：正常
-   */
-  private String delFlag;
-  /**
-   * 备注信息
-   */
-  private String remarks;
-
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/entity/ZhyhZhzsData.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ZhyhZhzsData {
-    private List<ZhyhZhzsKeyValue> zhyhZhzsQlOne;
-    private List<ZhyhZhzsKeyValue> zhyhZhzsQlTwo;
-    private List<ZhyhZhzsKeyValue> zhyhZhzsQlThree;
-
-    private List<ZhyhZhzsKeyValue> zhyhZhzsSdOne;
-    private List<ZhyhZhzsKeyValue> zhyhZhzsSdTwo;
-    private List<ZhyhZhzsKeyValue> zhyhZhzsSdThree;
-
-    private List<ZhyhZhzsKeyValue> zhyhZhzsOne;
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/entity/ZhyhZhzsKeyValue.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity;
-
-import lombok.Data;
-
-@Data
-public class ZhyhZhzsKeyValue {
-    private String key;
-    private String value;
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/mapper/roadNetZhjcMapper.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity.ZhyhZhzs;
-
-/**
- * 智慧养护_综合展示
- *
- * @author wangjian
- * @date 2019-04-26 11:51:59
- */
-public interface roadNetZhjcMapper extends BaseMapper<ZhyhZhzs> {
-
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/service/impl/roadNetZhjcServiceImpl.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.service.roadNetZhjcService;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity.ZhyhZhzs;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity.ZhyhZhzsData;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity.ZhyhZhzsKeyValue;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.mapper.roadNetZhjcMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 智慧养护_综合展示
- *
- * @author wangjian
- * @date 2019-04-26 11:51:59
- */
-@Service
-@AllArgsConstructor
-public class roadNetZhjcServiceImpl extends ServiceImpl<roadNetZhjcMapper, ZhyhZhzs> implements roadNetZhjcService {
-
-    private final roadNetZhjcMapper zhyhZhzsMapper;
-
-    /**
-     * 智慧养护综合展示根据年份进行数据查询
-     * @param year 年份
-     * @return
-     */
-    public ZhyhZhzsData getRoadNetZhjcData(String year) {
-
-        ZhyhZhzsData zhyhZhzsData = new ZhyhZhzsData();
-        zhyhZhzsData.setZhyhZhzsQlOne(getZhyhZhzsQlListByYear("ql1",year));
-        zhyhZhzsData.setZhyhZhzsQlTwo(getZhyhZhzsQlListByYear("ql2",year));
-        zhyhZhzsData.setZhyhZhzsQlThree(getZhyhZhzsQlListByYear("ql3",year));
-
-        zhyhZhzsData.setZhyhZhzsSdOne(getZhyhZhzsQlListByYear("sd1",year));
-        zhyhZhzsData.setZhyhZhzsSdTwo(getZhyhZhzsQlListByYear("sd2",year));
-        zhyhZhzsData.setZhyhZhzsSdThree(getZhyhZhzsQlListByYear("sd3",year));
-
-
-        zhyhZhzsData.setZhyhZhzsOne(getZhyhZhzsQlListByYear("one",year));
-
-        return zhyhZhzsData;
-    }
-
-    public List<ZhyhZhzsKeyValue> getZhyhZhzsQlListByYear(String type, String year) {
-        List<ZhyhZhzsKeyValue> zhyhZhzsKeyValues = new ArrayList<ZhyhZhzsKeyValue>();
-        List<ZhyhZhzs> zhyhZhzss = zhyhZhzsMapper.selectList(Wrappers.<ZhyhZhzs>query().lambda().eq(ZhyhZhzs::getType,type).eq(ZhyhZhzs::getYear,year));
-        for(ZhyhZhzs zhyhZhzs : zhyhZhzss) {
-            ZhyhZhzsKeyValue zhyhZhzsKeyValue = new ZhyhZhzsKeyValue();
-            zhyhZhzsKeyValue.setKey(zhyhZhzs.getName());
-            zhyhZhzsKeyValue.setValue(zhyhZhzs.getValue());
-            zhyhZhzsKeyValues.add(zhyhZhzsKeyValue);
-        }
-        return zhyhZhzsKeyValues;
-    }
-
-
-
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadnet_zhjc/service/roadNetZhjcService.java

-package com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity.ZhyhZhzs;
-import com.elephant.framework.galaxy.aroad.module.roadnet_zhjc.entity.ZhyhZhzsData;
-
-/**
- * 智慧养护_综合展示
- *
- * @author wangjian
- * @date 2019-04-26 11:51:59
- */
-public interface roadNetZhjcService extends IService<ZhyhZhzs> {
-
-    /**
-     * 智慧养护综合展示根据年份进行数据查询
-     * @param year 年份
-     * @return
-     */
-    public ZhyhZhzsData getRoadNetZhjcData(String year);
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcXmjcGhxmController.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-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.common.controller.BaseController;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcGhxm;
 import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcXmjcGhxmService;
+import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -40,6 +32,11 @@ public class ZhjcXmjcGhxmController extends BaseController  {
     return  new R<>(zhjcXmjcGhxmService.getList(zhjcXmjcGhxm));
   }
 
+  @GetMapping("/gclist")
+  public R getGCList() {
+    return  new R<>(zhjcXmjcGhxmService.getGCList());
+  }
+
 
   /**
    * 通过id查询规划项目

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcXmjcGhxmMapper.java

@@ -16,4 +16,5 @@ public interface ZhjcXmjcGhxmMapper extends BaseMapper<ZhjcXmjcGhxm> {
 
     List<ZhjcXmjcGhxm> selectGhxm(@Param("ghxm") ZhjcXmjcGhxm zhjcXmjcGhxm);
 
+    List<ZhjcXmjcGhxm> selectGCGhxm();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcXmjcGhxmService.java

@@ -2,7 +2,6 @@ package com.elephant.framework.galaxy.aroad.module.zhjc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcGhxm;
-import com.elephant.framework.galaxy.aroad.response.R;
 
 import java.util.List;
 import java.util.Map;
@@ -21,4 +20,6 @@ public interface ZhjcXmjcGhxmService extends IService<ZhjcXmjcGhxm> {
      * @return
      */
     Map<String, List<ZhjcXmjcGhxm>> getList(ZhjcXmjcGhxm zhjcXmjcGhxm);
+
+    Map<String, List<ZhjcXmjcGhxm>> getGCList();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcXmjcGhxmServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcGhxm;
 import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcXmjcGhxmMapper;
@@ -40,4 +38,17 @@ public class ZhjcXmjcGhxmServiceImpl extends ServiceImpl<ZhjcXmjcGhxmMapper, Zhj
         map.put("dzx",dzxList);
         return map;
     }
+
+    @Override
+    public Map<String, List<ZhjcXmjcGhxm>> getGCList() {
+
+        List<ZhjcXmjcGhxm> list =zhjcXmjcGhxmMapper.selectGCGhxm();
+
+        Map<String,List<ZhjcXmjcGhxm>> map = new HashMap<>();
+        List<ZhjcXmjcGhxm> dzxList = list.stream().filter(a->"大中修项目".equals(a.getXmlx())).collect(Collectors.toList());
+        List<ZhjcXmjcGhxm> xgjList = list.stream().filter(a->"新改建项目".equals(a.getXmlx())).collect(Collectors.toList());
+        map.put("xgj",xgjList);
+        map.put("dzx",dzxList);
+        return map;
+    }
 }

src/main/resources/mapper/roadcondition/RoadConditionEventMapper.xml

@@ -173,7 +173,7 @@
 	</select>
 
 	<select id="getYHCoordinates" resultMap="roadConditionEventMap">
-		select *
+		select id, longitude, latitude, event_type
 		from `road_condition_event`
 		where event_type = '养护施工';
 	</select>

src/main/resources/mapper/zhjc/ZhjcXmjcGhxmMapper.xml

@@ -64,4 +64,11 @@
         order by xm.id
       </select>
 
+      <select id="selectGCGhxm" parameterType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcGhxm" resultMap="zhjcXmjcGhxmMap">
+            select xm.*,shape.code,shape.shape
+            from t_zhjc_xmjc_ghxm xm
+            left join t_zhjc_xmjc_ghxm_shape shape on xm.xmmc = shape.name
+            where xm.jzqk = '在建'
+            order by xm.id
+      </select>
 </mapper>