巡检轨迹接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlCommonController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.qdtl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
@@ -9,8 +10,10 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.qdtl.domain.TlArea;
+import com.ruoyi.qdtl.domain.TlInspectionDeviceTrail;
 import com.ruoyi.qdtl.domain.TlInspectionLocation;
 import com.ruoyi.qdtl.service.ITlAreaService;
+import com.ruoyi.qdtl.service.ITlInspectionDeviceTrailService;
 import com.ruoyi.qdtl.service.ITlInspectionLocationService;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
@@ -26,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 监控设备管理Controller
@@ -46,6 +50,8 @@ public class TlCommonController extends BaseController {
     private ITlAreaService tlAreaService;
     @Autowired
     private ITlInspectionLocationService tlInspectionLocationService;
+    @Autowired
+    private ITlInspectionDeviceTrailService tlInspectionDeviceTrailService;
 
     /**
      * 查询监控设备管理列表
@@ -91,7 +97,7 @@ public class TlCommonController extends BaseController {
      * @return
      */
     @GetMapping("/resource")
-    public AjaxResult resource() {
+    public AjaxResult resource(@RequestParam(required = false) String date) {
         Map<String, Object> map = new HashMap<>(8);
         // 区域
         List<TlArea> areas = tlAreaService.selectAreaList();
@@ -102,7 +108,15 @@ public class TlCommonController extends BaseController {
         map.put("staticLocation", staticLocation);
 
         // 动态资源
-
+        // 巡检轨迹
+        if (StrUtil.isBlank(date)) {
+            date = DateUtil.today();
+        }
+        List<TlInspectionDeviceTrail> deviceTrails = tlInspectionDeviceTrailService.selectListByDate(date);
+        // 对轨迹按照设备编码分组
+        Map<String, List<TlInspectionDeviceTrail>> deviceTrail = deviceTrails.stream().collect(Collectors.groupingBy(TlInspectionDeviceTrail::getDeviceCode));
+        map.put("deviceTrail", deviceTrail);
+        
         // 铁路沿线
         List<SysConfig> railway = sysConfigService.selectConfigByLeftKey("tl.railway.");
         map.put("railway", railway);

ruoyi-system/src/main/java/com/ruoyi/qdtl/mapper/TlInspectionDeviceTrailMapper.java

@@ -1,19 +1,20 @@
 package com.ruoyi.qdtl.mapper;
 
-import java.util.List;
 import com.ruoyi.qdtl.domain.TlInspectionDeviceTrail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 设备轨迹Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-03-12
  */
-public interface TlInspectionDeviceTrailMapper 
-{
+public interface TlInspectionDeviceTrailMapper {
     /**
      * 查询设备轨迹
-     * 
+     *
      * @param id 设备轨迹主键
      * @return 设备轨迹
      */
@@ -21,7 +22,7 @@ public interface TlInspectionDeviceTrailMapper
 
     /**
      * 查询设备轨迹列表
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 设备轨迹集合
      */
@@ -29,7 +30,7 @@ public interface TlInspectionDeviceTrailMapper
 
     /**
      * 新增设备轨迹
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface TlInspectionDeviceTrailMapper
 
     /**
      * 修改设备轨迹
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface TlInspectionDeviceTrailMapper
 
     /**
      * 删除设备轨迹
-     * 
+     *
      * @param id 设备轨迹主键
      * @return 结果
      */
@@ -53,9 +54,11 @@ public interface TlInspectionDeviceTrailMapper
 
     /**
      * 批量删除设备轨迹
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteTlInspectionDeviceTrailByIds(Long[] ids);
+
+    List<TlInspectionDeviceTrail> selectListByDate(@Param("date") String date);
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/ITlInspectionDeviceTrailService.java

@@ -1,19 +1,19 @@
 package com.ruoyi.qdtl.service;
 
-import java.util.List;
 import com.ruoyi.qdtl.domain.TlInspectionDeviceTrail;
 
+import java.util.List;
+
 /**
  * 设备轨迹Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-03-12
  */
-public interface ITlInspectionDeviceTrailService 
-{
+public interface ITlInspectionDeviceTrailService {
     /**
      * 查询设备轨迹
-     * 
+     *
      * @param id 设备轨迹主键
      * @return 设备轨迹
      */
@@ -21,7 +21,7 @@ public interface ITlInspectionDeviceTrailService
 
     /**
      * 查询设备轨迹列表
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 设备轨迹集合
      */
@@ -29,7 +29,7 @@ public interface ITlInspectionDeviceTrailService
 
     /**
      * 新增设备轨迹
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITlInspectionDeviceTrailService
 
     /**
      * 修改设备轨迹
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITlInspectionDeviceTrailService
 
     /**
      * 批量删除设备轨迹
-     * 
+     *
      * @param ids 需要删除的设备轨迹主键集合
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface ITlInspectionDeviceTrailService
 
     /**
      * 删除设备轨迹信息
-     * 
+     *
      * @param id 设备轨迹主键
      * @return 结果
      */
     public int deleteTlInspectionDeviceTrailById(Long id);
+
+    List<TlInspectionDeviceTrail> selectListByDate(String date);
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlInspectionDeviceTrailServiceImpl.java

@@ -1,95 +1,97 @@
 package com.ruoyi.qdtl.service.impl;
 
-import java.util.List;
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.qdtl.mapper.TlInspectionDeviceTrailMapper;
 import com.ruoyi.qdtl.domain.TlInspectionDeviceTrail;
+import com.ruoyi.qdtl.mapper.TlInspectionDeviceTrailMapper;
 import com.ruoyi.qdtl.service.ITlInspectionDeviceTrailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 设备轨迹Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2022-03-12
  */
 @Service
-public class TlInspectionDeviceTrailServiceImpl implements ITlInspectionDeviceTrailService 
-{
+public class TlInspectionDeviceTrailServiceImpl implements ITlInspectionDeviceTrailService {
     @Autowired
     private TlInspectionDeviceTrailMapper tlInspectionDeviceTrailMapper;
 
     /**
      * 查询设备轨迹
-     * 
+     *
      * @param id 设备轨迹主键
      * @return 设备轨迹
      */
     @Override
-    public TlInspectionDeviceTrail selectTlInspectionDeviceTrailById(Long id)
-    {
+    public TlInspectionDeviceTrail selectTlInspectionDeviceTrailById(Long id) {
         return tlInspectionDeviceTrailMapper.selectTlInspectionDeviceTrailById(id);
     }
 
     /**
      * 查询设备轨迹列表
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 设备轨迹
      */
     @Override
-    public List<TlInspectionDeviceTrail> selectTlInspectionDeviceTrailList(TlInspectionDeviceTrail tlInspectionDeviceTrail)
-    {
+    public List<TlInspectionDeviceTrail> selectTlInspectionDeviceTrailList(TlInspectionDeviceTrail tlInspectionDeviceTrail) {
         return tlInspectionDeviceTrailMapper.selectTlInspectionDeviceTrailList(tlInspectionDeviceTrail);
     }
 
     /**
      * 新增设备轨迹
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 结果
      */
     @Override
-    public int insertTlInspectionDeviceTrail(TlInspectionDeviceTrail tlInspectionDeviceTrail)
-    {
-        tlInspectionDeviceTrail.setCreateTime(DateUtils.getNowDate());
+    public int insertTlInspectionDeviceTrail(TlInspectionDeviceTrail tlInspectionDeviceTrail) {
+        if (ObjectUtil.isNull(tlInspectionDeviceTrail.getCreateTime())) {
+            tlInspectionDeviceTrail.setCreateTime(DateUtils.getNowDate());
+        }
         return tlInspectionDeviceTrailMapper.insertTlInspectionDeviceTrail(tlInspectionDeviceTrail);
     }
 
     /**
      * 修改设备轨迹
-     * 
+     *
      * @param tlInspectionDeviceTrail 设备轨迹
      * @return 结果
      */
     @Override
-    public int updateTlInspectionDeviceTrail(TlInspectionDeviceTrail tlInspectionDeviceTrail)
-    {
+    public int updateTlInspectionDeviceTrail(TlInspectionDeviceTrail tlInspectionDeviceTrail) {
         return tlInspectionDeviceTrailMapper.updateTlInspectionDeviceTrail(tlInspectionDeviceTrail);
     }
 
     /**
      * 批量删除设备轨迹
-     * 
+     *
      * @param ids 需要删除的设备轨迹主键
      * @return 结果
      */
     @Override
-    public int deleteTlInspectionDeviceTrailByIds(Long[] ids)
-    {
+    public int deleteTlInspectionDeviceTrailByIds(Long[] ids) {
         return tlInspectionDeviceTrailMapper.deleteTlInspectionDeviceTrailByIds(ids);
     }
 
     /**
      * 删除设备轨迹信息
-     * 
+     *
      * @param id 设备轨迹主键
      * @return 结果
      */
     @Override
-    public int deleteTlInspectionDeviceTrailById(Long id)
-    {
+    public int deleteTlInspectionDeviceTrailById(Long id) {
         return tlInspectionDeviceTrailMapper.deleteTlInspectionDeviceTrailById(id);
     }
+
+    @Override
+    public List<TlInspectionDeviceTrail> selectListByDate(String date) {
+        return tlInspectionDeviceTrailMapper.selectListByDate(date);
+    }
 }

ruoyi-system/src/main/resources/mapper/qdtl/TlInspectionDeviceTrailMapper.xml

@@ -1,43 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.qdtl.mapper.TlInspectionDeviceTrailMapper">
-    
+
     <resultMap type="TlInspectionDeviceTrail" id="TlInspectionDeviceTrailResult">
-        <result property="id"    column="id"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="deviceName"    column="device_name"    />
-        <result property="deviceCode"    column="device_code"    />
-        <result property="checkpointId"    column="checkpoint_id"    />
-        <result property="checkpointName"    column="checkpoint_name"    />
-        <result property="checkpointCard"    column="checkpoint_card"    />
-        <result property="fence"    column="fence"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="deviceCode" column="device_code"/>
+        <result property="checkpointId" column="checkpoint_id"/>
+        <result property="checkpointName" column="checkpoint_name"/>
+        <result property="checkpointCard" column="checkpoint_card"/>
+        <result property="fence" column="fence"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectTlInspectionDeviceTrailVo">
-        select id, device_id, device_name, device_code, checkpoint_id, checkpoint_name, checkpoint_card, fence, create_time from tl_inspection_device_trail
+        select id,
+               device_id,
+               device_name,
+               device_code,
+               checkpoint_id,
+               checkpoint_name,
+               checkpoint_card,
+               fence,
+               create_time
+        from tl_inspection_device_trail
     </sql>
 
     <select id="selectTlInspectionDeviceTrailList" parameterType="TlInspectionDeviceTrail" resultMap="TlInspectionDeviceTrailResult">
         <include refid="selectTlInspectionDeviceTrailVo"/>
-        <where>  
-            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
-            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
-            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
-            <if test="checkpointId != null  and checkpointId != ''"> and checkpoint_id = #{checkpointId}</if>
-            <if test="checkpointName != null  and checkpointName != ''"> and checkpoint_name like concat('%', #{checkpointName}, '%')</if>
-            <if test="checkpointCard != null  and checkpointCard != ''"> and checkpoint_card = #{checkpointCard}</if>
-            <if test="fence != null  and fence != ''"> and fence = #{fence}</if>
+        <where>
+            <if test="deviceId != null  and deviceId != ''">and device_id = #{deviceId}</if>
+            <if test="deviceName != null  and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
+            <if test="checkpointId != null  and checkpointId != ''">and checkpoint_id = #{checkpointId}</if>
+            <if test="checkpointName != null  and checkpointName != ''">and checkpoint_name like concat('%', #{checkpointName}, '%')</if>
+            <if test="checkpointCard != null  and checkpointCard != ''">and checkpoint_card = #{checkpointCard}</if>
+            <if test="fence != null  and fence != ''">and fence = #{fence}</if>
         </where>
     </select>
-    
+
     <select id="selectTlInspectionDeviceTrailById" parameterType="Long" resultMap="TlInspectionDeviceTrailResult">
         <include refid="selectTlInspectionDeviceTrailVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="selectListByDate" resultMap="TlInspectionDeviceTrailResult">
+        <include refid="selectTlInspectionDeviceTrailVo"/>
+        where date_format(create_time,'%Y-%m-%d') = #{date}
+        order by create_time asc
+    </select>
+
     <insert id="insertTlInspectionDeviceTrail" parameterType="TlInspectionDeviceTrail" useGeneratedKeys="true" keyProperty="id">
         insert into tl_inspection_device_trail
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -49,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkpointCard != null">checkpoint_card,</if>
             <if test="fence != null">fence,</if>
             <if test="createTime != null">create_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceId != null">#{deviceId},</if>
             <if test="deviceName != null">#{deviceName},</if>
@@ -59,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkpointCard != null">#{checkpointCard},</if>
             <if test="fence != null">#{fence},</if>
             <if test="createTime != null">#{createTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTlInspectionDeviceTrail" parameterType="TlInspectionDeviceTrail">
@@ -78,11 +93,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteTlInspectionDeviceTrailById" parameterType="Long">
-        delete from tl_inspection_device_trail where id = #{id}
+        delete
+        from tl_inspection_device_trail
+        where id = #{id}
     </delete>
 
     <delete id="deleteTlInspectionDeviceTrailByIds" parameterType="String">
-        delete from tl_inspection_device_trail where id in 
+        delete from tl_inspection_device_trail where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>