LIVE_YE il y a 2 mois
Parent
commit
1d43ceaced

+ 110 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/updateApp/UpdateAppController.java

@@ -0,0 +1,110 @@
+package org.dromara.controller.updateApp;
+
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.AjaxResult;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.domain.updateApp.UpdateApp;
+import org.dromara.domain.updateApp.bo.UpdateAppBo;
+import org.dromara.domain.updateApp.vo.UpdateAppVo;
+import org.dromara.service.IUpdateAppService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP版本描述
+ *
+ * @author boman
+ * @date 2025-04-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/app")
+public class UpdateAppController extends BaseController {
+
+    private final IUpdateAppService updateAppService;
+
+    /**
+     * 查询APP版本描述列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<UpdateAppVo> list(UpdateAppBo bo, PageQuery pageQuery) {
+        return updateAppService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出APP版本描述列表
+     */
+    @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 主键
+     */
+    @GetMapping("/{id}")
+    public R<UpdateAppVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(updateAppService.queryById(id));
+    }
+
+    /**
+     * 新增APP版本描述
+     */
+    @Log(title = "APP版本描述", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UpdateAppBo bo) {
+        return toAjax(updateAppService.insertByBo(bo));
+    }
+
+    /**
+     * 修改APP版本描述
+     */
+    @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 主键串
+     */
+    @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(UpdateApp updateApp)
+    {
+        return updateAppService.getInfoNew(updateApp);
+    }
+}

+ 66 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/updateApp/UpdateApp.java

@@ -0,0 +1,66 @@
+package org.dromara.domain.updateApp;
+
+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 2025-04-28
+ */
+@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;
+
+    /**
+     * app端:1:物管端,2:用户端
+     */
+    private String appPort;
+
+    /**
+     * 版本名称
+     */
+    private String name;
+
+    /**
+     * 版本号
+     */
+    private String code;
+
+    /**
+     * 版本描述
+     */
+    private String description;
+
+    /**
+     * 下载地址
+     */
+    private String path;
+
+    /**
+     * 是否有效 N:失效 Y:有效
+     */
+    private String isDel;
+
+
+}

+ 64 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/updateApp/bo/UpdateAppBo.java

@@ -0,0 +1,64 @@
+package org.dromara.domain.updateApp.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.domain.updateApp.UpdateApp;
+
+/**
+ * APP版本描述业务对象 update_app
+ *
+ * @author boman
+ * @date 2025-04-28
+ */
+@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:苹果系统
+     */
+    private String model;
+
+    /**
+     * app端:1:物管端,2:用户端
+     */
+    private String appPort;
+
+    /**
+     * 版本名称
+     */
+    private String name;
+
+    /**
+     * 版本号
+     */
+    private String code;
+
+    /**
+     * 版本描述
+     */
+    private String description;
+
+    /**
+     * 下载地址
+     */
+    private String path;
+
+    /**
+     * 是否有效 N:失效 Y:有效
+     */
+    private String isDel;
+
+
+}

+ 77 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/updateApp/vo/UpdateAppVo.java

@@ -0,0 +1,77 @@
+package org.dromara.domain.updateApp.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.domain.updateApp.UpdateApp;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * APP版本描述视图对象 update_app
+ *
+ * @author boman
+ * @date 2025-04-28
+ */
+@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;
+
+    /**
+     * app端:1:物管端,2:用户端
+     */
+    @ExcelProperty(value = "app端:1:物管端,2:用户端")
+    private String appPort;
+
+    /**
+     * 版本名称
+     */
+    @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;
+
+
+}

+ 17 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/mapper/UpdateAppMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.domain.updateApp.UpdateApp;
+import org.dromara.domain.updateApp.vo.UpdateAppVo;
+
+/**
+ * APP版本描述Mapper接口
+ *
+ * @author boman
+ * @date 2025-04-28
+ */
+public interface UpdateAppMapper extends BaseMapperPlus<UpdateApp, UpdateAppVo> {
+
+    UpdateApp getInfo(UpdateApp updateApp);
+}

+ 73 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/IUpdateAppService.java

