任务提交 导出完成

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

@@ -115,5 +115,11 @@ public class TaskResult implements Serializable {
      */
     private Long berthingId;
 
+    /**
+     * 停泊点策略ID
+     */
+    private Long stopId;
+
+
 }
 

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

@@ -9,10 +9,12 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.util.MapUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.system.domain.*;
+import com.ruoyi.system.dto.PrintExcelDTO;
 import com.ruoyi.system.dto.TaskResultSortDTO;
 import com.ruoyi.system.dto.WaterLevelDTO;
 import com.ruoyi.system.mapper.*;
@@ -20,12 +22,17 @@ import com.ruoyi.system.paramet.AchievementQuery;
 import com.ruoyi.system.paramet.ScattperPlotQuery;
 import com.ruoyi.system.paramet.WaterLevelQuery;
 import com.ruoyi.system.service.AchievementService;
+import com.ruoyi.system.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -51,6 +58,12 @@ public class AchievementServiceImpl implements AchievementService {
     @Resource
     private BerthingPointMapper berthingPointMapper;
 
+    @Resource
+    private SiteService siteService;
+    @Autowired
+    private BerthingPointConfigMapper berthingPointConfigMapper;
+
+
     @Override
     public Page<TaskResult> queryAchievement(AchievementQuery achievementQuery){
         if (achievementQuery.getPage() == null || achievementQuery.getSize() == null) {
@@ -99,12 +112,22 @@ public class AchievementServiceImpl implements AchievementService {
             if (siteInfo == null){
                 throw new BaseException("该站点不存在");
             }
+            //查站点详情
+            SiteConfig siteConfig = siteService.queryConfig(siteInfo.getSiteId());
+            if (siteConfig ==  null){
+                throw new BaseException("该站点配置不存在");
+            }
 
             //拿断面数据
             BerthingPoint berthingPoint = berthingPointMapper.queryById(taskResult.getBerthingId());
             if (berthingPoint == null){
                 throw new BaseException("断面不存在");
             }
+            //拿停泊点数据
+            BerthingPointConfig berthingPointConfig = berthingPointConfigMapper.queryById(taskResult.getStopId());
+            if (berthingPointConfig == null){
+                throw new BaseException("停泊点配置不存在");
+            }
 
             OutputStream outputStream = response.getOutputStream();
             // 模版文件
@@ -121,40 +144,124 @@ public class AchievementServiceImpl implements AchievementService {
             map.put("flowsum", taskResult.getFlowsum());
             map.put("width", taskResult.getWidth());
             map.put("waterlevel",taskResult.getWaterlevel());
-
+            map.put("acreagesum",taskResult.getAcreagesum());
             List<Double> WspeedsList = JSONUtil.parseArray(taskResult.getWspeeds()).toList(Double.class);
             double averageWspeed = WspeedsList.stream().mapToDouble(d -> d).average().orElse(Double.NaN);
+            BigDecimal averageWspeedBigDecimal = new BigDecimal(averageWspeed).setScale(2, BigDecimal.ROUND_HALF_UP);
             Double maxWspeed = WspeedsList.stream().max(Double::compareTo).orElse(Double.NaN);
-
             List<Double> waterlevelList = JSONUtil.parseArray(taskResult.getWaterlevels()).toList(Double.class);
             double averageWaterlevel = waterlevelList.stream().mapToDouble(d -> d).average().orElse(Double.NaN);
+            BigDecimal averageWaterlevelBigDecimal = new BigDecimal(averageWaterlevel).setScale(2, BigDecimal.ROUND_HALF_UP);
             Double maxWaterlevel = waterlevelList.stream().max(Double::compareTo).orElse(Double.NaN);
-
-            map.put("agWaterlevels",String.valueOf(averageWaterlevel));
+            map.put("agWaterlevels",averageWaterlevelBigDecimal.toString());
             map.put("maxWaterlevels",String.valueOf(maxWaterlevel));
-            map.put("agWspeeds",String.valueOf(averageWspeed));
+            map.put("agWspeeds",averageWspeedBigDecimal.toString());
             map.put("maxWspeeds",String.valueOf(maxWspeed));
-
             excelWriter.fill(map, writeSheet);
 
-//            //列表
-//            List<Map<String, Object>> dataList = new ArrayList<>();
-//            //列表
-//            List<Map<String, Object>> pgList = new ArrayList<>();
-//
-//            for (int i = 0; i < 3; i++) {
-//                Map<String, Object> data = MapUtils.newHashMap();
-//                data.put("index", i);
-//                dataList.add(data);
-//            }
-//
-//
-//            Map<String, Object> data = MapUtils.newHashMap();
-//            dataList = insertEmptyDataOnEvenRows(dataList, data);
-//            pgList  =  insertEmptyDataOnEvenRows(pgList, data);
-//
-//            excelWriter.fill(new FillWrapper("details", dataList), writeSheet);
-//            excelWriter.fill(new FillWrapper("pg", pgList), writeSheet);
+            //拿断面数据
+            List<PrintExcelDTO> positionsList = JSONUtil.toList(berthingPoint.getPositions(), PrintExcelDTO.class);
+            //组装列表
+            List<Map<String, Object>> dataList = new ArrayList<>();
+            List<Map<String, Object>> pgList = new ArrayList<>();
+            List<Double> taskX = JSONUtil.toList(taskResult.getPositions(), Double.class);
+            List<Double> taskY = JSONUtil.toList(taskResult.getElevations(), Double.class);
+            List<String> pointConfigfactors = JSONUtil.toList(berthingPointConfig.getFactors(), String.class);
+            List<String> taskWspeeds = JSONUtil.toList(taskResult.getWspeeds(), String.class);
+            List<String> taskStopwspeeds = JSONUtil.toList(taskResult.getStopwspeeds(), String.class);
+            List<String> tasKPartwspeeds = JSONUtil.toList(taskResult.getPartwspeeds(), String.class);
+            List<String> acreages = JSONUtil.toList(taskResult.getAcreages(), String.class);
+            List<String> taskFlows = JSONUtil.toList(taskResult.getFlows(), String.class);
+
+            int pnIndex = 0;
+            for (int i = 0; i < positionsList.size(); i++) {
+                Map<String, Object> data = MapUtils.newHashMap();
+                if (i == 0) {
+                    String str = siteConfig.getLocal() == 0 ? "左水边" : "右水边";
+                    data.put("index", str);
+                } else if (i == positionsList.size() - 1) {
+                    String str = siteConfig.getLocal() == 1 ? "左水边" : "右水边";
+                    data.put("index", str);
+                } else {
+                    data.put("index", String.valueOf(i));
+                }
+                data.put("x", positionsList.get(i).getX().toString());
+                data.put("y", positionsList.get(i).getY().toString());
+                data.put("waterlevel",taskResult.getWaterlevel());
+                data.put("subWlevel",BigDecimal.valueOf(taskResult.getWaterlevel()).subtract(BigDecimal.valueOf(positionsList.get(i).getY())));
+
+                if (pnIndex < taskX.size()) {
+                    if (taskX.get(pnIndex).equals(positionsList.get(i).getX()) && taskY.get(pnIndex).equals(positionsList.get(i).getY())) {
+                        data.put("speed", String.valueOf(pnIndex + 1));
+                        data.put("time", "12:00");
+                        data.put("factors", pointConfigfactors.get(pnIndex));
+                        data.put("wspeeds", taskWspeeds.get(pnIndex));
+                        data.put("stopwspeeds", taskStopwspeeds.get(pnIndex));
+                        pnIndex = pnIndex + 1;
+                    } else {
+                        data.put("speed", "");
+                        data.put("time", "");
+                        data.put("factors", "");
+                        data.put("wspeeds", "");
+                        data.put("stopwspeeds", "");
+                    }
+                } else {
+                    data.put("speed", "");
+                    data.put("time", "");
+                    data.put("factors", "");
+                    data.put("wspeeds", "");
+                    data.put("stopwspeeds", "");
+                }
+                dataList.add(data);
+            }
+            pnIndex = 0;
+            //新循环
+            for (int i = 0; i < positionsList.size(); i++) {
+                Map<String, Object> pgData = MapUtils.newHashMap();
+                if (i < positionsList.size() - 1) {
+                    if (pnIndex < taskX.size()) {
+                        if (taskX.get(pnIndex).equals(positionsList.get(i).getX()) && taskY.get(pnIndex).equals(positionsList.get(i).getY())) {
+                            pgData.put("partwspeeds", tasKPartwspeeds.get(pnIndex));
+                            if (i < 2) {
+                                pgData.put("add", acreages.get(0));//部分
+                            } else {
+                                BigDecimal bd1 = new BigDecimal(acreages.get(i));
+                                BigDecimal bd2 = new BigDecimal(acreages.get(i - 1));
+                                BigDecimal add = bd1.add(bd2);
+                                pgData.put("add", add.toString());
+                            }
+                            pgData.put("flows", taskFlows.get(pnIndex));//部分流量
+                            pnIndex = pnIndex + 1;
+                        } else {
+                            pgData.put("partwspeeds","");
+                            pgData.put("add", "");
+                            pgData.put("flows", "");
+                        }
+                    }
+                    Map<String, Object> temp1 = dataList.get(i);
+                    Map<String, Object> temp2 = dataList.get(i + 1);
+                    // 将字符串转换为BigDecimal
+                    BigDecimal bd1 = new BigDecimal(temp1.get("subWlevel").toString());
+                    BigDecimal bd2 = new BigDecimal(temp2.get("subWlevel").toString());
+                    // 求和
+                    BigDecimal sum = bd1.add(bd2);
+                    // 求平均值
+                    BigDecimal average = sum.divide(new BigDecimal(2), 2, RoundingMode.HALF_UP);
+                    pgData.put("subWlevel", average.toString());  //平均水深
+                    bd1 = new BigDecimal(temp1.get("x").toString());
+                    bd2 = new BigDecimal(temp2.get("x").toString());
+                    BigDecimal subx = bd2.subtract(bd1);
+                    pgData.put("subx", subx.toString()); //间距
+                    pgData.put("acreages", acreages.get(i)); //垂线间
+                    pgList.add(pgData);
+                }
+            }
+
+
+            dataList = insertEmptyDataOnEvenRows(dataList);
+            pgList = insertEmptyDataOnEvenRows(pgList);
+            excelWriter.fill(new FillWrapper("details", dataList), writeSheet);
+            excelWriter.fill(new FillWrapper("pg", pgList), writeSheet);
 
             // 设置输出流格式以及文件名：
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -244,12 +351,12 @@ public class AchievementServiceImpl implements AchievementService {
 
 
 
-    public static <T> List<T> insertEmptyDataOnEvenRows(List<T> list, T emptyValue) {
+    public static <T> List<T> insertEmptyDataOnEvenRows(List<T> list) {
         List<T> modifiedList = new ArrayList<>(list.size() * 2 - 1); // 预估新列表的大小
         for (int i = 0; i < list.size(); i++) {
             modifiedList.add(list.get(i));  // 添加原始元素
             if (i < list.size() - 1) {  // 避免在最后一个元素后插入
-                modifiedList.add(emptyValue);  // 在每个元素后插入空白数据
+                modifiedList.add(list.get(i));  // 在每个元素后插入空白数据
             }
         }
         return modifiedList;

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

@@ -258,12 +258,15 @@ public class BerthingServiceImpl implements BerthingService {
                 berthingPointConfig.setId(siteInfo.getId());
                 res =  berthingPointConfigMapper.insert(berthingPointConfig) > 0;
             } else {
-                //更新
+                //先置旧停泊点策略无效 再新插入一条
+                berthingPointConfig.setIsDel(1);
+                berthingPointConfigMapper.update(berthingPointConfig);
+                berthingPointConfig.setStopId(0L);
                 berthingPointConfig.setPositions(JSONUtil.toJsonStr(positions));
                 berthingPointConfig.setPlanid(berthingPointConfigDTO.getPlanid());
                 berthingPointConfig.setWlevel(berthingPointConfigDTO.getWlevel());
                 berthingPointConfig.setFactors(JSONUtil.toJsonStr(berthingPointConfigDTO.getFactors()));
-                res =  berthingPointConfigMapper.update(berthingPointConfig) > 0;
+                res =  berthingPointConfigMapper.insert(berthingPointConfig) > 0;
             }
             //TODO 下发配置
             String topic = "down/" + siteInfo.getDeviceId() + "/stopPosition";

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

@@ -1,6 +1,5 @@
 package com.ruoyi.system.service.impl;
 
-import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.TypeReference;
@@ -10,7 +9,6 @@ import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ReportDataService;
 import com.ruoyi.system.service.SaveDataService;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.weaver.Position;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -55,6 +53,8 @@ public class SaveDataServiceImpl implements SaveDataService {
     @Resource
     private BerthingPointMapper berthingPointMapper;
 
+
+
     @Override
     public void saveDate(String data, String topics) {
         String[] topicsList = topics.split("/");
@@ -306,6 +306,12 @@ public class SaveDataServiceImpl implements SaveDataService {
                 log.error("测流结果上报 查询断面信息失败 站码:{}", taskResult.getId());
                 return;
             }
+            BerthingPointConfig berthingPointConfig = berthingPointConfigMapper.queryByPlanid(siteInfo.getSiteId(), taskResult.getPlanid());
+            if (berthingPointConfig == null) {
+                log.error("测流结果上报 查询停泊点信息失败 站码:{}", taskResult.getId());
+                return;
+            }
+            taskResult.setStopId(berthingPointConfig.getStopId());
             taskResult.setBerthingId(berthingPoint.getBerthingId());
             taskResult.setResultId(one.getResultId());
             taskResult.setStatus(2);

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

@@ -46,6 +46,7 @@
             <if test="stopPointQuery.siteId != null">
                 and a.site_id = #{stopPointQuery.siteId}
             </if>
+            and a.is_del = 0
         </where>
         order by a.wlevel desc
     </select>

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

@@ -26,6 +26,7 @@
         <result property="partwspeeds" column="partwspeeds" jdbcType="VARCHAR"/>
         <result property="waterlevel" column="waterlevel" jdbcType="NUMERIC"/>
         <result property="berthingId" column="berthing_id" jdbcType="INTEGER"/>
+        <result property="stopId" column="stop_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <resultMap type="com.ruoyi.system.dto.TaskResultSortDTO" id="TaskResultSortDTOMap">
@@ -38,7 +39,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="TaskResultMap">
         select
-            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id
+            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id
         from task_result
         where result_id = #{resultId}
     </select>
@@ -46,7 +47,7 @@
     <!--查询单个-->
     <select id="queryByTaskid" resultMap="TaskResultMap">
         select
-            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id
+            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id
         from task_result
         where taskid = #{taskid}
         limit 1
@@ -55,7 +56,7 @@
     <!--查询单个-->
     <select id="queryBySiteIdOne" resultMap="TaskResultMap">
         select
-            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id
+            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id
         from task_result
         where site_id = #{siteId}
         order by create_time desc
@@ -76,7 +77,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="TaskResultMap">
         select
-            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id
+            result_id, id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id
         from task_result
         <where>
             <if test="achievementQuery.siteId != null">
@@ -160,28 +161,31 @@
             <if test="berthingId != null">
                 and berthing_id = #{berthingId}
             </if>
+            <if test="stopId != null">
+                and stop_id = #{stopId}
+            </if>
         </where>
     </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="resultId" useGeneratedKeys="true">
-        insert into task_result(id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id)
-        values (#{id}, #{type}, #{taskid}, #{starttime}, #{endtime}, #{width}, #{planid}, #{acreagesum}, #{flowsum}, #{positions}, #{elevations}, #{acreages}, #{waterlevels}, #{wspeeds}, #{flows}, #{siteId}, #{createTime}, #{status}, #{stopwspeeds}, #{partwspeeds}, #{waterlevel}, #{berthingId})
+        insert into task_result(id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id)
+        values (#{id}, #{type}, #{taskid}, #{starttime}, #{endtime}, #{width}, #{planid}, #{acreagesum}, #{flowsum}, #{positions}, #{elevations}, #{acreages}, #{waterlevels}, #{wspeeds}, #{flows}, #{siteId}, #{createTime}, #{status}, #{stopwspeeds}, #{partwspeeds}, #{waterlevel}, #{berthingId}, #{stopId})
     </insert>
 
     <insert id="insertBatch" keyProperty="resultId" useGeneratedKeys="true">
-        insert into task_result(id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id)
+        insert into task_result(id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.id}, #{entity.type}, #{entity.taskid}, #{entity.starttime}, #{entity.endtime}, #{entity.width}, #{entity.planid}, #{entity.acreagesum}, #{entity.flowsum}, #{entity.positions}, #{entity.elevations}, #{entity.acreages}, #{entity.waterlevels}, #{entity.wspeeds}, #{entity.flows}, #{entity.siteId}, #{entity.createTime}, #{entity.status}, #{entity.stopwspeeds}, #{entity.partwspeeds}, #{entity.waterlevel}, #{entity.berthingId})
+        (#{entity.id}, #{entity.type}, #{entity.taskid}, #{entity.starttime}, #{entity.endtime}, #{entity.width}, #{entity.planid}, #{entity.acreagesum}, #{entity.flowsum}, #{entity.positions}, #{entity.elevations}, #{entity.acreages}, #{entity.waterlevels}, #{entity.wspeeds}, #{entity.flows}, #{entity.siteId}, #{entity.createTime}, #{entity.status}, #{entity.stopwspeeds}, #{entity.partwspeeds}, #{entity.waterlevel}, #{entity.berthingId}, #{entity.stopId})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="resultId" useGeneratedKeys="true">
-        insert into task_result(id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id)
+        insert into task_result(id, type, taskid, starttime, endtime, width, planid, acreagesum, flowsum, positions, elevations, acreages, waterlevels, wspeeds, flows, site_id, create_time, status, stopwspeeds, partwspeeds, waterlevel, berthing_id, stop_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id}, #{entity.type}, #{entity.taskid}, #{entity.starttime}, #{entity.endtime}, #{entity.width}, #{entity.planid}, #{entity.acreagesum}, #{entity.flowsum}, #{entity.positions}, #{entity.elevations}, #{entity.acreages}, #{entity.waterlevels}, #{entity.wspeeds}, #{entity.flows}, #{entity.siteId}, #{entity.createTime}, #{entity.status}, #{entity.stopwspeeds}, #{entity.partwspeeds}, #{entity.waterlevel}, #{entity.berthingId})
+            (#{entity.id}, #{entity.type}, #{entity.taskid}, #{entity.starttime}, #{entity.endtime}, #{entity.width}, #{entity.planid}, #{entity.acreagesum}, #{entity.flowsum}, #{entity.positions}, #{entity.elevations}, #{entity.acreages}, #{entity.waterlevels}, #{entity.wspeeds}, #{entity.flows}, #{entity.siteId}, #{entity.createTime}, #{entity.status}, #{entity.stopwspeeds}, #{entity.partwspeeds}, #{entity.waterlevel}, #{entity.berthingId}, #{entity.stopId})
         </foreach>
         on duplicate key update
 id = values(id),
@@ -205,7 +209,8 @@ status = values(status),
 stopwspeeds = values(stopwspeeds),
 partwspeeds = values(partwspeeds),
 waterlevel = values(waterlevel),
-berthing_id = values(berthing_id)
+berthing_id = values(berthing_id),
+stop_id = values(stop_id)
     </insert>
 
     <!--通过主键修改数据-->
@@ -278,6 +283,9 @@ berthing_id = values(berthing_id)
             <if test="berthingId != null">
                 berthing_id = #{berthingId},
             </if>
+            <if test="stopId != null">
+                stop_id = #{stopId},
+            </if>
         </set>
         where result_id = #{resultId}
     </update>

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

@@ -8,7 +8,6 @@ import com.ruoyi.system.service.DirectiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;