Merge remote-tracking branch 'origin/main' into dyf-device

# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java

@@ -0,0 +1,52 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.common.core.domain.R;
+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.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.service.DeviceService;
+import lombok.RequiredArgsConstructor;
+import org.apache.ibatis.annotations.Delete;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * APP 设备信息管理
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/device")
+public class AppDeviceController extends BaseController {
+
+    private final DeviceService deviceService;
+
+    /**
+     * 查询文件列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+
+        return deviceService.queryAppDeviceList(bo,pageQuery);
+    }
+
+    /**
+     * 绑定设备
+     */
+    @PostMapping("/bind")
+    public R<Void> bind(@RequestBody AppDeviceBo bo) {
+        return toAjax(deviceService.bindDevice(bo));
+    }
+
+
+    /**
+     * 解绑设备
+     */
+    @Delete("/unBind")
+    public R<Void> unBind(Long id) {
+        return toAjax(deviceService.unBindDevice(id));
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/service/DeviceService.java

@@ -1,58 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.fuyuanshen.app.domain.bo.AppUserBo;
-import com.fuyuanshen.app.domain.vo.AppRoleVo;
-import com.fuyuanshen.app.domain.vo.AppUserVo;
-import com.fuyuanshen.app.domain.vo.DeviceVo;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.constant.SystemConstants;
-import com.fuyuanshen.common.core.constant.TenantConstants;
-import com.fuyuanshen.common.core.domain.dto.RoleDTO;
-import com.fuyuanshen.common.core.domain.model.AppLoginUser;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
-import com.fuyuanshen.common.core.enums.LoginType;
-import com.fuyuanshen.common.core.exception.user.UserException;
-import com.fuyuanshen.common.core.utils.MessageUtils;
-import com.fuyuanshen.common.core.utils.ServletUtils;
-import com.fuyuanshen.common.core.utils.SpringUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.log.event.LogininforEvent;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.LoginHelper;
-import com.fuyuanshen.common.tenant.exception.TenantException;
-import com.fuyuanshen.common.tenant.helper.TenantHelper;
-import com.fuyuanshen.system.domain.vo.SysTenantVo;
-import com.fuyuanshen.system.service.ISysTenantService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.time.Duration;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * 登录校验方法
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class DeviceService {
-
-
-    public TableDataInfo<DeviceVo> queryPageList(AppUserBo bo, PageQuery pageQuery) {
-        return null;
-    }
-}