Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application.yml

@@ -152,6 +152,7 @@ tenant:
     - sys_client
     - xiaoyuan_reservat
     - xiaoyuan_opinion
+    - update_app
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/UpdateAppController.java

@@ -0,0 +1,115 @@
+package org.dromara.system.controller.app;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.UpdateAppVo;
+import org.dromara.system.domain.bo.UpdateAppBo;
+import org.dromara.system.service.IUpdateAppService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * APP版本描述
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/app")
+public class UpdateAppController extends BaseController {
+
+    private final IUpdateAppService updateAppService;
+
+    /**
+     * 查询APP版本描述列表
+     */
+    @SaCheckPermission("system:app:list")
+    @GetMapping("/list")
+    public TableDataInfo<UpdateAppVo> list(UpdateAppBo bo, PageQuery pageQuery) {
+        return updateAppService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出APP版本描述列表
+     */
+    @SaCheckPermission("system:app:export")
+    @Log(title = "APP版本描述", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(UpdateAppBo bo, HttpServletResponse response) {
+        List<UpdateAppVo> list = updateAppService.queryList(bo);
+        ExcelUtil.exportExcel(list, "APP版本描述", UpdateAppVo.class, response);
+    }
+
+    /**
+     * 获取APP版本描述详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:app:query")
+    @GetMapping("/{id}")
+    public R<UpdateAppVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(updateAppService.queryById(id));
+    }
+
+    /**
+     * 新增APP版本描述
+     */
+    @SaCheckPermission("system:app:add")
+    @Log(title = "APP版本描述", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UpdateAppBo bo) {
+        return toAjax(updateAppService.insertByBo(bo));
+    }
+
+    /**
+     * 修改APP版本描述
+     */
+    @SaCheckPermission("system:app:edit")
+    @Log(title = "APP版本描述", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UpdateAppBo bo) {
+        return toAjax(updateAppService.updateByBo(bo));
+    }
+
+    /**
+     * 删除APP版本描述
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:app:remove")
+    @Log(title = "APP版本描述", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(updateAppService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 获取当前最新版本数据
+     */
+    @GetMapping(value = "/new")
+    public AjaxResult getInfoNew(UpdateAppBo bo)
+    {
+        return updateAppService.getInfoNew(bo);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/UpdateApp.java

@@ -0,0 +1,61 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * APP版本描述对象 update_app
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("update_app")
+public class UpdateApp extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 系统：Android：安卓系统，Apple：苹果系统
+     */
+    private String model;
+
+    /**
+     * 版本名称
+     */
+    private String name;
+
+    /**
+     * 版本号
+     */
+    private String code;
+
+    /**
+     * 版本描述
+     */
+    private String description;
+
+    /**
+     * 下载地址
+     */
+    private String path;
+
+    /**
+     * 是否有效 N：失效 Y：有效
+     */
+    private String isDel;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/UpdateAppBo.java

@@ -0,0 +1,66 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.UpdateApp;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * APP版本描述业务对象 update_app
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = UpdateApp.class, reverseConvertGenerate = false)
+public class UpdateAppBo extends BaseEntity {
+
+    /**
+     *
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 系统：Android：安卓系统，Apple：苹果系统
+     */
+    @NotBlank(message = "系统：Android：安卓系统，Apple：苹果系统不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String model;
+
+    /**
+     * 版本名称
+     */
+    @NotBlank(message = "版本名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 版本号
+     */
+    @NotBlank(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String code;
+
+    /**
+     * 版本描述
+     */
+    @NotBlank(message = "版本描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String description;
+
+    /**
+     * 下载地址
+     */
+    @NotBlank(message = "下载地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String path;
+
+    /**
+     * 是否有效 N：失效 Y：有效
+     */
+    @NotBlank(message = "是否有效 N：失效 Y：有效不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isDel;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UpdateAppVo.java

@@ -0,0 +1,74 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.UpdateApp;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.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版本描述视图对象 update_app
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = UpdateApp.class)
+public class UpdateAppVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 系统：Android：安卓系统，Apple：苹果系统
+     */
+    @ExcelProperty(value = "系统：Android：安卓系统，Apple：苹果系统")
+    private String model;
+
+    /**
+     * 版本名称
+     */
+    @ExcelProperty(value = "版本名称")
+    private String name;
+
+    /**
+     * 版本号
+     */
+    @ExcelProperty(value = "版本号")
+    private String code;
+
+    /**
+     * 版本描述
+     */
+    @ExcelProperty(value = "版本描述")
+    private String description;
+
+    /**
+     * 下载地址
+     */
+    @ExcelProperty(value = "下载地址")
+    private String path;
+
+    /**
+     * 是否有效 N：失效 Y：有效
+     */
+    @ExcelProperty(value = "是否有效 N：失效 Y：有效")
+    private String isDel;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/UpdateAppMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.UpdateApp;
+import org.dromara.system.domain.vo.UpdateAppVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * APP版本描述Mapper接口
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+public interface UpdateAppMapper extends BaseMapperPlus<UpdateApp, UpdateAppVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IUpdateAppService.java

@@ -0,0 +1,52 @@
+package org.dromara.system.service;
+
+import org.dromara.common.core.domain.AjaxResult;
+import org.dromara.system.domain.UpdateApp;
+import org.dromara.system.domain.vo.UpdateAppVo;
+import org.dromara.system.domain.bo.UpdateAppBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * APP版本描述Service接口
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+public interface IUpdateAppService {
+
+    /**
+     * 查询APP版本描述
+     */
+    UpdateAppVo queryById(Long id);
+
+    /**
+     * 查询APP版本描述列表
+     */
+    TableDataInfo<UpdateAppVo> queryPageList(UpdateAppBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询APP版本描述列表
+     */
+    List<UpdateAppVo> queryList(UpdateAppBo bo);
+
+    /**
+     * 新增APP版本描述
+     */
+    Boolean insertByBo(UpdateAppBo bo);
+
+    /**
+     * 修改APP版本描述
+     */
+    Boolean updateByBo(UpdateAppBo bo);
+
+    /**
+     * 校验并批量删除APP版本描述信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    AjaxResult getInfoNew(UpdateAppBo bo);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/UpdateAppServiceImpl.java

@@ -0,0 +1,135 @@
+package org.dromara.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.dromara.common.core.domain.AjaxResult;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.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 org.dromara.system.domain.SysUser;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.UpdateAppBo;
+import org.dromara.system.domain.vo.UpdateAppVo;
+import org.dromara.system.domain.UpdateApp;
+import org.dromara.system.mapper.UpdateAppMapper;
+import org.dromara.system.service.IUpdateAppService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * APP版本描述Service业务层处理
+ *
+ * @author boman
+ * @date 2023-09-18
+ */
+@RequiredArgsConstructor
+@Service
+public class UpdateAppServiceImpl implements IUpdateAppService {
+
+    private final UpdateAppMapper baseMapper;
+
+    /**
+     * 查询APP版本描述
+     */
+    @Override
+    public UpdateAppVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询APP版本描述列表
+     */
+    @Override
+    public TableDataInfo<UpdateAppVo> queryPageList(UpdateAppBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<UpdateApp> lqw = buildQueryWrapper(bo);
+        Page<UpdateAppVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询APP版本描述列表
+     */
+    @Override
+    public List<UpdateAppVo> queryList(UpdateAppBo bo) {
+        LambdaQueryWrapper<UpdateApp> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<UpdateApp> buildQueryWrapper(UpdateAppBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<UpdateApp> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getModel()), UpdateApp::getModel, bo.getModel());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), UpdateApp::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), UpdateApp::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getDescription()), UpdateApp::getDescription, bo.getDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getPath()), UpdateApp::getPath, bo.getPath());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsDel()), UpdateApp::getIsDel, bo.getIsDel());
+        return lqw;
+    }
+
+    /**
+     * 新增APP版本描述
+     */
+    @Override
+    public Boolean insertByBo(UpdateAppBo bo) {
+
+        //将之前的数据全改为失效
+        baseMapper.update(null,
+            new LambdaUpdateWrapper<UpdateApp>()
+                .set(UpdateApp::getIsDel, "0")
+                .eq(UpdateApp::getModel, bo.getModel()));
+
+        UpdateApp add = MapstructUtils.convert(bo, UpdateApp.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改APP版本描述
+     */
+    @Override
+    public Boolean updateByBo(UpdateAppBo bo) {
+        UpdateApp update = MapstructUtils.convert(bo, UpdateApp.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(UpdateApp entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除APP版本描述
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public AjaxResult getInfoNew(UpdateAppBo bo) {
+        bo.setIsDel("Y");
+        LambdaQueryWrapper<UpdateApp> lqw = buildQueryWrapper(bo);
+        List<UpdateAppVo> appList = baseMapper.selectVoList(lqw);
+        if(appList != null && appList.size()>0){
+            return AjaxResult.success(appList.get(0));
+        }
+        return AjaxResult.success(new UpdateAppVo());
+    }
+}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UpdateAppMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.UpdateAppMapper">
+
+</mapper>