From 7ea1f7937ec2ecddc0df3c4146a9e420fceb4299 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 11 Apr 2025 14:43:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A1=AC=E4=BB=B6=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=E3=80=81=E7=A1=AC=E4=BB=B6=E6=8E=88=E6=9D=83=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/800pjcloudx_hardware.sql | 36 ++--- .../bsd/pjcloud/hard/api/dto/HardAuthDto.java | 8 ++ .../hard/api/dto/HardBroadcastDto.java | 8 ++ .../hard/api/entity/HardAuthEntity.java | 106 ++++++++++++++ .../hard/api/entity/HardBroadcastEntity.java | 136 ++++++++++++++++++ .../bsd/pjcloud/hard/api/vo/HardAuthVo.java | 8 ++ .../pjcloud/hard/api/vo/HardBroadcastVo.java | 8 ++ .../hard/controller/HardAuthController.java | 82 +++++++++++ .../controller/HardBroadcastController.java | 82 +++++++++++ .../pjcloud/hard/mapper/HardAuthMapper.java | 11 ++ .../hard/mapper/HardBroadcastMapper.java | 10 ++ .../pjcloud/hard/service/HardAuthService.java | 8 ++ .../hard/service/HardBroadcastService.java | 8 ++ .../service/impl/HardAuthServiceImpl.java | 20 +++ .../impl/HardBroadcastServiceImpl.java | 14 ++ .../main/resources/mapper/HardAuthMapper.xml | 21 +++ .../resources/mapper/HardBroadcastMapper.xml | 26 ++++ 17 files changed, 575 insertions(+), 17 deletions(-) create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthDto.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardBroadcastDto.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardAuthVo.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardAuthMapper.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardBroadcastMapper.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardBroadcastServiceImpl.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml diff --git a/db/800pjcloudx_hardware.sql b/db/800pjcloudx_hardware.sql index 4bdf4dbb9..416b038d5 100644 --- a/db/800pjcloudx_hardware.sql +++ b/db/800pjcloudx_hardware.sql @@ -262,23 +262,24 @@ CREATE TABLE hard_after_sale_log DROP TABLE IF EXISTS hard_broadcast; CREATE TABLE hard_broadcast ( - id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - user_id bigint NOT NULL COMMENT '预定用户', - hard_id bigint NOT NULL COMMENT '硬件id', - topic varchar(128) NOT NULL COMMENT 'mq主题', - biz_id varchar(64) NOT NULL COMMENT '关联业务编号', - title varchar(64) NOT NULL COMMENT '预定标题', - unique_code varchar(16) NOT NULL COMMENT '广播唯一编号', - broadcast_count int DEFAULT 0 NOT NULL COMMENT '广播次数', - is_broadcast char(1) DEFAULT '0' COMMENT '是否广播语音', - is_done char(1) DEFAULT '0' COMMENT '是否完成', - is_done_time datetime DEFAULT NULL COMMENT '完成时间', - create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', - create_time datetime DEFAULT NULL COMMENT '创建时间', - update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', - update_time datetime DEFAULT NULL COMMENT '修改时间', - del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', - tenant_id bigint DEFAULT NULL COMMENT '租户ID', + id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', + user_id bigint NOT NULL COMMENT '预定用户', + hard_id bigint NOT NULL COMMENT '硬件id', + topic varchar(128) NOT NULL COMMENT 'mq主题', + biz_id varchar(64) NOT NULL COMMENT '关联业务编号', + title varchar(64) NOT NULL COMMENT '预定标题', + content varchar(128) NOT NULL COMMENT '广播内容', + broadcast_count int DEFAULT 0 NOT NULL COMMENT '当前广播次数', + broadcast_max_count int DEFAULT 0 NOT NULL COMMENT '最大广播次数', + is_broadcast char(1) DEFAULT '0' COMMENT '是否广播语音', + is_done char(1) DEFAULT '0' COMMENT '是否完成', + is_done_time datetime DEFAULT NULL COMMENT '完成时间', + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', PRIMARY KEY (id) ) ENGINE = InnoDB COMMENT ='设备广播'; @@ -289,6 +290,7 @@ DROP TABLE IF EXISTS hard_auth; CREATE TABLE hard_auth ( id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', + auth_type varchar(32) DEFAULT NULL COMMENT '授权类型如微信小程序、支付宝、浙政钉', user_id bigint NOT NULL COMMENT '预定用户', hard_id bigint NOT NULL COMMENT '硬件id', auth_status char(1) DEFAULT '0' COMMENT '是否授权', diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthDto.java new file mode 100644 index 000000000..d3b4ff4e4 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthDto.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.hard.api.dto; + +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; +import lombok.Data; + +@Data +public class HardAuthDto extends HardAuthEntity { +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardBroadcastDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardBroadcastDto.java new file mode 100644 index 000000000..758ab3ab5 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardBroadcastDto.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.hard.api.dto; + +import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity; +import lombok.Data; + +@Data +public class HardBroadcastDto extends HardBroadcastEntity { +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java new file mode 100644 index 000000000..cbb076493 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java @@ -0,0 +1,106 @@ +package com.bsd.pjcloud.hard.api.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 硬件授权 + */ +@Data +@TenantTable +@TableName("hard_auth") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "硬件授权") +public class HardAuthEntity extends Model { + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="编号") + private Long id; + + /** + * 预定用户 + */ + @Schema(description="预定用户") + private Long userId; + + /** + * 硬件id + */ + @Schema(description="硬件id") + private Long hardId; + + /** + * 是否授权 + */ + @Schema(description="是否授权") + private String authStatus; + + /** + * 授权时间 + */ + @Schema(description="授权时间") + private LocalDateTime authTime; + + /** + * 是否完成 + */ + @Schema(description="是否完成") + private String isDone; + + /** + * 完成时间 + */ + @Schema(description="完成时间") + private LocalDateTime isDoneTime; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java new file mode 100644 index 000000000..3ef0b6c53 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java @@ -0,0 +1,136 @@ +package com.bsd.pjcloud.hard.api.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 设备广播 + */ +@Data +@TenantTable +@TableName("hard_broadcast") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "设备广播") +public class HardBroadcastEntity extends Model { + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="编号") + private Long id; + + /** + * 预定用户 + */ + @Schema(description="预定用户") + private Long userId; + + /** + * 硬件id + */ + @Schema(description="硬件id") + private Long hardId; + + /** + * mq主题 + */ + @Schema(description="mq主题") + private String topic; + + /** + * 关联业务编号 + */ + @Schema(description="关联业务编号") + private String bizId; + + /** + * 预定标题 + */ + @Schema(description="预定标题") + private String title; + + /** + * 广播内容 + */ + @Schema(description="广播内容") + private String content; + + /** + * 当前广播次数 + */ + @Schema(description="当前广播次数") + private Integer broadcastCount; + + /** + * 最大广播次数 + */ + @Schema(description="最大广播次数") + private Integer broadcastMaxCount; + + /** + * 是否广播语音 + */ + @Schema(description="是否广播语音") + private String isBroadcast; + + /** + * 是否完成 + */ + @Schema(description="是否完成") + private String isDone; + + /** + * 完成时间 + */ + @Schema(description="完成时间") + private LocalDateTime isDoneTime; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardAuthVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardAuthVo.java new file mode 100644 index 000000000..fab679c58 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardAuthVo.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.hard.api.vo; + +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; +import lombok.Data; + +@Data +public class HardAuthVo extends HardAuthEntity { +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java new file mode 100644 index 000000000..81c9dab28 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.hard.api.vo; + +import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity; +import lombok.Data; + +@Data +public class HardBroadcastVo extends HardBroadcastEntity { +} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java new file mode 100644 index 000000000..e48d23e33 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java @@ -0,0 +1,82 @@ +package com.bsd.pjcloud.hard.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; +import com.bsd.pjcloud.hard.service.HardAuthService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 硬件授权 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/hard-auth") +@Tag(description = "hard-auth", name = "硬件授权管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class HardAuthController { + + private final HardAuthService hardAuthService; + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('hard_hardAuth_view')") + public R getHardAuthPage(@ParameterObject Page page, @ParameterObject HardAuthEntity hardAuth) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(hardAuthService.page(page, wrapper)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('hard_hardAuth_view')") + public R getById(@PathVariable("id") Long id) { + return R.ok(hardAuthService.getById(id)); + } + + @Operation(summary = "新增硬件授权", description = "新增硬件授权") + @SysLog("新增硬件授权") + @PostMapping + @PreAuthorize("@pms.hasPermission('hard_hardAuth_add')") + public R save(@RequestBody HardAuthEntity hardAuth) { + return R.ok(hardAuthService.save(hardAuth)); + } + + @Operation(summary = "修改硬件授权", description = "修改硬件授权") + @SysLog("修改硬件授权") + @PutMapping + @PreAuthorize("@pms.hasPermission('hard_hardAuth_edit')") + public R updateById(@RequestBody HardAuthEntity hardAuth) { + return R.ok(hardAuthService.updateById(hardAuth)); + } + + @Operation(summary = "通过id删除硬件授权", description = "通过id删除硬件授权") + @SysLog("通过id删除硬件授权") + @DeleteMapping + @PreAuthorize("@pms.hasPermission('hard_hardAuth_del')") + public R removeById(@RequestBody Long[] ids) { + return R.ok(hardAuthService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('hard_hardAuth_export')") + public List export(HardAuthEntity hardAuth, Long[] ids) { + return hardAuthService.list(Wrappers.lambdaQuery(hardAuth).in(ArrayUtil.isNotEmpty(ids), HardAuthEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java new file mode 100644 index 000000000..b32684ab5 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java @@ -0,0 +1,82 @@ +package com.bsd.pjcloud.hard.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.hard.entity.HardBroadcastEntity; +import com.bsd.pjcloud.hard.service.HardBroadcastService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 设备广播 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/hard-broadcast" ) +@Tag(description = "hard-broadcast" , name = "设备广播管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class HardBroadcastController { + + private final HardBroadcastService hardBroadcastService; + + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('hard_hardBroadcast_view')" ) + public R getHardBroadcastPage(@ParameterObject Page page, @ParameterObject HardBroadcastEntity hardBroadcast) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(hardBroadcastService.page(page, wrapper)); + } + + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('hard_hardBroadcast_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(hardBroadcastService.getById(id)); + } + + @Operation(summary = "新增设备广播" , description = "新增设备广播" ) + @SysLog("新增设备广播" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('hard_hardBroadcast_add')" ) + public R save(@RequestBody HardBroadcastEntity hardBroadcast) { + return R.ok(hardBroadcastService.save(hardBroadcast)); + } + + @Operation(summary = "修改设备广播" , description = "修改设备广播" ) + @SysLog("修改设备广播" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('hard_hardBroadcast_edit')" ) + public R updateById(@RequestBody HardBroadcastEntity hardBroadcast) { + return R.ok(hardBroadcastService.updateById(hardBroadcast)); + } + + @Operation(summary = "通过id删除设备广播" , description = "通过id删除设备广播" ) + @SysLog("通过id删除设备广播" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('hard_hardBroadcast_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(hardBroadcastService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('hard_hardBroadcast_export')" ) + public List export(HardBroadcastEntity hardBroadcast,Long[] ids) { + return hardBroadcastService.list(Wrappers.lambdaQuery(hardBroadcast).in(ArrayUtil.isNotEmpty(ids), HardBroadcastEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardAuthMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardAuthMapper.java new file mode 100644 index 000000000..9509a461b --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardAuthMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.hard.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface HardAuthMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardBroadcastMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardBroadcastMapper.java new file mode 100644 index 000000000..19b17beb3 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardBroadcastMapper.java @@ -0,0 +1,10 @@ +package com.bsd.pjcloud.hard.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface HardBroadcastMapper extends PjcloudBaseMapper { + +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java new file mode 100644 index 000000000..2daf3b3d2 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.hard.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; + +public interface HardAuthService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java new file mode 100644 index 000000000..336076ec5 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.hard.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity; + +public interface HardBroadcastService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java new file mode 100644 index 000000000..ad1204888 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java @@ -0,0 +1,20 @@ +package com.bsd.pjcloud.hard.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; +import com.bsd.pjcloud.hard.mapper.HardAuthMapper; +import com.bsd.pjcloud.hard.service.HardAuthService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +/** + * 硬件授权 + */ +@Validated +@Slf4j +@RequiredArgsConstructor +@Service +public class HardAuthServiceImpl extends ServiceImpl implements HardAuthService { +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardBroadcastServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardBroadcastServiceImpl.java new file mode 100644 index 000000000..bfcae31d2 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardBroadcastServiceImpl.java @@ -0,0 +1,14 @@ +package com.bsd.pjcloud.hard.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity; +import com.bsd.pjcloud.hard.mapper.HardBroadcastMapper; +import com.bsd.pjcloud.hard.service.HardBroadcastService; +import org.springframework.stereotype.Service; + +/** + * 设备广播 + */ +@Service +public class HardBroadcastServiceImpl extends ServiceImpl implements HardBroadcastService { +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml new file mode 100644 index 000000000..6f9c65a85 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml new file mode 100644 index 000000000..71aa9344d --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file