查询设备分享列表(web)

2025-08-29 10:29:53 +08:00
parent 760738bcdd
commit 3969e50566
7 changed files with 169 additions and 64 deletions
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java
@ -31,7 +31,7 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/equipment/alarm")
+@RequestMapping("api/equipment/alarm")
 public class DeviceAlarmController extends BaseController {

    private final IDeviceAlarmService deviceAlarmService;
@ -39,17 +39,17 @@ public class DeviceAlarmController extends BaseController {
    /**
     * 查询设备告警列表
     */
-    @SaCheckPermission("equipment:alarm:list")
+    // @SaCheckPermission("equipment:alarm:list")
    @GetMapping("/list")
    public TableDataInfo<DeviceAlarmVo> list(DeviceAlarmBo bo, PageQuery pageQuery) {
        return deviceAlarmService.queryPageList(bo, pageQuery);
    }

    /**
-     * 设备告警列表
+     * 导出设备告警列表
     */
-    @SaCheckPermission("equipment:alarm:export")
-    @Log(title = "设备告警", businessType = BusinessType.EXPORT)
+    // @SaCheckPermission("equipment:alarm:export")
+    @Log(title = "导出设备告警列表", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(DeviceAlarmBo bo, HttpServletResponse response) {
        List<DeviceAlarmVo> list = deviceAlarmService.queryList(bo);
@ -61,7 +61,7 @@ public class DeviceAlarmController extends BaseController {
     *
     * @param id 主键
     */
-    @SaCheckPermission("equipment:alarm:query")
+    // @SaCheckPermission("equipment:alarm:query")
    @GetMapping("/{id}")
    public R<DeviceAlarmVo> getInfo(@NotNull(message = "主键不能为空")
                                    @PathVariable Long id) {
@ -71,7 +71,7 @@ public class DeviceAlarmController extends BaseController {
    /**
     * 新增设备告警
     */
-    @SaCheckPermission("equipment:alarm:add")
+    // @SaCheckPermission("equipment:alarm:add")
    @Log(title = "设备告警", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@ -82,7 +82,7 @@ public class DeviceAlarmController extends BaseController {
    /**
     * 修改设备告警
     */
-    @SaCheckPermission("equipment:alarm:edit")
+    // @SaCheckPermission("equipment:alarm:edit")
    @Log(title = "设备告警", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@ -95,11 +95,12 @@ public class DeviceAlarmController extends BaseController {
     *
     * @param ids 主键串
     */
-    @SaCheckPermission("equipment:alarm:remove")
+    // @SaCheckPermission("equipment:alarm:remove")
    @Log(title = "设备告警", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @PathVariable Long[] ids) {
        return toAjax(deviceAlarmService.deleteWithValidByIds(List.of(ids), true));
    }
+
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
@ -0,0 +1,43 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.web.service.DeviceShareService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备分享管理
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/equipment/share")
+public class DeviceShareController extends BaseController {
+
+    private final DeviceShareService appDeviceShareService;
+
+
+    /**
+     *查询设备分享列表(web)
+     */
+    // @SaCheckPermission("equipment:alarm:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return appDeviceShareService.queryWebList(bo, pageQuery);
+    }
+
+
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java
@ -171,6 +171,7 @@ public class DeviceShareService {

        return shareDetailVo;
    }
+
    /**
     * 校验短信验证码
     */
@ -181,6 +182,7 @@ public class DeviceShareService {
        }
        return code.equals(smsCode);
    }
+
    public int deviceShare(AppDeviceShareBo bo) {
        boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode());
        if (!flag) {
@ -232,4 +234,19 @@ public class DeviceShareService {
    }


+    /**
+     * 查询设备分享列表(web)
+     *
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    public TableDataInfo<AppDeviceShareVo> queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
 }
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java
@ -1,5 +1,7 @@
 package com.fuyuanshen.app.domain.bo;

+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuyuanshen.app.domain.AppDeviceShare;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
@ -7,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;

+import java.util.Date;
+
 /**
 * 设备分享业务对象 app_device_share
 *
@ -35,10 +39,16 @@ public class AppDeviceShareBo extends BaseEntity {

    /**
     * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
-以逗号分隔
+     * 以逗号分隔
     */
    private String permission;

+    /**
+     * 分享用户
+     * share_user
+     */
+    private String shareUser;
+
    /**
     * 备注
     */
@ -46,4 +56,11 @@ public class AppDeviceShareBo extends BaseEntity {


    private String smsCode;
+
+    /**
+     * 分享时间
+     */
+    private Date shareStartTime;
+    private Date shareEndTime;
+
 }
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java
@ -19,4 +19,12 @@ public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, App
    IPage<AppDeviceShareVo> otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);

    Page<AppDeviceShareVo> selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
+
+    /**
+     * 查询设备分享列表(web)
+     *
+     * @param bo 设备分享
+     * @return 设备分享
+     */
+    Page<AppDeviceShareVo> selectWebDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
 }
--- a/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml
+++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml
@ -15,9 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               dt.app_model_dictionary detailPageUrl,
               d.bluetooth_name,
               c.binding_time,
-        ad.*,u.user_name otherPhonenumber
-        from
-        app_device_share ad
+               ad.*,
+               u.user_name             otherPhonenumber
+        from app_device_share ad
                 left join device d on ad.device_id = d.id
                 left join app_user u on ad.create_by = u.user_id
                 inner join device_type dt on d.device_type = dt.id
@ -47,4 +47,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and ad.device_id = #{bo.deviceId}
        </if>
    </select>
+
+    <!-- 查询设备分享列表(web) -->
+    <select id="selectWebDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
+        select *
+        from
+        app_device_share ad
+        <where>
+            <if test="bo.deviceId != null">
+                and ad.device_id = #{bo.deviceId}
+            </if>
+            <if test="bo.shareUser != null">
+                and ad.share_user = #{bo.shareUser}
+            </if>
+            <if test="criteria.shareStartTime != null and criteria.hareEndTime != null">
+                and d.create_time between #{bo.shareStartTime} and #{bo.shareEndTime}
+            </if>
+        </where>
+
+    </select>
 </mapper>