后管APP版本管理相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/AppVersion.java

@@ -0,0 +1,27 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * @Param   APP版本
+ * @Author wangwl
+ * @Date 2023/8/29 10:02
+ **/
+@Data
+@TableName("m_app_version")
+@EqualsAndHashCode(callSuper = true)
+public class AppVersion extends BaseEntity {
+
+    @ApiModelProperty("应用平台")
+    private String platform;
+
+    @ApiModelProperty("应用名称")
+    private String name;
+
+    @ApiModelProperty("当前版本")
+    private String currentVersion;
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/AppVersionDetail.java

@@ -0,0 +1,48 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Param   APP版本详情
+ * @Author wangwl
+ * @Date 2023/8/29 10:02
+ **/
+@Data
+@TableName("m_app_version_detail")
+@EqualsAndHashCode(callSuper = true)
+public class AppVersionDetail extends BaseEntity {
+
+    @ApiModelProperty(" 版本id")
+    private Long versionId;
+
+    @ApiModelProperty("版本号")
+    private String versionNumber ;
+
+    @ApiModelProperty("软件类型")
+    private Integer softwareType ;
+
+    @ApiModelProperty("文件类型")
+    private Integer fileType;
+
+    @ApiModelProperty("更新内容")
+    private String updateContent;
+
+    @ApiModelProperty("文件地址")
+    private String fileUrl;
+
+    @ApiModelProperty("文件大小")
+    private Long fileSize;
+
+    @ApiModelProperty(" 是否强制更新")
+    private Integer constraintUpdate;
+
+    @ApiModelProperty(" 更新时间")
+    private LocalDateTime updateDate;
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/AppVersionController.java

@@ -0,0 +1,74 @@
+package org.springblade.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.MixProportionInfo;
+import org.springblade.manager.service.IAppVersionService;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/appVersion")
+@Api(value = "后管APP管理版本", tags = "后管APP管理版本")
+public class AppVersionController extends BladeController {
+
+    private final IAppVersionService versionService;
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "新增", notes = "传入版本信息")
+    public R add(@RequestBody AppVersion appVersion){
+        versionService.save(appVersion);
+        return R.data("新增成功");
+    }
+
+    /**
+     * 分页
+     */
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "分页", notes = "传入分页信息")
+    public R<IPage<AppVersion>> page(Query query){
+        IPage<AppVersion> page = new Page<>(query.getCurrent(),query.getSize());
+        IPage<AppVersion> iPage = versionService.page(page);
+        return R.data(iPage);
+    }
+
+    /**
+     * 修改
+     */
+    @PostMapping("/update")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "修改", notes = "传入版本信息")
+    public R update(@RequestBody AppVersion appVersion){
+        versionService.updateById(appVersion);
+        return R.data("修改成功");
+    }
+
+    /**
+     * 删除
+     */
+    @GetMapping("/delete")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "删除", notes = "传入id")
+    public R page(Long id){
+        versionService.removeById(id);
+        return R.data("删除成功");
+    }
+
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/AppVersionDetailController.java

@@ -0,0 +1,85 @@
+package org.springblade.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.AppVersionDetail;
+import org.springblade.manager.service.IAppVersionDetailService;
+import org.springblade.manager.service.IAppVersionService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/appVersionDetail")
+@Api(value = "后管APP管理版本详情", tags = "后管APP管理版本详情")
+public class AppVersionDetailController extends BladeController {
+    private final IAppVersionDetailService versionDetailService;
+    private final IAppVersionService versionService;
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "新增", notes = "传入版本信息")
+    @Transactional
+    public R add(@RequestBody AppVersionDetail detail){
+        detail.setUpdateDate(LocalDateTime.now());
+        versionDetailService.save(detail);
+        AppVersion appVersion = new AppVersion();
+        appVersion.setId(detail.getVersionId());
+        appVersion.setCurrentVersion(detail.getVersionNumber());
+        versionService.updateById(appVersion);
+        return R.data("新增成功");
+    }
+
+    /**
+     * 分页
+     */
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "分页", notes = "传入版本id与分页信息")
+    public R<IPage<AppVersionDetail>> page(Long versionId,Query query){
+        IPage<AppVersionDetail> page = new Page<>(query.getCurrent(),query.getSize());
+        IPage<AppVersionDetail> iPage = versionDetailService.page(page,
+                new LambdaQueryWrapper<AppVersionDetail>().eq(AppVersionDetail::getVersionId,versionId));
+        return R.data(iPage);
+    }
+
+    /**
+     * 修改
+     */
+    @PostMapping("/update")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "修改", notes = "传入版本详情")
+    public R update(@RequestBody AppVersionDetail detail){
+        versionDetailService.updateById(detail);
+        return R.data("修改成功");
+    }
+
+    /**
+     * 删除
+     */
+    @GetMapping("/delete")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "删除", notes = "传入id")
+    public R page(Long id){
+        versionDetailService.removeById(id);
+        return R.data("删除成功");
+    }
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/AppVersionDetailMapper.java

