diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java index 2d0a140..2d06b91 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java @@ -63,7 +63,6 @@ public class AppAuthController { @PostMapping("/login") public R login(@RequestBody AppSmsLoginBody appSmsLoginBody) { // SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class); - LoginHelper.getLoginUser(); ValidatorUtils.validate(appSmsLoginBody); SmsLoginBody loginBody = new SmsLoginBody(); loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber()); diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java new file mode 100644 index 0000000..dd19f59 --- /dev/null +++ b/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 list(AppFileDto bo) { + return null; + } + + /** + * 文件添加 + */ + @PostMapping("/add") + public R add(@RequestBody AppFileDto bo) { + return null; + } + + /** + * 文件编辑 + */ + @PostMapping("/edit") + public R edit(@RequestBody AppFileDto bo) { + return null; + } + + /** + * 文件删除 + */ + @DeleteMapping("/delete") + public R delete(AppFileDto bo) { + return null; + } +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java new file mode 100644 index 0000000..919873b --- /dev/null +++ b/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 listOperationVideos(AppOperationVideoBo bo) { + return appOperationVideoService.queryList(bo); + } + + /** + * 查询操作视频详情信息 + */ + @GetMapping("/getOperationVideoInfo") + public AppOperationVideoVo getOperationVideoInfo(AppOperationVideoBo bo) { + return appOperationVideoService.queryById(bo.getId()); + } + + /** + * 操作视频添加 + */ + @PostMapping("/addOperationVideo") + public R addOperationVideo(@RequestBody AppOperationVideoBo bo) { + AppLoginUser loginUser = AppLoginHelper.getLoginUser(); + if (loginUser != null) { + bo.setCreateBy(loginUser.getUserId()); + } + return toAjax(appOperationVideoService.insertByBo(bo)); + } + + /** + * 操作视频编辑 + */ + @PostMapping("/editOperationVideo") + public R editOperationVideo(@RequestBody AppOperationVideoBo bo) { + return toAjax(appOperationVideoService.updateByBo(bo)); + } + + /** + * 操作视频删除 + */ + @DeleteMapping("/deleteOperationVideo") + public R deleteOperationVideo(Long[] ids) { + return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java new file mode 100644 index 0000000..dc5d8ce --- /dev/null +++ b/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 { + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppVideoDto.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppVideoDto.java new file mode 100644 index 0000000..b7ddc02 --- /dev/null +++ b/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 { + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java new file mode 100644 index 0000000..a94106e --- /dev/null +++ b/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 { + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java new file mode 100644 index 0000000..2cdbb4a --- /dev/null +++ b/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 queryPageList(AppUserBo bo, PageQuery pageQuery) { + return null; + } +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java index 505e1ea..bd92c2b 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java +++ b/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) { } } - }*/ + } /** * 记录登录信息 diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java new file mode 100644 index 0000000..f6e0fb2 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java @@ -0,0 +1,105 @@ +package com.fuyuanshen.app.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.app.domain.vo.AppOperationVideoVo; +import com.fuyuanshen.app.domain.bo.AppOperationVideoBo; +import com.fuyuanshen.app.service.IAppOperationVideoService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; + +/** + * 操作视频 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/operationVideo") +public class AppOperationVideoController extends BaseController { + + private final IAppOperationVideoService appOperationVideoService; + + /** + * 查询操作视频列表 + */ + @SaCheckPermission("app:operationVideo:list") + @GetMapping("/list") + public TableDataInfo list(AppOperationVideoBo bo, PageQuery pageQuery) { + return appOperationVideoService.queryPageList(bo, pageQuery); + } + + /** + * 导出操作视频列表 + */ + @SaCheckPermission("app:operationVideo:export") + @Log(title = "操作视频", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(AppOperationVideoBo bo, HttpServletResponse response) { + List list = appOperationVideoService.queryList(bo); + ExcelUtil.exportExcel(list, "操作视频", AppOperationVideoVo.class, response); + } + + /** + * 获取操作视频详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("app:operationVideo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(appOperationVideoService.queryById(id)); + } + + /** + * 新增操作视频 + */ + @SaCheckPermission("app:operationVideo:add") + @Log(title = "操作视频", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody AppOperationVideoBo bo) { + return toAjax(appOperationVideoService.insertByBo(bo)); + } + + /** + * 修改操作视频 + */ + @SaCheckPermission("app:operationVideo:edit") + @Log(title = "操作视频", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody AppOperationVideoBo bo) { + return toAjax(appOperationVideoService.updateByBo(bo)); + } + + /** + * 删除操作视频 + * + * @param ids 主键串 + */ + @SaCheckPermission("app:operationVideo:remove") + @Log(title = "操作视频", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppPersonnelInfoController.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppPersonnelInfoController.java new file mode 100644 index 0000000..f725dff --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppPersonnelInfoController.java @@ -0,0 +1,105 @@ +package com.fuyuanshen.app.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo; +import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo; +import com.fuyuanshen.app.service.IAppPersonnelInfoService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; + +/** + * 人员信息登记 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/personnelInfo") +public class AppPersonnelInfoController extends BaseController { + + private final IAppPersonnelInfoService appPersonnelInfoService; + + /** + * 查询人员信息登记列表 + */ + @SaCheckPermission("app:personnelInfo:list") + @GetMapping("/list") + public TableDataInfo list(AppPersonnelInfoBo bo, PageQuery pageQuery) { + return appPersonnelInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出人员信息登记列表 + */ + @SaCheckPermission("app:personnelInfo:export") + @Log(title = "人员信息登记", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(AppPersonnelInfoBo bo, HttpServletResponse response) { + List list = appPersonnelInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "人员信息登记", AppPersonnelInfoVo.class, response); + } + + /** + * 获取人员信息登记详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("app:personnelInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(appPersonnelInfoService.queryById(id)); + } + + /** + * 新增人员信息登记 + */ + @SaCheckPermission("app:personnelInfo:add") + @Log(title = "人员信息登记", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) { + return toAjax(appPersonnelInfoService.insertByBo(bo)); + } + + /** + * 修改人员信息登记 + */ + @SaCheckPermission("app:personnelInfo:edit") + @Log(title = "人员信息登记", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody AppPersonnelInfoBo bo) { + return toAjax(appPersonnelInfoService.updateByBo(bo)); + } + + /** + * 删除人员信息登记 + * + * @param ids 主键串 + */ + @SaCheckPermission("app:personnelInfo:remove") + @Log(title = "人员信息登记", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(appPersonnelInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppOperationVideo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppOperationVideo.java new file mode 100644 index 0000000..0a88c31 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppOperationVideo.java @@ -0,0 +1,51 @@ +package com.fuyuanshen.app.domain; + +import com.fuyuanshen.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 操作视频对象 app_operation_video + * + * @author Lion Li + * @date 2025-07-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("app_operation_video") +public class AppOperationVideo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 视频名称 + */ + private String videoName; + + /** + * 视频链接 + */ + private String videoUrl; + + /** + * 设备di + */ + private Long deviceId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppPersonnelInfo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppPersonnelInfo.java new file mode 100644 index 0000000..0ce717b --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppPersonnelInfo.java @@ -0,0 +1,55 @@ +package com.fuyuanshen.app.domain; + +import com.fuyuanshen.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 人员信息登记对象 app_personnel_info + * + * @author Lion Li + * @date 2025-07-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("app_personnel_info") +public class AppPersonnelInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 设备id + */ + private Long deviceId; + + /** + * 人员姓名 + */ + private String name; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 发送信息 + */ + private String sendMsg; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppOperationVideoBo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppOperationVideoBo.java new file mode 100644 index 0000000..7abd0f6 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppOperationVideoBo.java @@ -0,0 +1,49 @@ +package com.fuyuanshen.app.domain.bo; + +import com.fuyuanshen.app.domain.AppOperationVideo; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 操作视频业务对象 app_operation_video + * + * @author Lion Li + * @date 2025-07-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = AppOperationVideo.class, reverseConvertGenerate = false) +public class AppOperationVideoBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 视频名称 + */ + private String videoName; + + /** + * 视频链接 + */ + private String videoUrl; + + /** + * 设备di + */ + private Long deviceId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java new file mode 100644 index 0000000..39f8b40 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java @@ -0,0 +1,56 @@ +package com.fuyuanshen.app.domain.bo; + +import com.fuyuanshen.app.domain.AppPersonnelInfo; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 人员信息登记业务对象 app_personnel_info + * + * @author Lion Li + * @date 2025-07-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = AppPersonnelInfo.class, reverseConvertGenerate = false) +public class AppPersonnelInfoBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long id; + + /** + * 设备id + */ + @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deviceId; + + /** + * 人员姓名 + */ + private String name; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 发送信息 + */ + private String sendMsg; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppOperationVideoVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppOperationVideoVo.java new file mode 100644 index 0000000..3ee214e --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppOperationVideoVo.java @@ -0,0 +1,62 @@ +package com.fuyuanshen.app.domain.vo; + +import com.fuyuanshen.app.domain.AppOperationVideo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 操作视频视图对象 app_operation_video + * + * @author Lion Li + * @date 2025-07-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = AppOperationVideo.class) +public class AppOperationVideoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 视频名称 + */ + @ExcelProperty(value = "视频名称") + private String videoName; + + /** + * 视频链接 + */ + @ExcelProperty(value = "视频链接") + private String videoUrl; + + /** + * 设备di + */ + @ExcelProperty(value = "设备di") + private Long deviceId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppPersonnelInfoVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppPersonnelInfoVo.java new file mode 100644 index 0000000..84c064c --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppPersonnelInfoVo.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.app.domain.vo; + +import com.fuyuanshen.app.domain.AppPersonnelInfo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 人员信息登记视图对象 app_personnel_info + * + * @author Lion Li + * @date 2025-07-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = AppPersonnelInfo.class) +public class AppPersonnelInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 设备id + */ + @ExcelProperty(value = "设备id") + private Long deviceId; + + /** + * 人员姓名 + */ + @ExcelProperty(value = "人员姓名") + private String name; + + /** + * 部门名称 + */ + @ExcelProperty(value = "部门名称") + private String deptName; + + /** + * 单位名称 + */ + @ExcelProperty(value = "单位名称") + private String unitName; + + /** + * 发送信息 + */ + @ExcelProperty(value = "发送信息") + private String sendMsg; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppOperationVideoMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppOperationVideoMapper.java new file mode 100644 index 0000000..65b7ef3 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppOperationVideoMapper.java @@ -0,0 +1,17 @@ +package com.fuyuanshen.app.mapper; + +import com.fuyuanshen.app.domain.AppOperationVideo; +import com.fuyuanshen.app.domain.vo.AppOperationVideoVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Mapper; + +/** + * 操作视频Mapper接口 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Mapper +public interface AppOperationVideoMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppPersonnelInfoMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppPersonnelInfoMapper.java new file mode 100644 index 0000000..6504f53 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppPersonnelInfoMapper.java @@ -0,0 +1,17 @@ +package com.fuyuanshen.app.mapper; + +import com.fuyuanshen.app.domain.AppPersonnelInfo; +import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Mapper; + +/** + * 人员信息登记Mapper接口 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Mapper +public interface AppPersonnelInfoMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppOperationVideoService.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppOperationVideoService.java new file mode 100644 index 0000000..54fcf44 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppOperationVideoService.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.app.service; + +import com.fuyuanshen.app.domain.vo.AppOperationVideoVo; +import com.fuyuanshen.app.domain.bo.AppOperationVideoBo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 操作视频Service接口 + * + * @author Lion Li + * @date 2025-07-02 + */ +public interface IAppOperationVideoService { + + /** + * 查询操作视频 + * + * @param id 主键 + * @return 操作视频 + */ + AppOperationVideoVo queryById(Long id); + + /** + * 分页查询操作视频列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 操作视频分页列表 + */ + TableDataInfo queryPageList(AppOperationVideoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的操作视频列表 + * + * @param bo 查询条件 + * @return 操作视频列表 + */ + List queryList(AppOperationVideoBo bo); + + /** + * 新增操作视频 + * + * @param bo 操作视频 + * @return 是否新增成功 + */ + Boolean insertByBo(AppOperationVideoBo bo); + + /** + * 修改操作视频 + * + * @param bo 操作视频 + * @return 是否修改成功 + */ + Boolean updateByBo(AppOperationVideoBo bo); + + /** + * 校验并批量删除操作视频信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppPersonnelInfoService.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppPersonnelInfoService.java new file mode 100644 index 0000000..6f7805b --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppPersonnelInfoService.java @@ -0,0 +1,68 @@ +package com.fuyuanshen.app.service; + +import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo; +import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 人员信息登记Service接口 + * + * @author Lion Li + * @date 2025-07-02 + */ +public interface IAppPersonnelInfoService { + + /** + * 查询人员信息登记 + * + * @param id 主键 + * @return 人员信息登记 + */ + AppPersonnelInfoVo queryById(Long id); + + /** + * 分页查询人员信息登记列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人员信息登记分页列表 + */ + TableDataInfo queryPageList(AppPersonnelInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的人员信息登记列表 + * + * @param bo 查询条件 + * @return 人员信息登记列表 + */ + List queryList(AppPersonnelInfoBo bo); + + /** + * 新增人员信息登记 + * + * @param bo 人员信息登记 + * @return 是否新增成功 + */ + Boolean insertByBo(AppPersonnelInfoBo bo); + + /** + * 修改人员信息登记 + * + * @param bo 人员信息登记 + * @return 是否修改成功 + */ + Boolean updateByBo(AppPersonnelInfoBo bo); + + /** + * 校验并批量删除人员信息登记信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java new file mode 100644 index 0000000..8141548 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java @@ -0,0 +1,134 @@ +package com.fuyuanshen.app.service.impl; + +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.fuyuanshen.app.domain.bo.AppOperationVideoBo; +import com.fuyuanshen.app.domain.vo.AppOperationVideoVo; +import com.fuyuanshen.app.domain.AppOperationVideo; +import com.fuyuanshen.app.mapper.AppOperationVideoMapper; +import com.fuyuanshen.app.service.IAppOperationVideoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 操作视频Service业务层处理 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AppOperationVideoServiceImpl implements IAppOperationVideoService { + + private final AppOperationVideoMapper baseMapper; + + /** + * 查询操作视频 + * + * @param id 主键 + * @return 操作视频 + */ + @Override + public AppOperationVideoVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询操作视频列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 操作视频分页列表 + */ + @Override + public TableDataInfo queryPageList(AppOperationVideoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的操作视频列表 + * + * @param bo 查询条件 + * @return 操作视频列表 + */ + @Override + public List queryList(AppOperationVideoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(AppOperationVideoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(AppOperationVideo::getId); + lqw.like(StringUtils.isNotBlank(bo.getVideoName()), AppOperationVideo::getVideoName, bo.getVideoName()); + lqw.eq(StringUtils.isNotBlank(bo.getVideoUrl()), AppOperationVideo::getVideoUrl, bo.getVideoUrl()); + lqw.eq(bo.getDeviceId() != null, AppOperationVideo::getDeviceId, bo.getDeviceId()); + return lqw; + } + + /** + * 新增操作视频 + * + * @param bo 操作视频 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(AppOperationVideoBo bo) { + AppOperationVideo add = MapstructUtils.convert(bo, AppOperationVideo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改操作视频 + * + * @param bo 操作视频 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(AppOperationVideoBo bo) { + AppOperationVideo update = MapstructUtils.convert(bo, AppOperationVideo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(AppOperationVideo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除操作视频信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppPersonnelInfoServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppPersonnelInfoServiceImpl.java new file mode 100644 index 0000000..55f07c3 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppPersonnelInfoServiceImpl.java @@ -0,0 +1,135 @@ +package com.fuyuanshen.app.service.impl; + +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo; +import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo; +import com.fuyuanshen.app.domain.AppPersonnelInfo; +import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper; +import com.fuyuanshen.app.service.IAppPersonnelInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 人员信息登记Service业务层处理 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AppPersonnelInfoServiceImpl implements IAppPersonnelInfoService { + + private final AppPersonnelInfoMapper baseMapper; + + /** + * 查询人员信息登记 + * + * @param id 主键 + * @return 人员信息登记 + */ + @Override + public AppPersonnelInfoVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询人员信息登记列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人员信息登记分页列表 + */ + @Override + public TableDataInfo queryPageList(AppPersonnelInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的人员信息登记列表 + * + * @param bo 查询条件 + * @return 人员信息登记列表 + */ + @Override + public List queryList(AppPersonnelInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(AppPersonnelInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getDeviceId() != null, AppPersonnelInfo::getDeviceId, bo.getDeviceId()); + lqw.like(StringUtils.isNotBlank(bo.getName()), AppPersonnelInfo::getName, bo.getName()); + lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AppPersonnelInfo::getDeptName, bo.getDeptName()); + lqw.like(StringUtils.isNotBlank(bo.getUnitName()), AppPersonnelInfo::getUnitName, bo.getUnitName()); + lqw.eq(StringUtils.isNotBlank(bo.getSendMsg()), AppPersonnelInfo::getSendMsg, bo.getSendMsg()); + return lqw; + } + + /** + * 新增人员信息登记 + * + * @param bo 人员信息登记 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(AppPersonnelInfoBo bo) { + AppPersonnelInfo add = MapstructUtils.convert(bo, AppPersonnelInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改人员信息登记 + * + * @param bo 人员信息登记 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(AppPersonnelInfoBo bo) { + AppPersonnelInfo update = MapstructUtils.convert(bo, AppPersonnelInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(AppPersonnelInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除人员信息登记信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppOperationVideoMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppOperationVideoMapper.xml new file mode 100644 index 0000000..e303e12 --- /dev/null +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppOperationVideoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppPersonnelInfoMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppPersonnelInfoMapper.xml new file mode 100644 index 0000000..cd5d71a --- /dev/null +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppPersonnelInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java index 748d696..f08ecd3 100644 --- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java @@ -3,11 +3,13 @@ package com.fuyuanshen.system.mapper; import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; import com.fuyuanshen.system.domain.SysOss; import com.fuyuanshen.system.domain.vo.SysOssVo; +import org.apache.ibatis.annotations.Mapper; /** * 文件上传 数据层 * * @author Lion Li */ +@Mapper public interface SysOssMapper extends BaseMapperPlus { }