任务提交 通知和垂线数据加入taskID

ruoyi-system/src/main/java/com/ruoyi/system/domain/MeasureUpload.java

@@ -23,6 +23,7 @@ public class MeasureUpload implements Serializable {
      * 停泊点策略编号
      */
     private Long planid;
+
 /**
      * 停泊点索引号
      */
@@ -49,6 +50,10 @@ public class MeasureUpload implements Serializable {
      * 站码
      */
     private String id;
+    /**
+     * 任务编号
+     */
+    private String taskid;
 
 }
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MeasureUploadMapper.java

@@ -31,7 +31,7 @@ public interface MeasureUploadMapper {
      * @param siteId 主键
      * @return 实例对象
      */
-    List<MeasureUpload> queryBySiteIdTime(@Param("siteId") Long siteId, @Param("createTime") Date createTime);
+    List<MeasureUpload> queryBySiteIdTime(@Param("siteId") Long siteId, @Param("createTime") Date createTime, @Param("taskid") String taskid);
 
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TaskNoticeMapper.java

@@ -25,11 +25,11 @@ public interface TaskNoticeMapper {
     /**
      * 查询指定行数据
      *
-     * @param taskNotice 查询条件
-     * @param pageable         分页对象
+     * @param siteId,taskid 查询条件
+     * @param page        分页对象
      * @return 对象列表
      */
-    Page<TaskNotice> queryAllByLimit(@Param("siteId") Long siteId, Page page);
+    Page<TaskNotice> queryAllByLimit(@Param("siteId") Long siteId, @Param("taskid") String taskid, Page page);
 
     /**
      * 统计总行数

ruoyi-system/src/main/java/com/ruoyi/system/service/ReportDataService.java

@@ -18,11 +18,11 @@ public interface ReportDataService {
 
     SiteRealTimeDTO siteRealTime(Long siteId);
 
-    Page<TaskNotice> taskNotice(Long siteId, Long page, Long size);
+    Page<TaskNotice> taskNotice(Long siteId, String taskId,Long page, Long size);
 
     WaterLevel getWaterLevel(Long siteId);
 
-    List<MeasureUpload> getMeasureLine (Long siteId);
+    List<MeasureUpload> getMeasureLine (Long siteId,String taskId);
 
     BerthingPointConfig getPointConfig (Long siteId);
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ReportDataServiceImpl.java

@@ -10,17 +10,14 @@ import com.ruoyi.system.dto.SiteRealTimeDTO;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ReportDataService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 
 /**
@@ -128,7 +125,7 @@ public class ReportDataServiceImpl implements ReportDataService {
 
 
     @Override
-    public Page<TaskNotice> taskNotice(Long siteId, Long page, Long size){
+    public Page<TaskNotice> taskNotice(Long siteId,String taskId,Long page,Long size){
         if (siteId == null){
             throw new BaseException("站点不存在");
         }
@@ -136,7 +133,7 @@ public class ReportDataServiceImpl implements ReportDataService {
             page = 1L;
             size = 10L;
         }
-        return taskNoticeMapper.queryAllByLimit(siteId, new Page(page,size));
+        return taskNoticeMapper.queryAllByLimit(siteId,taskId,new Page(page,size));
     }
 
 
@@ -147,15 +144,21 @@ public class ReportDataServiceImpl implements ReportDataService {
 
 
     @Override
-    public List<MeasureUpload> getMeasureLine (Long siteId){
+    public List<MeasureUpload> getMeasureLine (Long siteId, String taskId){
         //先查询最后一次开测时间
-        TaskResult taskResult = taskResultMapper.queryBySiteIdOne(siteId);
-        if (taskResult == null){
-            return null;
+        if (Strings.isBlank(taskId)){
+            TaskResult taskResult = taskResultMapper.queryBySiteIdOne(siteId);
+            if (taskResult == null){
+                return null;
+            }
+            //再按时间查询垂线信息
+            Date createTime = taskResult.getCreateTime();
+            return measureUploadMapper.queryBySiteIdTime(siteId,createTime,null);
+        } else {
+            return measureUploadMapper.queryBySiteIdTime(siteId,null,taskId);
         }
-        //再按时间查询垂线信息
-        Date createTime = taskResult.getCreateTime();
-        return measureUploadMapper.queryBySiteIdTime(siteId,createTime);
+
+
     }
 
     @Override

ruoyi-system/src/main/resources/mapper/MeasureUploadMapper.xml

@@ -11,12 +11,13 @@
         <result property="siteId" column="site_id" jdbcType="INTEGER"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
         <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="taskid" column="taskid" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="MeasureUploadMap">
         select
-            measure_id, planid, pn, wspeed, create_time, site_id, status, id
+            measure_id, planid, pn, wspeed, create_time, site_id, status, id, taskid
         from measure_upload
         where measure_id = #{measureId}
     </select>
@@ -24,15 +25,21 @@
     <!--查询多个-->
     <select id="queryBySiteIdTime" resultMap="MeasureUploadMap">
         select
-            measure_id, planid, pn, wspeed, create_time, site_id, status, id
+            measure_id, planid, pn, wspeed, create_time, site_id, status, id, taskid
         from measure_upload
-        where site_id = #{siteId} and create_time >= #{createTime}
+        where site_id = #{siteId}
+        <if test="createTime != null">
+            and create_time >= #{createTime}
+        </if>
+        <if test="taskid != null and taskid != ''">
+            and taskid = #{taskid}
+        </if>
     </select>
 
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="MeasureUploadMap">
         select
-            measure_id, planid, pn, wspeed, create_time, site_id, status, id
+            measure_id, planid, pn, wspeed, create_time, site_id, status, id, taskid
         from measure_upload
         <where>
             <if test="measureId != null">
@@ -59,6 +66,9 @@
             <if test="id != null and id != ''">
                 and id = #{id}
             </if>
+            <if test="taskid != null and taskid != ''">
+                and taskid = #{taskid}
+            </if>
         </where>
         limit #{pageable.offset}, #{pageable.pageSize}
     </select>
@@ -92,28 +102,31 @@
             <if test="id != null and id != ''">
                 and id = #{id}
             </if>
+            <if test="taskid != null and taskid != ''">
+                and taskid = #{taskid}
+            </if>
         </where>
     </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="measureId" useGeneratedKeys="true">
-        insert into measure_upload(planid, pn, wspeed, create_time, site_id, status, id)
-        values (#{planid}, #{pn}, #{wspeed}, #{createTime}, #{siteId}, #{status},#{id})
+        insert into measure_upload(planid, pn, wspeed, create_time, site_id, status, id, taskid)
+        values (#{planid}, #{pn}, #{wspeed}, #{createTime}, #{siteId}, #{status},#{id},#{taskid})
     </insert>
 
     <insert id="insertBatch" keyProperty="measureId" useGeneratedKeys="true">
-        insert into measure_upload(planid, pn, wspeed, create_time, site_id, status,id)
+        insert into measure_upload(planid, pn, wspeed, create_time, site_id, status,id, taskid)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.planid}, #{entity.pn}, #{entity.wspeed}, #{entity.createTime}, #{entity.siteId}, #{entity.status},#{entity.id})
+        (#{entity.planid}, #{entity.pn}, #{entity.wspeed}, #{entity.createTime}, #{entity.siteId}, #{entity.status},#{entity.id},#{entity.taskid})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="measureId" useGeneratedKeys="true">
-        insert into measure_upload(planid, pn, wspeed, create_time, site_id, status, id)
+        insert into measure_upload(planid, pn, wspeed, create_time, site_id, status, id, taskid)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.planid}, #{entity.pn}, #{entity.wspeed}, #{entity.createTime}, #{entity.siteId}, #{entity.status}, #{entity.id})
+            (#{entity.planid}, #{entity.pn}, #{entity.wspeed}, #{entity.createTime}, #{entity.siteId}, #{entity.status}, #{entity.id},#{entity.taskid})
         </foreach>
         on duplicate key update
         planid = values(planid),
@@ -122,7 +135,8 @@
         create_time = values(create_time),
         site_id = values(site_id),
         status = values(status),
-        id = values(id)
+        id = values(id),
+        taskid = values(taskid)
     </insert>
 
     <!--通过主键修改数据-->
@@ -150,6 +164,9 @@
             <if test="id != null">
                 id = #{id},
             </if>
+            <if test="taskid != null">
+                taskid = #{taskid},
+            </if>
         </set>
         where measure_id = #{measureId}
     </update>

ruoyi-system/src/main/resources/mapper/TaskNoticeMapper.xml

@@ -32,6 +32,9 @@ start_id, taskid, workmode, planid, create_time, site_id, id, remark, code, pn
             <if test="siteId != null">
                 and site_id= #{siteId}
             </if>
+            <if test="taskid != null and taskid != ''">
+                and taskid = #{taskid}
+            </if>
         </where>
         order by create_time desc
     </select>

waterAffairs-admin/src/main/java/com/ruoyi/web/controller/tool/ReportDataController.java

@@ -56,8 +56,8 @@ public class ReportDataController {
     //即时信息
     @GetMapping(value = "/taskNotice")
     @ApiOperation("获取任务通知（及时消息）")
-    public R<Page<TaskNotice>> taskNotice(Long siteId, Long page, Long size)  {
-        return R.ok(reportDataService.taskNotice(siteId,page,size));
+    public R<Page<TaskNotice>> taskNotice(Long siteId,String taskId, Long page, Long size)  {
+        return R.ok(reportDataService.taskNotice(siteId,taskId,page,size));
     }
     //当前水位
     @GetMapping(value = "/getWaterLevel")
@@ -69,8 +69,8 @@ public class ReportDataController {
     //垂线点对应流量图
     @GetMapping(value = "/getMeasureLine")
     @ApiOperation("获取垂线点对应流量图")
-    public R<List<MeasureUpload>> getMeasureLine(Long siteId)  {
-        return R.ok(reportDataService.getMeasureLine(siteId));
+    public R<List<MeasureUpload>> getMeasureLine(Long siteId, String taskId)  {
+        return R.ok(reportDataService.getMeasureLine(siteId,taskId));
     }
 
     //垂线点对应流量图