@@ -0,0 +1,9 @@
+package org.springblade.manager.mapper;
+
+
+import org.springblade.manager.entity.AppVersionDetail;
+import org.springblade.manager.injector.EasyBaseMapper;
+
+public interface AppVersionDetailMapper extends EasyBaseMapper<AppVersionDetail> {
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/AppVersionDetailMapper.xml

@@ -0,0 +1,6 @@
+<?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.springblade.manager.mapper.AppVersionDetailMapper">
+
+
+</mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/AppVersionMapper.java

@@ -0,0 +1,17 @@
+package org.springblade.manager.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.manager.dto.WbsTreePrivateDTO2;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.TableInfo;
+import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.entity.WbsTreePrivate;
+import org.springblade.manager.injector.EasyBaseMapper;
+import org.springblade.manager.vo.*;
+
+import java.util.List;
+
+public interface AppVersionMapper extends EasyBaseMapper<AppVersion> {
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/AppVersionMapper.xml

@@ -0,0 +1,6 @@
+<?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.springblade.manager.mapper.AppVersionMapper">
+
+
+</mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/MixProportionInfoMapper.xml

@@ -11,7 +11,7 @@
         <foreach collection="number" item="n" open="(" separator="," close=")">
             #{n}
         </foreach>
-        or
+        or design_strength in
         <foreach collection="strength" item="s" open="(" separator="," close=")">
             #{s}
         </foreach>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IAppVersionDetailService.java

@@ -0,0 +1,32 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.AppVersionDetail;
+
+/**
+ * 服务类
+ *
+ * @author BladeX
+ * @since 2023-03-20
+ */
+public interface IAppVersionDetailService extends BaseService<AppVersionDetail> {
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IAppVersionService.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.ArchiveAutoRuleWbs;
+import org.springblade.manager.vo.ArchiveAutoRuleWbsVO;
+
+/**
+ * 服务类
+ *
+ * @author BladeX
+ * @since 2023-03-20
+ */
+public interface IAppVersionService extends BaseService<AppVersion> {
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/AppVersionDetailImpl.java

@@ -0,0 +1,19 @@
+package org.springblade.manager.service.impl;
+
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.AppVersionDetail;
+import org.springblade.manager.mapper.AppVersionDetailMapper;
+import org.springblade.manager.mapper.AppVersionMapper;
+import org.springblade.manager.service.IAppVersionDetailService;
+import org.springblade.manager.service.IAppVersionService;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class AppVersionDetailImpl extends BaseServiceImpl<AppVersionDetailMapper, AppVersionDetail> implements IAppVersionDetailService {
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/AppVersionImpl.java

@@ -0,0 +1,24 @@
+package org.springblade.manager.service.impl;
+
+
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.ForestNodeMergerEx;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.manager.entity.AppVersion;
+import org.springblade.manager.entity.TableInfo;
+import org.springblade.manager.mapper.AppVersionMapper;
+import org.springblade.manager.mapper.TableInfoMapper;
+import org.springblade.manager.service.IAppVersionService;
+import org.springblade.manager.service.ITableInfoService;
+import org.springblade.manager.vo.ArchiveTreeContractVO2;
+import org.springblade.manager.vo.ArchiveTreeVO2;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+@AllArgsConstructor
+public class AppVersionImpl extends BaseServiceImpl<AppVersionMapper, AppVersion> implements IAppVersionService {
+
+
+}