@@ -0,0 +1,73 @@
+package org.dromara.service;
+
+
+import org.dromara.common.core.domain.model.AjaxResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.domain.updateApp.UpdateApp;
+import org.dromara.domain.updateApp.bo.UpdateAppBo;
+import org.dromara.domain.updateApp.vo.UpdateAppVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * APP版本描述Service接口
+ *
+ * @author boman
+ * @date 2025-04-28
+ */
+public interface IUpdateAppService {
+
+    /**
+     * 查询APP版本描述
+     *
+     * @param id 主键
+     * @return APP版本描述
+     */
+    UpdateAppVo queryById(Long id);
+
+    /**
+     * 分页查询APP版本描述列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return APP版本描述分页列表
+     */
+    TableDataInfo<UpdateAppVo> queryPageList(UpdateAppBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的APP版本描述列表
+     *
+     * @param bo 查询条件
+     * @return APP版本描述列表
+     */
+    List<UpdateAppVo> queryList(UpdateAppBo bo);
+
+    /**
+     * 新增APP版本描述
+     *
+     * @param bo APP版本描述
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(UpdateAppBo bo);
+
+    /**
+     * 修改APP版本描述
+     *
+     * @param bo APP版本描述
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(UpdateAppBo bo);
+
+    /**
+     * 校验并批量删除APP版本描述信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    AjaxResult getInfoNew(UpdateApp updateApp);
+}

+ 147 - 0
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/UpdateAppServiceImpl.java

@@ -0,0 +1,147 @@
+package org.dromara.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.model.AjaxResult;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.domain.updateApp.UpdateApp;
+import org.dromara.domain.updateApp.bo.UpdateAppBo;
+import org.dromara.domain.updateApp.vo.UpdateAppVo;
+import org.dromara.mapper.UpdateAppMapper;
+import org.dromara.service.IUpdateAppService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP版本描述Service业务层处理
+ *
+ * @author boman
+ * @date 2025-04-28
+ */
+@RequiredArgsConstructor
+@Service
+public class UpdateAppServiceImpl implements IUpdateAppService {
+
+    private final UpdateAppMapper baseMapper;
+
+    /**
+     * 查询APP版本描述
+     *
+     * @param id 主键
+     * @return APP版本描述
+     */
+    @Override
+    public UpdateAppVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询APP版本描述列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 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版本描述列表
+     *
+     * @param bo 查询条件
+     * @return 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.orderByAsc(UpdateApp::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getModel()), UpdateApp::getModel, bo.getModel());
+        lqw.eq(StringUtils.isNotBlank(bo.getAppPort()), UpdateApp::getAppPort, bo.getAppPort());
+        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版本描述
+     *
+     * @param bo APP版本描述
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(UpdateAppBo bo) {
+        UpdateApp add = MapstructUtils.convert(bo, UpdateApp.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改APP版本描述
+     *
+     * @param bo APP版本描述
+     * @return 是否修改成功
+     */
+    @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版本描述信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public AjaxResult getInfoNew(UpdateApp updateApp) {
+        updateApp.setIsDel("Y");
+        UpdateApp app = baseMapper.getInfo(updateApp);
+        if(app == null){
+            app = new UpdateApp();
+        }
+        return AjaxResult.success(app);
+    }
+}

+ 34 - 0
ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/UpdateAppMapper.xml

@@ -0,0 +1,34 @@
+<?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.mapper.UpdateAppMapper">
+
+    <resultMap type="org.dromara.domain.updateApp.UpdateApp" id="UpdateAppResult">
+        <result property="id"    column="id"    />
+        <result property="appPort"    column="app_port"    />
+        <result property="model"    column="model"    />
+        <result property="name"    column="name"    />
+        <result property="code"    column="code"    />
+        <result property="description"    column="description"    />
+        <result property="path"    column="path"    />
+        <result property="isDel"    column="is_del"    />
+    </resultMap>
+
+    <sql id="selectUpdateAppVo">
+        select id, model,app_port, name, code, description, path, is_del, create_time from update_app
+    </sql>
+
+    <select id="getInfo" parameterType="UpdateApp" resultMap="UpdateAppResult">
+        <include refid="selectUpdateAppVo"/>
+        <where>
+            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <if test="appPort != null  and appPort != ''"> and app_port = #{appPort}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="path != null  and path != ''"> and path = #{path}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+</mapper>