diff --git a/db/800pjcloudx_hardware.sql b/db/800pjcloudx_hardware.sql index 440019f40..a098b21c0 100644 --- a/db/800pjcloudx_hardware.sql +++ b/db/800pjcloudx_hardware.sql @@ -9,6 +9,7 @@ CREATE TABLE hard_manager ( id bigint NOT NULL COMMENT '编号', merchant_id bigint COMMENT '商户id', + hard_group_id bigint COMMENT '分组id', dept_id bigint COMMENT '商家部门id', name varchar(128) NOT NULL COMMENT '设备名', type char(10) NOT NULL COMMENT '设备类型', @@ -34,6 +35,26 @@ CREATE TABLE hard_manager DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT ='设备管理'; +-- ---------------------------- +-- Table structure for hard_group +-- ---------------------------- +DROP TABLE IF EXISTS `hard_group`; +CREATE TABLE hard_group +( + id bigint NOT NULL COMMENT '编号', + dept_id bigint COMMENT '部门id', + name varchar(128) NOT 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 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='设备分组管理'; + -- ---------------------------- -- Table structure for hard_invoice -- ---------------------------- diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardGroupDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardGroupDto.java new file mode 100644 index 000000000..17c5511ed --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardGroupDto.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.hard.api.dto; + +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class HardGroupDto extends HardGroupEntity { + + private List ids; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardGroupEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardGroupEntity.java new file mode 100644 index 000000000..82385d95f --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardGroupEntity.java @@ -0,0 +1,85 @@ +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; + +/** + * 设备分组 + * + * @author dzc + * @date 2025-01-14 16:31:20 + */ +@Data +@TenantTable +@TableName("hard_group") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "设备分组") +public class HardGroupEntity extends Model { + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="编号") + private Long id; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 分组名 + */ + @Schema(description="分组名") + private String name; + + /** + * 创建人 + */ + @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/HardManagerEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardManagerEntity.java index d634cf570..75de4e03b 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardManagerEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardManagerEntity.java @@ -31,6 +31,12 @@ public class HardManagerEntity extends Model { @Schema(description="编号") private Long id; + /** + * 分组id + */ + @Schema(description="分组id") + private Long hardGroupId; + /** * 商户id */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java index 22f077fd9..c2fd8585d 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java @@ -5,8 +5,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.hard.api.dto.code.QRCodeDto; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; +import com.bsd.pjcloud.hard.api.vo.base.BaseHardGroupInterface; import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface; import com.bsd.pjcloud.hard.api.vo.base.BaseOrderInterface; import lombok.experimental.UtilityClass; @@ -79,4 +81,15 @@ public class HardUtil { return v; } + public List convertHardGroupList(List list, Map map) { + return CollectionUtils.convertList(list, v -> convertHardGroup(v, map.get(v.getHardGroupId()))); + } + + public T convertHardGroup(T v, HardGroupEntity entity) { + if (ObjectUtil.isEmpty(entity)) return v; + v.setHardGroupId(entity.getId()); + v.setHardGroupName(entity.getName()); + return v; + } + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardGroupVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardGroupVo.java new file mode 100644 index 000000000..5b68deafe --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardGroupVo.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.hard.api.vo; + +import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; +import lombok.Data; + +@Data +public class HardGroupVo extends HardGroupEntity implements BaseDeptInterface { + + /** + * 部门相关 + */ + + private String deptName; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java index ee3cba814..f941ba5ab 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java @@ -2,11 +2,12 @@ package com.bsd.pjcloud.hard.api.vo; import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface; import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; +import com.bsd.pjcloud.hard.api.vo.base.BaseHardGroupInterface; import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface; import lombok.Data; @Data -public class HardManagerVo extends HardManagerEntity implements BaseDeptInterface, BaseMchInterface { +public class HardManagerVo extends HardManagerEntity implements BaseDeptInterface, BaseMchInterface, BaseHardGroupInterface { /** * android重点使用 @@ -19,4 +20,11 @@ public class HardManagerVo extends HardManagerEntity implements BaseDeptInterfac private String logoPic; + /** + * 分类相关 + */ + private Long hardGroupId; + + private String hardGroupName; + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/base/BaseHardGroupInterface.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/base/BaseHardGroupInterface.java new file mode 100644 index 000000000..32228e37b --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/base/BaseHardGroupInterface.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.hard.api.vo.base; + +public interface BaseHardGroupInterface { + + Long getHardGroupId(); + + void setHardGroupId(Long hardGroupId); + + String getHardGroupName(); + + void setHardGroupName(String hardGroupName); + +} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java new file mode 100644 index 000000000..5c52cbc0c --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java @@ -0,0 +1,92 @@ +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.dto.HardGroupDto; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; +import com.bsd.pjcloud.hard.service.HardGroupService; +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; + +/** + * 设备分组 + * + * @author dzc + * @date 2025-01-14 16:31:20 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/hard-group") +@Tag(description = "hard-group", name = "设备分组管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class HardGroupController { + + private final HardGroupService hardGroupService; + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page-join") + @PreAuthorize("@pms.hasPermission('hard_hardGroup_view')") + public R pageJoin(@ParameterObject Page page, @ParameterObject HardGroupDto dto) { + return R.ok(hardGroupService.pageJoin(page, dto)); + } + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('hard_hardGroup_view')") + public R getHardGroupPage(@ParameterObject Page page, @ParameterObject HardGroupEntity hardGroup) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(hardGroupService.page(page, wrapper)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('hard_hardGroup_view')") + public R getById(@PathVariable("id") Long id) { + return R.ok(hardGroupService.getById(id)); + } + + @Operation(summary = "新增设备分组", description = "新增设备分组") + @SysLog("新增设备分组") + @PostMapping + @PreAuthorize("@pms.hasPermission('hard_hardGroup_add')") + public R save(@RequestBody HardGroupEntity hardGroup) { + return R.ok(hardGroupService.save(hardGroup)); + } + + @Operation(summary = "修改设备分组", description = "修改设备分组") + @SysLog("修改设备分组") + @PutMapping + @PreAuthorize("@pms.hasPermission('hard_hardGroup_edit')") + public R updateById(@RequestBody HardGroupEntity hardGroup) { + return R.ok(hardGroupService.updateById(hardGroup)); + } + + @Operation(summary = "通过id删除设备分组", description = "通过id删除设备分组") + @SysLog("通过id删除设备分组") + @DeleteMapping + @PreAuthorize("@pms.hasPermission('hard_hardGroup_del')") + public R removeById(@RequestBody Long[] ids) { + return R.ok(hardGroupService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('hard_hardGroup_export')") + public List export(HardGroupEntity hardGroup, Long[] ids) { + return hardGroupService.list(Wrappers.lambdaQuery(hardGroup).in(ArrayUtil.isNotEmpty(ids), HardGroupEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java new file mode 100644 index 000000000..242442a53 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java @@ -0,0 +1,40 @@ +package com.bsd.pjcloud.hard.mapper; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.BeanUtils; +import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.hard.api.dto.HardGroupDto; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; +import com.bsd.pjcloud.hard.api.vo.HardGroupVo; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface HardGroupMapper extends PjcloudBaseMapper { + + default Page pageJoin(Page page, HardGroupDto dto) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .like(HardGroupEntity::getName, dto.getName()); + return selectJoinPage(page, HardGroupVo.class, wrapper); + } + + default Page scopePageList(Page page, HardGroupDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()); + Page list = selectPageByScope(page, wrapper, DataScope.of()); + list.setRecords(BeanUtils.toBean(list.getRecords(), HardGroupVo.class)); + return list; + } + + default List list(HardGroupDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) + .in(ObjectUtil.isNotEmpty(dto.getIds()), HardGroupEntity::getId, dto.getIds()); + return selectList(wrapper); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java new file mode 100644 index 000000000..c13347e4f --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java @@ -0,0 +1,15 @@ +package com.bsd.pjcloud.hard.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.hard.api.dto.HardGroupDto; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; +import com.bsd.pjcloud.hard.api.vo.HardGroupVo; + +public interface HardGroupService extends IService { + + Page pageJoin(Page page, HardGroupDto dto); + + Page scopePageList(Page page, HardGroupDto dto); + +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java new file mode 100644 index 000000000..da3ce1197 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java @@ -0,0 +1,69 @@ +package com.bsd.pjcloud.hard.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.entity.SysDept; +import com.bsd.pjcloud.admin.api.feign.RemoteDeptService; +import com.bsd.pjcloud.admin.api.utils.DataUtil; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.hard.api.dto.HardGroupDto; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; +import com.bsd.pjcloud.hard.api.vo.HardGroupVo; +import com.bsd.pjcloud.hard.api.vo.HardManagerVo; +import com.bsd.pjcloud.hard.mapper.HardGroupMapper; +import com.bsd.pjcloud.hard.service.HardGroupService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; +import java.util.Map; + +/** + * 设备分组 + * + * @author dzc + * @date 2025-01-14 16:31:20 + */ +@Validated +@Slf4j +@RequiredArgsConstructor +@Service +public class HardGroupServiceImpl extends ServiceImpl implements HardGroupService { + + private final RemoteDeptService deptService; + + @Override + public Page pageJoin(Page page, HardGroupDto dto) { + Page list = baseMapper.pageJoin(page, dto); + if (ObjectUtil.isNotEmpty(list.getRecords())) { + // 部门 + List deptIds = list.getRecords().stream().map(HardGroupVo::getDeptId).distinct().toList(); + if (ObjectUtil.isNotEmpty(deptIds)) { + R> deptList = deptService.getDeptByDeptIds(deptIds); + if (ObjectUtil.isNotEmpty(deptList.getData())) { + DataUtil.convertDeptList(list.getRecords(), deptList.getData()); + } + } + } + return list; + } + + @Override + public Page scopePageList(Page page, HardGroupDto dto) { + Page list = baseMapper.scopePageList(page, dto); + if (ObjectUtil.isNotEmpty(list.getRecords())) { + // 部门 + List deptIds = list.getRecords().stream().map(HardGroupVo::getDeptId).distinct().toList(); + if (ObjectUtil.isNotEmpty(deptIds)) { + R> deptList = deptService.getDeptByDeptIds(deptIds); + if (ObjectUtil.isNotEmpty(deptList.getData())) { + DataUtil.convertDeptList(list.getRecords(), deptList.getData()); + } + } + } + return list; + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java index 0b4343fa2..bfc423c84 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java @@ -11,11 +11,16 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.security.service.PjcloudUser; +import com.bsd.pjcloud.hard.api.dto.HardGroupDto; import com.bsd.pjcloud.hard.api.dto.HardManagerDto; import com.bsd.pjcloud.hard.api.dto.hard.HardBindDto; +import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; +import com.bsd.pjcloud.hard.api.utils.HardUtil; import com.bsd.pjcloud.hard.api.vo.HardManagerVo; +import com.bsd.pjcloud.hard.mapper.HardGroupMapper; import com.bsd.pjcloud.hard.mapper.HardManagerMapper; +import com.bsd.pjcloud.hard.service.HardGroupService; import com.bsd.pjcloud.hard.service.HardManagerService; import com.bsd.pjcloud.hard.mqtt.config.MqttConfig; import com.bsd.pjcloud.hard.utils.MqTopicUtil; @@ -46,6 +51,8 @@ public class HardManagerServiceImpl extends ServiceImpl groupIds = list.getRecords().stream().map(HardManagerVo::getHardGroupId).distinct().toList(); + if (ObjectUtil.isNotEmpty(groupIds)) { + HardGroupDto groupDto = new HardGroupDto(); + groupDto.setIds(groupIds); + List groupList = hardGroupMapper.list(groupDto); + if (ObjectUtil.isNotEmpty(groupList)) { + HardUtil.convertHardGroupList(list.getRecords(), CollectionUtils.convertMap(groupList, HardGroupEntity::getId)); + } + } } return list; } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardGroupMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardGroupMapper.xml new file mode 100644 index 000000000..2683414bf --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardGroupMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/api/feign/RemoteMqttEventService.java b/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/api/feign/RemoteMqttEventService.java index c806ef342..708edf023 100644 --- a/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/api/feign/RemoteMqttEventService.java +++ b/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/api/feign/RemoteMqttEventService.java @@ -58,5 +58,5 @@ public interface RemoteMqttEventService { */ @NoToken @GetMapping("/mqtt/send-face-change-msg") - R sendFaceChangeMsg(@RequestParam List parentDeptList, @RequestParam Long userId); + R sendFaceChangeMsg(@RequestParam List parentDeptList, @RequestParam Long userId, @RequestParam(required = false) Boolean isGlobalFace); } diff --git a/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/dto/hard/HardCustomerMsg.java b/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/dto/hard/HardCustomerMsg.java index be90f0c66..a5e445ad8 100644 --- a/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/dto/hard/HardCustomerMsg.java +++ b/pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/dto/hard/HardCustomerMsg.java @@ -8,4 +8,6 @@ public class HardCustomerMsg extends MqttHardBaseMsg { private String userId; + private Boolean isGlobalFace; + } diff --git a/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/controller/MqttEventController.java b/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/controller/MqttEventController.java index 8583672df..974c14719 100644 --- a/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/controller/MqttEventController.java +++ b/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/controller/MqttEventController.java @@ -109,7 +109,7 @@ public class MqttEventController { */ @Inner @GetMapping("/send-face-change-msg") - public R sendFaceChangeMsg(@RequestParam List parentDeptList, @RequestParam Long userId) { + public R sendFaceChangeMsg(@RequestParam List parentDeptList, @RequestParam Long userId, @RequestParam(required = false) Boolean isGlobalFace) { MqttBaseDto dto = new MqttBaseDto(); MchManageVo mchDept = remoteMchService.getFirstMch(parentDeptList).getData(); if (ObjectUtil.isNotEmpty(mchDept)) { @@ -118,6 +118,9 @@ public class MqttEventController { dto.setAction(MqttActionEnum.FACE); HardCustomerMsg msg = new HardCustomerMsg(); msg.setUserId(String.valueOf(userId)); + if (ObjectUtil.isNotEmpty(isGlobalFace)) { + msg.setIsGlobalFace(isGlobalFace); + } dto.setData(msg); return R.ok(mqttEventService.defaultAction(dto)); } diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java index a8a0e9bf5..3d1ead735 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java @@ -14,4 +14,6 @@ public class SysUserFaceDto extends SysUserFaceEntity { private List deptIds; + private String isGlobalFace; + } diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUser.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUser.java index f5b915767..4b2115bfd 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUser.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUser.java @@ -44,186 +44,189 @@ import java.time.LocalDateTime; @Schema(description = "用户") public class SysUser extends Model implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 主键ID - */ - @TableId(value = "user_id", type = IdType.ASSIGN_ID) - @Schema(description = "主键id") - private Long userId; + /** + * 主键ID + */ + @TableId(value = "user_id", type = IdType.ASSIGN_ID) + @Schema(description = "主键id") + private Long userId; - /** - * 用户名 - */ - @Schema(description = "用户名") - private String username; + /** + * 用户名 + */ + @Schema(description = "用户名") + private String username; - /** - * 密码 - */ - @Schema(description = "密码") - private String password; + /** + * 密码 + */ + @Schema(description = "密码") + private String password; - /** - * 随机盐 - */ - @JsonIgnore - @Schema(description = "随机盐") - private String salt; + /** + * 随机盐 + */ + @JsonIgnore + @Schema(description = "随机盐") + private String salt; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description = "创建人") - private String createBy; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") + private String createBy; - /** - * 修改人 - */ - @TableField(fill = FieldFill.UPDATE) - @Schema(description = "修改人") - private String updateBy; + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @Schema(description = "修改人") + private String updateBy; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description = "创建时间") - private LocalDateTime createTime; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") + private LocalDateTime createTime; - /** - * 修改时间 - */ - @TableField(fill = FieldFill.UPDATE) - @Schema(description = "修改时间") - private LocalDateTime updateTime; + /** + * 修改时间 + */ + @TableField(fill = FieldFill.UPDATE) + @Schema(description = "修改时间") + private LocalDateTime updateTime; - /** - * 0-正常，1-删除 - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description = "删除标记,1:已删除,0:正常") - private String delFlag; + /** + * 0-正常，1-删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description = "删除标记,1:已删除,0:正常") + private String delFlag; - /** - * 锁定标记 - */ - @Schema(description = "锁定标记") - private String lockFlag; + /** + * 锁定标记 + */ + @Schema(description = "锁定标记") + private String lockFlag; - /** - * 密码过期标记 - */ - @Schema(description = "密码过期标记") - private String passwordExpireFlag; + /** + * 密码过期标记 + */ + @Schema(description = "密码过期标记") + private String passwordExpireFlag; - /** - * 密码修改时间 - */ - @Schema(description = "密码修改时间") - private LocalDateTime passwordModifyTime; + /** + * 密码修改时间 + */ + @Schema(description = "密码修改时间") + private LocalDateTime passwordModifyTime; - /** - * 手机号 - */ - @DiffInclude - @PropertyName("手机号") - @Schema(description = "手机号") - private String phone; + /** + * 手机号 + */ + @DiffInclude + @PropertyName("手机号") + @Schema(description = "手机号") + private String phone; - /** - * 头像 - */ - @Schema(description = "头像地址") - private String avatar; + /** + * 头像 + */ + @Schema(description = "头像地址") + private String avatar; - /** - * 部门ID - */ - @Schema(description = "用户所属部门id") - private Long deptId; + /** + * 部门ID + */ + @Schema(description = "用户所属部门id") + private Long deptId; - /** - * 租户ID - */ - @Schema(description = "用户所属租户id") - private Long tenantId; + /** + * 租户ID + */ + @Schema(description = "用户所属租户id") + private Long tenantId; - /** - * 微信openid - */ - @Schema(description = "微信openid") - private String wxOpenid; + /** + * 微信openid + */ + @Schema(description = "微信openid") + private String wxOpenid; - /** - * 企微微信 userid - */ - @Schema(description = "企微微信 userid") - private String wxCpUserid; + /** + * 企微微信 userid + */ + @Schema(description = "企微微信 userid") + private String wxCpUserid; - /** - * 钉钉 userid - */ - @Schema(description = "钉钉 userid") - private String wxDingUserid; + /** + * 钉钉 userid + */ + @Schema(description = "钉钉 userid") + private String wxDingUserid; - /** - * 微信小程序openId - */ - @Schema(description = "微信小程序openid") - private String miniOpenid; + /** + * 微信小程序openId + */ + @Schema(description = "微信小程序openid") + private String miniOpenid; - /** - * QQ openid - */ - @Schema(description = "QQ openid") - private String qqOpenid; + /** + * QQ openid + */ + @Schema(description = "QQ openid") + private String qqOpenid; - /** - * 码云唯一标识 - */ - @Schema(description = "码云唯一标识") - private String giteeLogin; + /** + * 码云唯一标识 + */ + @Schema(description = "码云唯一标识") + private String giteeLogin; - /** - * 开源中国唯一标识 - */ - @Schema(description = "开源中国唯一标识") - private String oscId; + /** + * 开源中国唯一标识 + */ + @Schema(description = "开源中国唯一标识") + private String oscId; - /** - * 昵称 - */ - @Schema(description = "昵称") - private String nickname; + /** + * 昵称 + */ + @Schema(description = "昵称") + private String nickname; - /** - * 姓名 - */ - @Schema(description = "姓名") - private String name; + /** + * 姓名 + */ + @Schema(description = "姓名") + private String name; - /** - * 邮箱 - */ - @DiffInclude - @PropertyName("邮箱") - @Schema(description = "邮箱") - private String email; + /** + * 邮箱 + */ + @DiffInclude + @PropertyName("邮箱") + @Schema(description = "邮箱") + private String email; - /** - * 员工浙政钉编码 - */ - @Schema(description="员工浙政钉编码") - private String dingtalkEmployeeCode; + /** + * 员工浙政钉编码 + */ + @Schema(description = "员工浙政钉编码") + private String dingtalkEmployeeCode; - @Schema(description="员工所属系统类型") - private String systemType; + @Schema(description = "员工所属系统类型") + private String systemType; + + @Schema(description = "是否为全局人脸") + private String isGlobalFace; } diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java index 170c41bbd..9ba88024d 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java @@ -205,6 +205,13 @@ public class UserVO implements BaseFacesInterface, Serializable { /** * 人脸 */ + @Schema(description = "人脸") private String faceImgs; + /** + * 是否为全局人脸 + */ + @Schema(description = "是否为全局人脸") + private String isGlobalFace; + } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java index 3d6a7b925..8af7d551f 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java @@ -93,6 +93,13 @@ public class SysUserFaceController { } /* ************************************* start android start ************************************* */ + @Operation(summary = "设置为全局人脸", description = "设置为全局人脸") + @PostMapping("/global-face") + @SysLog("设置为全局人脸") + public R editGlobalFace(@RequestBody SysUserFaceDto dto) { + return R.ok(sysUserFaceService.editGlobalFace(dto)); + } + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") // @PreAuthorize("@pms.hasPermission('userFace_sysUserFace_view')") diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java index 1f74c9001..e193ce4f1 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java @@ -14,6 +14,8 @@ public interface SysUserFaceService extends IService { void edit(SysUserFaceEntity sysUserFace); + Boolean editGlobalFace(SysUserFaceDto dto); + void delByIds(ArrayList list); Page scopePageList(Page page, SysUserFaceDto dto); diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java index cfb7fcafc..c9192463c 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java @@ -13,6 +13,7 @@ import com.bsd.pjcloud.admin.mapper.SysUserFaceMapper; import com.bsd.pjcloud.admin.service.SysDeptService; import com.bsd.pjcloud.admin.service.SysUserFaceService; import com.bsd.pjcloud.admin.service.SysUserService; +import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; import com.bsd.pjcloud.common.core.exception.CheckedException; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.mqtt.api.feign.RemoteMqttEventService; @@ -52,7 +53,7 @@ public class SysUserFaceServiceImpl extends ServiceImpl userIds) { + private void sendFaceMq(List userIds, Boolean isGlobalFace) { if (ObjectUtil.isEmpty(userIds)) return; List list = sysUserService.list(new LambdaQueryWrapper().in(SysUser::getUserId, userIds)); if (ObjectUtil.isEmpty(list)) return; @@ -111,7 +125,7 @@ public class SysUserFaceServiceImpl extends ServiceImpl parentDeptList = sysDeptService.getParentDeptList(v.getDeptId()); if (ObjectUtil.isEmpty(parentDeptList)) continue; List deptIds = parentDeptList.stream().map(SysDept::getDeptId).toList(); - remoteMqttEventService.sendFaceChangeMsg(deptIds, v.getUserId()); + remoteMqttEventService.sendFaceChangeMsg(deptIds, v.getUserId(), isGlobalFace); } } } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 3baae8b80..f869745a7 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -46,6 +46,7 @@ + @@ -159,6 +160,7 @@ u.nickname, u.name, u.email, + u.is_global_face, d.name dept_name FROM sys_user u diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java index f14bcdeb4..91a146dd9 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java @@ -115,7 +115,7 @@ public class MchManageController { @Operation(summary = "分页不要权限下拉", description = "分页不要权限下拉") @GetMapping("/select") public R getSelect(@ParameterObject Page page, @ParameterObject MchManageDto dto) { - return R.ok(mchManageService.pageJoin(page, dto)); + return R.ok(mchManageService.scopePageList(page, dto)); } @Operation(summary = "通过id查询", description = "通过id查询") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java index 46f2f06cb..17118560d 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java @@ -126,7 +126,7 @@ public class MchManageServiceImpl extends ServiceImpl> deptList = remoteDeptService.getDeptByDeptIds(deptIds); if (ObjectUtil.isNotEmpty(deptList.getData())) { - DataUtil.convertDeptList(page.getRecords(), deptList.getData()); + DataUtil.convertDeptList(list.getRecords(), deptList.getData()); } } } @@ -142,7 +142,7 @@ public class MchManageServiceImpl extends ServiceImpl> deptList = remoteDeptService.getDeptByDeptIds(deptIds); if (ObjectUtil.isNotEmpty(deptList.getData())) { - DataUtil.convertDeptList(page.getRecords(), deptList.getData()); + DataUtil.convertDeptList(list.getRecords(), deptList.getData()); } } }