路况事件 权限管理

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

+package com.elephant.framework.galaxy.aroad.module.roadcondition.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @program:
+ * @description: 坐标类
+ * @author: songwenjie
+ * @create: 2019-04-02 10:55
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeptUnitDto implements Serializable {
+  /** 单位ID */
+  private String unitId;
+  /** 部门ID */
+  private String deptId;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/entity/RoadConditionEvent.java

@@ -16,7 +16,6 @@ import java.util.Date;
  * @author Xingyuyang
  * @date 2019-05-16 15:28:40
  */
-
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
@@ -24,168 +23,109 @@ import java.util.Date;
 @TableName("road_condition_event")
 @EqualsAndHashCode(callSuper = true)
 public class RoadConditionEvent extends Model<RoadConditionEvent> {
-private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
-  /**
-   *
-   */
+  /** */
   @TableId(type = IdType.AUTO)
   private Integer id;
 
   @ApiModelProperty(value = "事件ID", name = "eventId")
   private String eventId;
-  /**
-   * 路线编码
-   */
+  /** 路线编码 */
   @ApiModelProperty(value = "路线编号", name = "roadCode")
   private String roadCode;
-  /**
-   * 路线名称
-   */
+  /** 路线名称 */
   @ApiModelProperty(value = "路线名称", name = "roadName")
   private String roadName;
-  /**
-   * 管养单位
-   */
+  /** 管养单位 */
   @ApiModelProperty(value = "管养单位", name = "maintainUnit")
   private String maintainUnit;
-  /**
-   * 起止桩号
-   */
+  /** 起止桩号 */
   @ApiModelProperty(value = "起止桩号", name = "stoem")
   private String stoem;
-  /**
-   * 开始桩号
-   */
+  /** 开始桩号 */
   @ApiModelProperty(value = "开始桩号", name = "startm")
   private String startm;
-  /**
-   * 结束桩号
-   */
+  /** 结束桩号 */
   @ApiModelProperty(value = "结束桩号", name = "endm")
   private String endm;
-  /**
-   * 事件类型
-   */
+  /** 事件类型 */
   @ApiModelProperty(value = "事件类型", name = "eventType")
   private String eventType;
-  /**
-   * 事件标题
-   */
+  /** 事件标题 */
   @ApiModelProperty(value = "事件标题", name = "eventTitle")
   private String eventTitle;
-  /**
-   * 事件详情
-   */
+  /** 事件详情 */
   @ApiModelProperty(value = "事件详情", name = "eventContent")
   private String eventContent;
-  /**
-   * 影响程度(1=封闭交通/2=影响交通/3=可正常通行)
-   */
+  /** 影响程度(1=封闭交通/2=影响交通/3=可正常通行) */
   @ApiModelProperty(value = "影响程度(1=封闭交通/2=影响交通/3=可正常通行)", name = "influence")
   private String influence;
-  /**
-   * 压车长度
-   */
+  /** 压车长度 */
   @ApiModelProperty(value = "压车长度", name = "carsLength")
   private String carsLength;
-  /**
-   * 绕行方案
-   */
+  /** 绕行方案 */
   @ApiModelProperty(value = "绕行方案", name = "solution")
   private String solution;
-  /**
-   * 发布人
-   */
+  /** 发布人 */
   @ApiModelProperty(value = "发布人", name = "startPerson")
   private String startPerson;
-  /**
-   * 发布时间
-   */
+  /** 发布时间 */
   @ApiModelProperty(value = "发布时间", name = "startTime")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
   private Date startTime;
-  /**
-   * 发布单位
-   */
+  /** 发布单位 */
   @ApiModelProperty(value = "发布单位", name = "startUnit")
   private String startUnit;
-  /**
-   * 发布单位代码
-   */
+  /** 发布单位代码 */
   @ApiModelProperty(value = "发布单位代码", name = "startUnitNo")
   private String startUnitNo;
-  /**
-   * 备注
-   */
+  /** 备注 */
   @ApiModelProperty(value = "备注", name = "startBz")
   private String startBz;
-  /**
-   * 预撤时间
-   */
+  /** 预撤时间 */
   @ApiModelProperty(value = "预撤时间", name = "preEndTime")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
   private Date preEndTime;
-  /**
-   * 撤销人
-   */
+  /** 撤销人 */
   @ApiModelProperty(value = "撤销人", name = "endPerson")
   private String endPerson;
-  /**
-   * 撤销时间
-   */
+  /** 撤销时间 */
   @ApiModelProperty(value = "撤销时间", name = "endTime")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
   private Date endTime;
-  /**
-   * 撤销单位
-   */
+  /** 撤销单位 */
   @ApiModelProperty(value = "撤销单位", name = "endUnit")
   private String endUnit;
-  /**
-   * 撤销单位代码
-   */
+  /** 撤销单位代码 */
   @ApiModelProperty(value = "撤销单位代码", name = "endUnitNo")
   private String endUnitNo;
-  /**
-   * 撤销原因
-   */
+  /** 撤销原因 */
   @ApiModelProperty(value = "撤销原因", name = "endReason")
   private String endReason;
-  /**
-   * 撤销备注
-   */
+  /** 撤销备注 */
   @ApiModelProperty(value = "撤销备注", name = "endBz")
   private String endBz;
-  /**
-   * 审核人
-   */
+  /** 审核人 */
   @ApiModelProperty(value = "审核人", name = "checkPerson")
   private String checkPerson;
-  /**
-   * 审核时间
-   */
+  /** 审核时间 */
   @ApiModelProperty(value = "审核时间", name = "checkTime")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
   private Date checkTime;
-  /**
-   * 经度
-   */
+  /** 经度 */
   @ApiModelProperty(value = "经度", name = "longitude")
   private String longitude;
-  /**
-   * 纬度
-   */
+  /** 纬度 */
   @ApiModelProperty(value = "纬度", name = "latitude")
   private String latitude;
-  /**
-    * 当前页
-    */
+  /** 当前页 */
   @ApiModelProperty(value = "当前页", name = "current")
   private long current;
-  /**
-   * 一页的数量
-   */
+  /** 一页的数量 */
   @ApiModelProperty(value = "一页的数量", name = "size")
   private long size;
-   }
+  /** 部门ID */
+  @ApiModelProperty(value = "部门ID", name = "deptId")
+  private String deptId;
+}

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

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent> {
   IPage<RoadConditionEvent> getRoadConditionEventPage(
-      IPage<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent);
+      IPage<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,@Param("units")String units);
 
   List<SaveUnitDto> getUnitTree();
 
