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

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

@@ -63,7 +63,6 @@ public class AppAuthController {
     @PostMapping("/login")
     public R<LoginVo> login(@RequestBody AppSmsLoginBody appSmsLoginBody) {
 //        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
-        LoginHelper.getLoginUser();
         ValidatorUtils.validate(appSmsLoginBody);
         SmsLoginBody loginBody = new SmsLoginBody();
         loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber());

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

@@ -0,0 +1,57 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.app.service.AppFileService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP 文件管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/file")
+public class AppFileController extends BaseController {
+
+    private final AppFileService appFileService;
+
+    /**
+     * 查询文件列表
+     */
+    @GetMapping("/list")
+    public List<AppFileVo> list(AppFileDto bo) {
+        return null;
+    }
+
+    /**
+     * 文件添加
+     */
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody AppFileDto bo) {
+        return null;
+    }
+
+    /**
+     * 文件编辑
+     */
+    @PostMapping("/edit")
+    public R<Void> edit(@RequestBody AppFileDto bo) {
+        return null;
+    }
+
+    /**
+     * 文件删除
+     */
+    @DeleteMapping("/delete")
+    public R<Void> delete(AppFileDto bo) {
+        return null;
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.web.core.BaseController;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP 操作视频管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/operationVideo")
+public class AppOperationVideoController extends BaseController {
+
+    private final IAppOperationVideoService appOperationVideoService;
+
+    /**
+     * 查询操作视频列表
+     */
+    @GetMapping("/listOperationVideos")
+    public List<AppOperationVideoVo> listOperationVideos(AppOperationVideoBo bo) {
+        return appOperationVideoService.queryList(bo);
+    }
+
+    /**
+     * 查询操作视频详情信息
+     */
+    @GetMapping("/getOperationVideoInfo")
+    public AppOperationVideoVo getOperationVideoInfo(AppOperationVideoBo bo) {
+        return appOperationVideoService.queryById(bo.getId());
+    }
+
+    /**
+     * 操作视频添加
+     */
+    @PostMapping("/addOperationVideo")
+    public R<Void> addOperationVideo(@RequestBody AppOperationVideoBo bo) {
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+        if (loginUser != null) {
+            bo.setCreateBy(loginUser.getUserId());
+        }
+        return toAjax(appOperationVideoService.insertByBo(bo));
+    }
+
+    /**
+     * 操作视频编辑
+     */
+    @PostMapping("/editOperationVideo")
+    public R<Void> editOperationVideo(@RequestBody AppOperationVideoBo bo) {
+        return toAjax(appOperationVideoService.updateByBo(bo));
+    }
+
+    /**
+     * 操作视频删除
+     */
+    @DeleteMapping("/deleteOperationVideo")
+    public R<Void> deleteOperationVideo(Long[] ids) {
+        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class AppFileDto {
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppVideoDto.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class AppVideoDto {
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.app.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class AppFileVo {
+
+}

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

@@ -0,0 +1,25 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.bo.AppUserBo;
+import com.fuyuanshen.app.domain.vo.DeviceVo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class AppFileService {
+
+
+    public TableDataInfo<DeviceVo> queryPageList(AppUserBo bo, PageQuery pageQuery) {
+        return null;
+    }
+}

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

@@ -63,7 +63,7 @@ public class AppLoginService {
     /**
      * 退出登录
      */
-    /*public void logout() {
+    public void logout() {
         try {
             AppLoginUser loginUser = AppLoginHelper.getLoginUser();
             if (ObjectUtil.isNull(loginUser)) {
@@ -81,7 +81,7 @@ public class AppLoginService {
             } catch (NotLoginException ignored) {
             }
         }
-    }*/
+    }
 
     /**
      * 记录登录信息