From 8348c3f2884aafdbb04ef34283ff2d0318ea134b Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 21 Feb 2024 09:16:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E6=84=9F=E5=99=A8=E7=9A=84=E4=B8=BB?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xydl/cac/controller/ModevController.java | 2 +- .../com/xydl/cac/controller/NSensorController.java | 8 ++++++++ src/main/java/com/xydl/cac/entity/NSensor.java | 2 +- .../java/com/xydl/cac/model/SensorUpdateModel.java | 14 ++++++++++++++ .../java/com/xydl/cac/service/NSensorService.java | 3 +++ .../com/xydl/cac/service/impl/DataServiceImpl.java | 2 -- .../xydl/cac/service/impl/NSensorServiceImpl.java | 13 +++++++++++++ 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/xydl/cac/model/SensorUpdateModel.java diff --git a/src/main/java/com/xydl/cac/controller/ModevController.java b/src/main/java/com/xydl/cac/controller/ModevController.java index 8d97447..79c3603 100644 --- a/src/main/java/com/xydl/cac/controller/ModevController.java +++ b/src/main/java/com/xydl/cac/controller/ModevController.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; import java.util.List; @RestController -@Api(tags = {"监测设备相关接口"}) +@Api(tags = {"旧监测设备相关接口"}) @RequestMapping("modev") @Slf4j public class ModevController extends BasicController { diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java index e68ec61..4a08524 100644 --- a/src/main/java/com/xydl/cac/controller/NSensorController.java +++ b/src/main/java/com/xydl/cac/controller/NSensorController.java @@ -6,6 +6,7 @@ import com.xydl.cac.exception.BusinessException; import com.xydl.cac.model.ConditionModel; import com.xydl.cac.model.Response; import com.xydl.cac.model.SensorDetail; +import com.xydl.cac.model.SensorUpdateModel; import com.xydl.cac.service.NSensorService; import com.xydl.cac.service.ParamBindService; import com.xydl.cac.service.ReportService; @@ -75,6 +76,13 @@ public class NSensorController extends BasicController { return Response.success("OK"); } + @PostMapping("batchUpdate") + @ApiOperation("批量更新") + public Response batchUpdate(@Validated @RequestBody SensorUpdateModel model) throws Exception { + service.batchUpdate(model); + return Response.success("OK"); + } + @PostMapping("delete") @ApiOperation("删除") public Response delete(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id) { diff --git a/src/main/java/com/xydl/cac/entity/NSensor.java b/src/main/java/com/xydl/cac/entity/NSensor.java index fce9772..3b5073c 100644 --- a/src/main/java/com/xydl/cac/entity/NSensor.java +++ b/src/main/java/com/xydl/cac/entity/NSensor.java @@ -58,7 +58,7 @@ public class NSensor { private Integer status; @Column(name = "zsb_id") - @ApiModelProperty("主设备编号") + @ApiModelProperty("主设备Id") private Integer zsbId; @Column(name = "icd_id") diff --git a/src/main/java/com/xydl/cac/model/SensorUpdateModel.java b/src/main/java/com/xydl/cac/model/SensorUpdateModel.java new file mode 100644 index 0000000..6569c23 --- /dev/null +++ b/src/main/java/com/xydl/cac/model/SensorUpdateModel.java @@ -0,0 +1,14 @@ +package com.xydl.cac.model; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class SensorUpdateModel { + @NotNull(message = "id列表不能为空") + private List idList; + @NotNull(message = "主设备Id不能为空") + private Integer zsbId; +} diff --git a/src/main/java/com/xydl/cac/service/NSensorService.java b/src/main/java/com/xydl/cac/service/NSensorService.java index a10aac0..b803f48 100644 --- a/src/main/java/com/xydl/cac/service/NSensorService.java +++ b/src/main/java/com/xydl/cac/service/NSensorService.java @@ -3,6 +3,7 @@ package com.xydl.cac.service; import com.xydl.cac.entity.NSensor; import com.xydl.cac.model.ConditionModel; import com.xydl.cac.model.SensorDetail; +import com.xydl.cac.model.SensorUpdateModel; import org.springframework.data.domain.Page; import java.util.Collection; @@ -18,6 +19,8 @@ public interface NSensorService { void update(NSensor item) throws Exception; + void batchUpdate(SensorUpdateModel model) throws Exception; + void delete(Integer id); SensorDetail> getDetail(ConditionModel model) throws Exception; diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java index 16f05d5..f0ecf09 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -111,7 +111,6 @@ public class DataServiceImpl implements DataService { String sqlCount = "SELECT count(*)" + sqlFrom + sqlWhere; String sql = sqlSelect + sqlFrom + sqlWhere + sqlOrder + sqlLimit; - log.info(sql); Long count = jdbcTemplate.queryForObject(sqlCount, Long.class); List> content = jdbcTemplate.queryForList(sql); @@ -152,7 +151,6 @@ public class DataServiceImpl implements DataService { String sqlCount = "SELECT count(*)" + sqlFrom + sqlWhere; String sql = sqlSelect + sqlFrom + sqlWhere + sqlOrder + sqlLimit; - log.info(sql); Long count = jdbcTemplate.queryForObject(sqlCount, Long.class); List> content = jdbcTemplate.queryForList(sql); diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java index 0260d43..fff8e4c 100644 --- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java @@ -5,6 +5,7 @@ import com.xydl.cac.exception.BusinessException; import com.xydl.cac.model.ConditionModel; import com.xydl.cac.model.OnePage; import com.xydl.cac.model.SensorDetail; +import com.xydl.cac.model.SensorUpdateModel; import com.xydl.cac.repository.NPointRepository; import com.xydl.cac.repository.NSensorRepository; import com.xydl.cac.service.DataService; @@ -62,6 +63,18 @@ public class NSensorServiceImpl implements NSensorService { repository.save(item); } + @Override + public void batchUpdate(SensorUpdateModel model) throws Exception { + for (Integer id : model.getIdList()) { + Optional optional = repository.findById(id); + if (!optional.isPresent()) { + throw new BusinessException("未找到该装置" + id); + } + NSensor sensor = optional.get(); + sensor.setZsbId(model.getZsbId()); + } + } + @Override public void delete(Integer id) { repository.deleteById(id);