@@ -32,7 +32,9 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
 
   List<staticByCityDto> staticByCity();
 
-  List<CoordinateDto> getCoordinates();
+  List<DeptUnitDto> getUnitByDept(@Param("deptId") String deptId);
+
+  List<CoordinateDto> getCoordinates(@Param("units") String units);
 
   List<CoordinateDto> getTQCoordinates();
 
@@ -54,6 +56,11 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
 
   RoadConditionEvent getById(@Param("id") Integer id);
 
+  boolean saveUnitWithDept(
+      @Param("deptId") String deptId, @Param("unit") String unit);
+
+  boolean deleteUnitByDept(@Param("deptId") String deptId);
+
   /**
    * 查询数据库是否存在该实体
    *
@@ -79,5 +86,6 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
   Integer deleteBatchByEvent(RoadConditionEvent event);
 
   boolean saveUnit();
+
   boolean deleteUnit();
 }

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

@@ -76,7 +76,7 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
       String yccd);
 
   IPage<RoadConditionEvent> getRoadConditionEventPage(
-      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent);
+      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,String units);
 
   List<SaveUnitDto> getUnitTree();
 
@@ -148,6 +148,8 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
    */
   BaseTreeDto getTree();
 
+  boolean saveUnitWithDept(String params);
+
   RoadConditionEvent getById(Integer id);
 
   List<CoordinateDto> getYHCoordinates();
