From 75d640cf3ccb808348e6fed36ff9812ab74bcdec Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Sat, 28 Dec 2024 20:54:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(iot):=20=E8=A1=A5=E5=85=85=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E3=80=81=E4=BA=8B=E4=BB=B6=E5=92=8C=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在创建和更新设备、事件和服务时，增加了对名称非空的校验
- 抛出 ConstraintException 异常，提示名称不能为空
- 优化了数据完整性验证，防止非法数据入库
---
 .../service/impl/ProductServiceImpl.java       | 18 ++++++------------
 .../iot/tsl/service/impl/EventServiceImpl.java |  6 ++++++
 .../iot/tsl/service/impl/ServeServiceImpl.java |  8 +++++++-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java
index f777868..1613e20 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java
@@ -29,8 +29,6 @@ import java.util.stream.Collectors;
 @Service
 public class ProductServiceImpl extends ServiceImpl<ProductRepository, Product> implements ProductService {
     private final ProductMapper mapper;
-    private final ParamMapper paramMapper;
-    private final ParamRepository paramRepo;
     private final ParamService paramService;
 
     /**
@@ -41,6 +39,9 @@ public class ProductServiceImpl extends ServiceImpl<ProductRepository, Product>
         if (baseMapper.findByName(dto.getName()) != null) {
             throw new ConstraintException("该设备已存在！");
         }
+        if (dto.getName() == null) {
+            throw new ConstraintException("设备名称不能为空！");
+        }
         Product product = mapper.toEntity(dto);
         save(product);
         paramService.create(dto.getParams(), product.getId(), Param.ForeignType.PRODUCT);
@@ -51,6 +52,9 @@ public class ProductServiceImpl extends ServiceImpl<ProductRepository, Product>
      */
     @Override
     public Product update(ProductDto dto, Long id) {
+        if (dto.getName() == null) {
+            throw new ConstraintException("设备名称不能为空！");
+        }
         Product product = baseMapper.selectById(id);
         mapper.convert(dto, product);
         updateById(product);
@@ -58,16 +62,6 @@ public class ProductServiceImpl extends ServiceImpl<ProductRepository, Product>
         return product;
     }
 
-    //    /**
-//     * 分页查询产品
-//     *
-//     * @param query    查询表单
-//     * @param page  分页参数
-//     */
-//    @Override
-//    public Page<Product> page(Page<Product> page, ProductQuery query) {
-//        return baseMapper.page(page, query.wrapper());
-//    }
     @Override
     public Product detail(Long id) {
         return baseMapper.selectById(id);
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/EventServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/EventServiceImpl.java
index da2185b..10a2a7a 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/EventServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/EventServiceImpl.java
@@ -29,6 +29,9 @@ public class EventServiceImpl extends ServiceImpl<EventRepository, Event> implem
         if (baseMapper.findByName(dto.getName()) != null) {
             throw new ConstraintException("该事件已存在！");
         }
+        if (dto.getName() == null) {
+            throw new ConstraintException("事件名称不能为空！");
+        }
         Event event = mapper.toEntity(dto);
         save(event);
         paramService.create(dto.getOutputs(), event.getId(), Param.ForeignType.EVENT);
@@ -39,6 +42,9 @@ public class EventServiceImpl extends ServiceImpl<EventRepository, Event> implem
      */
     @Override
     public Event update(EventDto dto, Long id) {
+        if (dto.getName() == null) {
+            throw new ConstraintException("事件名称不能为空！");
+        }
         Event event = baseMapper.selectById(id);
         mapper.convert(dto, event);
         updateById(event);
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/ServeServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/ServeServiceImpl.java
index c221061..50dbb7d 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/ServeServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/ServeServiceImpl.java
@@ -31,7 +31,10 @@ public class ServeServiceImpl extends ServiceImpl<ServeRepository, Serve> implem
     @Override
     public Serve create(ServeDto dto) {
         if (baseMapper.findByName(dto.getName()) != null) {
-            throw new ConstraintException("该事件已存在！");
+            throw new ConstraintException("该服务已存在！");
+        }
+        if (dto.getName() == null) {
+            throw new ConstraintException("服务名称不能为空！");
         }
         Serve serve = mapper.toEntity(dto);
         save(serve);
@@ -45,6 +48,9 @@ public class ServeServiceImpl extends ServiceImpl<ServeRepository, Serve> implem
      */
     @Override
     public Serve update(ServeDto dto, Long id) {
+        if (dto.getName() == null) {
+            throw new ConstraintException("服务名称不能为空！");
+        }
         Serve serve = baseMapper.selectById(id);
         mapper.convert(dto, serve);
         updateById(serve);