From bc82a1bfd116452f43d17ae84dad0ee521f1a869 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Wed, 8 Jan 2025 10:17:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E8=B0=83=E6=95=B4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=98=A0=E5=B0=84=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 DeviceMapper.xml 中 name 字段的属性映射，从 name 改为 productName -移除 gateway.sql 中的冗余数据插入和表删除语句- 优化 RoleServiceImpl 中的角色权限更新逻辑 --- .../exception/ApiExceptionHandler.java | 11 ++++---- .../security/SpringSecurityConfig.java | 1 - .../iot/device/service/DeviceService.java | 3 --- .../tsl/service/impl/PropertyServiceImpl.java | 7 ++--- .../system/service/impl/RoleServiceImpl.java | 4 ++- src/main/resources/db/gateway.sql | 26 ------------------- .../resources/mappers/iot/DeviceMapper.xml | 2 +- 7 files changed, 13 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java b/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java index 7cd4acd..fa08f91 100644 --- a/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java +++ b/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java @@ -65,11 +65,10 @@ public class ApiExceptionHandler { return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR); } - //TODO 冲突 - @ExceptionHandler(value = {Exception.class}) - public ResponseEntity handleException(Exception ex) throws JsonProcessingException { - log.error("Exception: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage()))); - return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR); - } +// @ExceptionHandler(value = {Exception.class}) +// public ResponseEntity handleException(Exception ex) throws JsonProcessingException { +// log.error("Exception: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage()))); +// return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR); +// } } diff --git a/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java b/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java index 5e84d1a..c7771f7 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java +++ b/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java @@ -33,7 +33,6 @@ import javax.sql.DataSource; @AllArgsConstructor @EnableMethodSecurity @Configuration -@EnableWebSecurity public class SpringSecurityConfig { private final UserDetailsService userDetailsService; diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java index 8e60ed5..5191757 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java @@ -1,14 +1,11 @@ package com.zsc.edu.gateway.modules.iot.device.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zsc.edu.gateway.modules.iot.device.dto.BatchDeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceServeDto; import com.zsc.edu.gateway.modules.iot.device.entity.Device; import com.zsc.edu.gateway.modules.iot.device.entity.DeviceDiff; -import com.zsc.edu.gateway.modules.iot.device.query.DeviceQuery; import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo; import java.util.List; diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java index 0454538..f4f7a1e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java @@ -1,6 +1,7 @@ package com.zsc.edu.gateway.modules.iot.tsl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zsc.edu.gateway.exception.ApiException; import com.zsc.edu.gateway.modules.iot.tsl.dto.PropertyDto; import com.zsc.edu.gateway.modules.iot.tsl.entity.Property; import com.zsc.edu.gateway.modules.iot.tsl.mapper.PropertyMapper; @@ -25,7 +26,7 @@ public class PropertyServiceImpl extends ServiceImpl implement throw new ConstraintException("name", dto.getName(), "同名角色已存在"); } mapper.convert(dto, existingRole); + if (existingRole.getAuthorities() != null) { roleAuthService.remove(new LambdaQueryWrapper().eq(RoleAuthority::getRoleId, id)); - saveRoleAuths(id, dto.getAuthorities()); + saveRoleAuths(id, dto.getAuthorities()); + } return updateById(existingRole); } diff --git a/src/main/resources/db/gateway.sql b/src/main/resources/db/gateway.sql index e20b778..3eb7e1f 100644 --- a/src/main/resources/db/gateway.sql +++ b/src/main/resources/db/gateway.sql @@ -688,29 +688,3 @@ comment on column sys_user.enable_state is '状态'; alter table sys_user owner to gitea; --- 插入备份的数据 -INSERT INTO sys_user (dept_id, role_id, username, password, phone, email, name, avatar, address, create_by, update_by, - create_time, update_time, remark, enable_state) -SELECT dept_id, - role_id, - username, - password, - phone, - email, - name, - avatar, - address, - create_by, - update_by, - create_time, - update_time, - remark, - enable_state -FROM sys_user_backup; - --- 删除备份表 -DROP TABLE sys_user_backup; - - -ALTER TABLE iot_property - ALTER COLUMN id ADD GENERATED ALWAYS AS IDENTITY; \ No newline at end of file diff --git a/src/main/resources/mappers/iot/DeviceMapper.xml b/src/main/resources/mappers/iot/DeviceMapper.xml index 0e4663c..dc7af49 100644 --- a/src/main/resources/mappers/iot/DeviceMapper.xml +++ b/src/main/resources/mappers/iot/DeviceMapper.xml @@ -22,7 +22,7 @@ - +