From ae2d52827d289dd985014a63c08b0913d083b215 Mon Sep 17 00:00:00 2001 From: bsw215583320 <baoshiwei121@163.com> Date: 星期二, 09 四月 2024 08:48:38 +0800 Subject: [PATCH] 去掉opc相关业务 --- jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java | 82 ++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java index 2878189..b261d83 100644 --- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java +++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java @@ -12,7 +12,7 @@ import org.jeecg.modules.dry.entity.DryHerbInfo; import org.jeecg.modules.dry.service.*; -import org.jeecg.modules.dry.util.HerbUtil; +//import org.jeecg.modules.dry.util.HerbUtil; import org.jeecg.modules.dry.vo.CommandMessageVo; import org.jeecg.modules.dry.vo.DryHerbInfoVo; import org.jeecg.modules.dry.vo.RealTimeDataVo; @@ -36,8 +36,8 @@ @Autowired private IDryRealTimeDataService dryRealTimeDataService; - @Autowired - private HerbUtil herbUtil; +// @Autowired +// private HerbUtil herbUtil; @Autowired private IDryHerbInfoService herbInfoService; @@ -85,43 +85,43 @@ return dryRealTimeDataService.sendSocketMsg(msgVo); } - - @ApiOperation(value = "鑽潗璇嗗埆") - @PostMapping("/identify") - public Result<?> identify(@RequestParam("file") MultipartFile file) throws Exception { - try { - if (file.isEmpty()) { - throw new RuntimeException("涓婁紶鏂囦欢涓嶈兘涓虹┖"); - } - InputStream inputStream = file.getInputStream(); - List<Classifications.Classification> predict = herbUtil.predict(inputStream); - - if(predict.size()>0) { - Map<String, Double> collect = predict.stream().collect(Collectors.toMap(Classifications.Classification::getClassName, Classifications.Classification::getProbability)); - - - List<DryHerbInfoVo> voList = new ArrayList<>(); - Set<String> strings = collect.keySet(); - List<DryHerbInfo> list = herbInfoService.list(new LambdaQueryWrapper<DryHerbInfo>().in(DryHerbInfo::getPinyin, strings)); - list.forEach(item -> { - DryHerbInfoVo dryHerbInfoVo = new DryHerbInfoVo(); - BeanUtil.copyProperties(item, dryHerbInfoVo); - dryHerbInfoVo.setProbabily(collect.get(item.getPinyin())); - voList.add(dryHerbInfoVo); - }); - - List<DryHerbInfoVo> collect1 = voList.stream().sorted(Comparator.comparing(DryHerbInfoVo::getProbabily, Comparator.reverseOrder())). - collect(Collectors.toList()); - - return Result.ok(collect1); - } else { - return Result.error("AI璇嗗埆鏈嶅姟寮傚父"); - } - - } catch (Exception e) { - e.printStackTrace(); - return Result.error("AI璇嗗埆鏈嶅姟寮傚父"); - } - } +// +// @ApiOperation(value = "鑽潗璇嗗埆") +// @PostMapping("/identify") +// public Result<?> identify(@RequestParam("file") MultipartFile file) throws Exception { +// try { +// if (file.isEmpty()) { +// throw new RuntimeException("涓婁紶鏂囦欢涓嶈兘涓虹┖"); +// } +// InputStream inputStream = file.getInputStream(); +// List<Classifications.Classification> predict = herbUtil.predict(inputStream); +// +// if(predict.size()>0) { +// Map<String, Double> collect = predict.stream().collect(Collectors.toMap(Classifications.Classification::getClassName, Classifications.Classification::getProbability)); +// +// +// List<DryHerbInfoVo> voList = new ArrayList<>(); +// Set<String> strings = collect.keySet(); +// List<DryHerbInfo> list = herbInfoService.list(new LambdaQueryWrapper<DryHerbInfo>().in(DryHerbInfo::getPinyin, strings)); +// list.forEach(item -> { +// DryHerbInfoVo dryHerbInfoVo = new DryHerbInfoVo(); +// BeanUtil.copyProperties(item, dryHerbInfoVo); +// dryHerbInfoVo.setProbabily(collect.get(item.getPinyin())); +// voList.add(dryHerbInfoVo); +// }); +// +// List<DryHerbInfoVo> collect1 = voList.stream().sorted(Comparator.comparing(DryHerbInfoVo::getProbabily, Comparator.reverseOrder())). +// collect(Collectors.toList()); +// +// return Result.ok(collect1); +// } else { +// return Result.error("AI璇嗗埆鏈嶅姟寮傚父"); +// } +// +// } catch (Exception e) { +// e.printStackTrace(); +// return Result.error("AI璇嗗埆鏈嶅姟寮傚父"); +// } +// } } -- Gitblit v1.9.3