Browse Source

修改无人机算法进度问题

master
lijiuwei 5 months ago
parent
commit
4fcc635394
3 changed files with 20 additions and 1 deletions
  1. +12
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  2. +2
    -0
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java
  3. +6
    -0
      inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

+ 12
- 1
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -1514,7 +1514,18 @@ public class PatrolResultController extends BaseController {
if (!resultList.isEmpty()) {
logger.info(Color.CYAN + "+++++++ callAlgorithm start +++++++" + Color.END);
if (jsonRootBean.getTotalNumber() == null) {
jsonRootBean.setTotalNumber(jsonRootBean.getItems().size());
logger.info("jsonRootBean.getTotalNumber() == null");
String taskId = String.valueOf(tasks.get(0).getTaskId());
logger.info("taskId: {}", taskId);
List<String> algList = patrolResultMapper.selectAlgList(taskId);
logger.info("algList: {}", algList.toString());
int algCount = 0;
for (String alg : algList) {
String[] sub = alg.split(",");
algCount += sub.length;
}
logger.info("algCount: {}", algCount);
jsonRootBean.setTotalNumber(algCount);
}
callRemoteAlgorithm(jsonRootBean.getTotalNumber(), resultList);
logger.info(Color.CYAN + "+++++++ callAlgorithm end +++++++" + Color.END);


+ 2
- 0
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java View File

@ -116,4 +116,6 @@ public interface PatrolResultMapper {
Map<String, String> selectDeviceNameById(BasePointAreaInfo basePointAreaInfo);
List<String> selectAlgList(String taskId);
}

+ 6
- 0
inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml View File

@ -1121,4 +1121,10 @@
<if test="eqpBookId != null and eqpBookId != ''">a.eqp_book_id = #{eqpbookId}</if>
<if test="channelId != null and channelId != ''">b.channel_id = #{channelId}</if>
</select>
<select id="selectAlgList" parameterType="String" resultType="String">
SELECT alg_subtype_ids FROM basedata_patrolpoint WHERE patrol_point_id IN (
SELECT device_id FROM patrol_task_info WHERE task_major_id = #{taskId}
)
</select>
</mapper>

Loading…
Cancel
Save