@@ -158,7 +160,9 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
 
   List<CoordinateDto> getTQCoordinates();
 
-  List<CoordinateDto> getCoordinates();
+  List<CoordinateDto> getCoordinates(String deptId);
+
+  List<DeptUnitDto> getUnitByDept(String deptId);
 
   boolean saveUnit();
 

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

@@ -75,7 +75,7 @@ public class RoadConditionEventServiceImpl
       Date writerdate,
       String infchecker,
       Date checkdate,
-       Date removedate,
+      Date removedate,
       //      String remark,
       String glno,
       String writerno,
@@ -102,7 +102,7 @@ public class RoadConditionEventServiceImpl
             .eq(RoadConditionEvent::getStartTime, writerdate)
             .eq(RoadConditionEvent::getCheckPerson, infchecker)
             .eq(RoadConditionEvent::getCheckTime, checkdate)
-             .eq(RoadConditionEvent::getEndTime, removedate)
+            .eq(RoadConditionEvent::getEndTime, removedate)
             //            .eq(RoadConditionEvent::getStartBz, remark)
             .eq(RoadConditionEvent::getRoadCode, glno)
             .eq(RoadConditionEvent::getStartUnitNo, writerno)
@@ -124,13 +124,38 @@ public class RoadConditionEventServiceImpl
     return baseMapper.getById(id);
   }
 
+  public boolean saveUnitWithDept(@Param("params") String params) {
+    String[] paramStringList = params.split(",");
+    String deptId = paramStringList[0];
+    List<String> unitList = new ArrayList<>();
+    for (int i = 1; i < paramStringList.length; i++) {
+      unitList.add(paramStringList[i]);
+    }
+    baseMapper.deleteUnitByDept(deptId);
+    if (unitList.size() > 1) {
+      for (int i = 0; i < unitList.size(); i++) {
+        baseMapper.saveUnitWithDept(deptId, unitList.get(i));
+      }
+    } else {
+      return baseMapper.saveUnitWithDept(deptId, unitList.get(0));
+    }
+    return false;
+  }
+
   public IPage<RoadConditionEvent> getRoadConditionEventPage(
-      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent) {
-    return baseMapper.getRoadConditionEventPage(page, roadConditionEvent);
+      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,String units) {
+    List<DeptUnitDto> unitList = baseMapper.getUnitByDept(roadConditionEvent.getDeptId());
+    if (unitList.size() > 0) {
+      for (int i = 0; i < unitList.size(); i++) {
+        units += ",'" + unitList.get(i).getUnitId() + "'";
+      }
+      units = units.substring(1, units.length());
+    }
+    return baseMapper.getRoadConditionEventPage(page, roadConditionEvent,units);
   }
 
