From 1e0d464534836999a5cd8ce7fde16eb9058d7770 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 19 Sep 2022 16:04:56 +0800 Subject: [PATCH] =?UTF-8?q?PCR=E6=A3=80=E6=B5=8B=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E6=97=A0=E9=9C=80=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExamineResultController.java | 4 +- .../controller/LargeScreenController.java | 16 ++--- .../lims/service/IExamineResultService.java | 2 +- .../impl/ExamineResultServiceImpl.java | 69 +++++++++++++++++-- .../user/controller/UserController.java | 4 +- .../user/service/impl/UserServiceImpl.java | 6 ++ 6 files changed, 82 insertions(+), 19 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java index 4021d66..27a94f2 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java @@ -1390,7 +1390,7 @@ public class ExamineResultController extends BladeController { * 上传检测结果照片 */ @PostMapping("/resultPicture") - public R resultPicture(@RequestParam MultipartFile file) { - return R.data(service.resultPicture(file)); + public R resultPicture(@RequestParam MultipartFile file, @RequestParam String examineId) { + return R.data(service.resultPicture(file,examineId)); } } \ No newline at end of file diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/LargeScreenController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/LargeScreenController.java index e919b99..e37177c 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/LargeScreenController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/LargeScreenController.java @@ -76,9 +76,9 @@ public class LargeScreenController extends BladeController { int wt = entrtrustService.count(wrapper); double wt1 = 0.00; wt1 += wt; - double rate1 = 0; + int rate1 = 0; if (count > 0) { - rate1 = wt1 / count * 100; + rate1 = (int) (wt1 / count * 100); } // 监督 wrapper.clear(); @@ -88,9 +88,9 @@ public class LargeScreenController extends BladeController { int jd = entrtrustService.count(wrapper); double jd1 = 0.00; jd1 += jd; - double rate2 = 0; + int rate2 = 0; if (count > 0) { - rate2 = jd1 / count * 100; + rate2 = (int) (jd1 / count * 100); } // 仲裁 wrapper.clear(); @@ -100,9 +100,9 @@ public class LargeScreenController extends BladeController { int zc = entrtrustService.count(wrapper); double zc1 = 0.00; zc1 += zc; - double rate3 = 0; + int rate3 = 0; if (count > 0) { - rate3 = zc1 / count * 100; + rate3 = (int) (zc1 / count * 100); } // 门诊 wrapper.clear(); @@ -112,9 +112,9 @@ public class LargeScreenController extends BladeController { int mz = entrtrustService.count(wrapper); double mz1 = 0.00; mz1 += mz; - double rate4 = 0; + int rate4 = 0; if (count > 0) { - rate4 = mz1 / count * 100; + rate4 = (int) (mz1 / count * 100); } Map map = new HashMap<>(); map.put("yearPlan", yearPlan); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java index ea29570..fe30853 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java @@ -19,5 +19,5 @@ public interface IExamineResultService extends BaseService { void resultCommit(ExamineResult examineResult) throws Exception; - String resultPicture(MultipartFile file); + String resultPicture(MultipartFile file, String examineId); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java index 01e2ef7..af31a7f 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java @@ -166,7 +166,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ExamineResult::getExamineId, examineId); + ExamineResult examineResult1 = this.getOne(wrapper); + + if (examineResult1 != null) { + String name = examineResult1.getPicturePath() + "," + fileName; + examineResult1.setPicturePath(name); + this.updateById(examineResult1); + } else { + ExamineResult examineResult = new ExamineResult(); + examineResult.setExamineId(Long.parseLong(examineId)); + examineResult.setPicturePath(fileName); + this.save(examineResult); + } + } return fileName; } @@ -203,9 +220,9 @@ public class ExamineResultServiceImpl extends BaseServiceImpl examineQueryWrapper = new LambdaQueryWrapper<>(); examineQueryWrapper.eq(Examine::getETaskId, eTaskId); List list = examineService.list(examineQueryWrapper); @@ -225,8 +242,11 @@ public class ExamineResultServiceImpl extends BaseServiceImpl path = entry.getPath(); + // 所有上传过的照片 + String[] split = examineResult.getPicturePath().split(","); if (CollectionUtils.isNotEmpty(path)) { String picturePath = ""; + // 过滤无用照片并删除 + for (String s : split) { + boolean contains = path.contains(s); + if (!contains) { + // 获取图片路径 + String realPath1 = realPath + s; + File file = new File(realPath1); + if (file.exists()) { + file.delete(); + } + } + } + if (path.size() > 1) { for (String s : path) { String s1 = s + ","; @@ -298,6 +332,16 @@ public class ExamineResultServiceImpl extends BaseServiceImpl path = entry.getPath(); + String[] split = entry.getPicturePath().split(","); if (CollectionUtils.isNotEmpty(path)) { String picturePath = ""; + // 过滤无用照片并删除 + for (String s : split) { + boolean contains = path.contains(s); + if (!contains) { + // 获取图片路径 + String realPath1 = realPath + s; + File file = new File(realPath1); + if (file.exists()) { + file.delete(); + } + } + } if (path.size() > 1) { for (String s : path) { String s1 = s + ","; diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java index a30df0f..4e1b5d2 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -428,9 +428,9 @@ public class UserController { double actual = 0.00; actual += count; // 满编率 - double rate = 0; + int rate = 0; if (rated > 0) { - rate = actual / rated * 100; + rate = (int) (actual / rated * 100); } // 硕士及以上人数 wrapper.clear(); diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 451c799..ca0334a 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -119,6 +119,12 @@ public class UserServiceImpl extends BaseServiceImpl implement file.delete(); } } + if (byId.getAvatar() != null && !"".equals(byId.getAvatar()) && !user.getAvatar().equals(byId.getAvatar())) { + File file = new File(realPath + byId.getAvatar()); + if (file.exists()) { + file.delete(); + } + } user.setPassword(null); if (!"".equals(user.getElectronicSignature()) && user.getElectronicSignature() != null) { Random random = new Random();