From ddebb2ea352012c10ec31a9d9774b0320af4caac Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 10 Jun 2021 16:48:15 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java index d306c56..4e79d21 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java @@ -180,7 +180,42 @@ } @Override + @Transactional public VersionDTO updateSensorUnits(VersionSensorUnitForm form) { - return null; + //������������������ + VersionDTO dto = new VersionDTO(); + //������ + List<VersionSensorUnit> sensorUnits = form.getSensorUnits(); + Integer versionId = form.getVersionId(); + //������������������������������������ + UpdateWrapper deleteWrapper = new UpdateWrapper(); + deleteWrapper.eq("version_id",versionId); + deleteWrapper.set("is_delete",Constants.DELETE); + versionSensorUnitMapper.update(null,deleteWrapper); + //��������������������������������� + for (VersionSensorUnit sensorUnit : sensorUnits) { + sensorUnit.setVersionId(versionId); + versionSensorUnitMapper.insert(sensorUnit); + } + //������������������ + dto.setCode(ResponseCodeEnum.SUCCESS.getCode()); + dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); + return dto; + } + + @Override + public VersionDTO queryVersionById(Integer id) { + //������������������ + VersionDTO dto = new VersionDTO(); + //������������������������������������ + List<Integer> versionsIds = new ArrayList<>(); + versionsIds.add(id); + List<Version> version = new ArrayList<>(); + version = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds); + //������������������ + dto.setCode(ResponseCodeEnum.SUCCESS.getCode()); + dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); + dto.setVersion(version.get(0)); + return dto; } } -- Gitblit v1.8.0