-  public List<SaveUnitDto> getUnitTree(){
-      return baseMapper.getUnitTree();
+  public List<SaveUnitDto> getUnitTree() {
+    return baseMapper.getUnitTree();
   }
 
   public List<RoadConditionEvent> getRoadConditionEventMobilePage() {
@@ -196,9 +221,21 @@ public class RoadConditionEventServiceImpl
     return baseMapper.staticByCity();
   }
 
-  @Cacheable(value = "roadConditionCoordinates")
-  public List<CoordinateDto> getCoordinates() {
-    return baseMapper.getCoordinates();
+  public List<DeptUnitDto> getUnitByDept(@Param("deptId") String deptId){
+    return baseMapper.getUnitByDept(deptId);
+  }
+
+  //  @Cacheable(value = "roadConditionCoordinates")
+  public List<CoordinateDto> getCoordinates(@Param("deptId") String deptId) {
+    List<DeptUnitDto> unitList = baseMapper.getUnitByDept(deptId);
+    String units = "";
+    if (unitList.size() > 0) {
+      for (int i = 0; i < unitList.size(); i++) {
+        units += ",'" + unitList.get(i).getUnitId() + "'";
+      }
+      units = units.substring(1, units.length());
+    }
+    return baseMapper.getCoordinates(units);
   }
 
   @Cacheable(value = "tqCoordinates")
@@ -221,13 +258,13 @@ public class RoadConditionEventServiceImpl
     return baseMapper.getTFCoordinates();
   }
 
-    public boolean saveUnit() {
-        return baseMapper.saveUnit();
-    }
+  public boolean saveUnit() {
+    return baseMapper.saveUnit();
+  }
 
-    public boolean deleteUnit(){
-      return baseMapper.deleteUnit();
-    }
+  public boolean deleteUnit() {
+    return baseMapper.deleteUnit();
+  }
 
   /**
    * @description : 根据城市查询

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

@@ -98,6 +98,12 @@
 		<result property="unitName" column="unit_name"/>
 	</resultMap>
 
+	<resultMap id="DeptUnitMap"
+	           type="com.elephant.framework.galaxy.aroad.module.roadcondition.dto.DeptUnitDto">
+		<result property="unitId" column="unit_id"/>
+		<result property="deptId" column="dept_id"/>
+	</resultMap>
+
 	<select id="getUnitTree" resultMap="SaveUnitMap">
 		select  * from roadcondition_unit
 	</select>
@@ -111,6 +117,14 @@
 		GROUP BY start_unit_no, maintain_unit
 	</insert>
 
+	<delete id="deleteUnitByDept">
+		delete from roadcondition_emergencyevent where dept_id=#{deptId}
+	</delete>
+
+	<insert id="saveUnitWithDept">
+		insert into roadcondition_emergencyevent (dept_id, unit_id) values (#{deptId},#{unit})
+	</insert>
+
 	<select id="getRoadConditionEventPage" resultMap="roadConditionEventMap"
 	        parameterType="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent">
 		SELECT
@@ -122,36 +136,13 @@
 			<if test="roadConditionEvent.influence != null">influence = #{roadConditionEvent.influence} and</if>
 			<if test="roadConditionEvent.startTime != null">start_time &gt; #{roadConditionEvent.startTime} and</if>
 			<if test="roadConditionEvent.endTime != null">end_time &lt; #{roadConditionEvent.endTime} and</if>
-			1=1
+			start_unit_no in (#{units})
 		</where>
 	</select>
 
 	<select id="getRoadConditionEventMobilePage" resultMap="roadConditionEventMap">
 		SELECT *
-# 		id,road_code,concat(road_code,'·',road_name) as
-# 		road_name,startm,endm,event_type,event_title,event_content,influence,cars_length,solution,start_time,start_unit,start_person,pre_end_time,end_time,end_unit,end_reason,longitude,latitude
 		FROM road_condition_event
-<!--		<where>-->
-<!--			<if test="text!= null">-->
-<!--				road_code like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				road_name like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				event_type like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				event_title like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				event_content like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				influence like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				cars_length like CONCAT('%',#{text},'%')-->
-<!--				or-->
-<!--				start_unit like CONCAT('%',#{text},'%')-->
-<!--				and-->
-<!--			</if>-->
-<!--			road_name is not null-->
-<!--		</where>-->
 	</select>
 
 	<select id="getById" resultMap="roadConditionEventMap">
@@ -222,9 +213,15 @@
 		         fullname
 	</select>
 
+	<select id="getUnitByDept" resultMap="DeptUnitMap">
+		select unit_id from roadcondition_emergencyevent
+		where dept_id = #{deptId}
+	</select>
+
 	<select id="getCoordinates" resultMap="CoordinateDtoMap">
 		select id, longitude, latitude, event_type,event_title
-		from `road_condition_event`;
+		from `road_condition_event`
+		where start_unit_no in (#{units});
 	</select>
 
 	<select id="getTQCoordinates" resultMap="CoordinateDtoMap">
@@ -251,8 +248,6 @@
 		where event_title = '收费站异常';
 	</select>
 
-
-
 	<select id="selectRoadMaintainEvent"
 	        parameterType="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent" resultMap="roadConditionEventMap">
 		SELECT * FROM road_condition_event