chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

编号：ZSSAC-585 描述：安装包页面修改

Browse Source
This commit is contained in:
pengren 2024-04-23 16:41:37 +08:00
parent 178fdaf4c0
commit de01e86e76
5 changed files with 132 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java
View File

@ -77,6 +77,8 @@ public class SysApkInfoController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SysApkInfo sysApkInfo) public AjaxResult add(@RequestBody SysApkInfo sysApkInfo)
{ {
sysApkInfo.setCreated(getUsername());
sysApkInfo.setModified(getUsername());
return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo)); return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo));
} }
@ -88,6 +90,7 @@ public class SysApkInfoController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo) public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo)
{ {
sysApkInfo.setModified(getUsername());
return toAjax(sysApkInfoService.updateSysApkInfo(sysApkInfo)); return toAjax(sysApkInfoService.updateSysApkInfo(sysApkInfo));
} }

206
sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java
View File

@ -7,196 +7,232 @@ import com.sf.common.core.domain.BaseEntity;
/** /**
* 安装包管理（新）对象 SYS_APK_INFO * 安装包管理（新）对象 SYS_APK_INFO
* *
* @author ztzh * @author ztzh
* @date 2024-04-11 * @date 2024-04-11
*/ */
public class SysApkInfo extends BaseEntity public class SysApkInfo extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /**
* 主键
*/
private Long id; private Long id;
/** 上传类型 */ /**
* 上传类型
*/
private String appId;
private String appCode;
/**
* 上传类型
*/
@Excel(name = "上传类型") @Excel(name = "上传类型")
private String uploadingType; private String uploadingType;
/** 安装包名称 */ /**
* 安装包名称
*/
@Excel(name = "安装包名称") @Excel(name = "安装包名称")
private String sysApkName; private String sysApkName;
/** 版本号 */ /**
* 版本号
*/
@Excel(name = "版本号") @Excel(name = "版本号")
private String version; private String version;
/** 安装包 */ /**
* 安装包
*/
@Excel(name = "安装包") @Excel(name = "安装包")
private String sysApk; private String sysApk;
/** 安装包大小 */ /**
* 安装包大小
*/
@Excel(name = "安装包大小") @Excel(name = "安装包大小")
private String sysApkSize; private String sysApkSize;
/** 安装包类型 */ /**
* 安装包类型
*/
@Excel(name = "安装包类型") @Excel(name = "安装包类型")
private String sysType; private String sysType;
/** 上传状态 */ /**
* 上传状态
*/
private Long uploadingStatus; private Long uploadingStatus;
/** 日志id */ /**
* 日志id
*/
private Long uploadingLogId; private Long uploadingLogId;
/** 排序 */ /**
* 排序
*/
private Long orderNum; private Long orderNum;
/** 逻辑删除,0:未删除,1:删除 */ /**
* 逻辑删除,0:未删除,1:删除
*/
private Long isDelete; private Long isDelete;
/** 创建人 */ /**
* 创建人
*/
@Excel(name = "创建人") @Excel(name = "创建人")
private String created; private String created;
/** 更新人 */ /**
* 更新人
*/
private String modified; private String modified;
public void setId(Long id) public void setId(Long id) {
{
this.id = id; this.id = id;
} }
public Long getId() public Long getId() {
{
return id; return id;
} }
public void setUploadingType(String uploadingType)
{ public void setUploadingType(String uploadingType) {
this.uploadingType = uploadingType; this.uploadingType = uploadingType;
} }
public String getUploadingType() public String getUploadingType() {
{
return uploadingType; return uploadingType;
} }
public void setSysApkName(String sysApkName)
{ public void setSysApkName(String sysApkName) {
this.sysApkName = sysApkName; this.sysApkName = sysApkName;
} }
public String getSysApkName() public String getSysApkName() {
{
return sysApkName; return sysApkName;
} }
public void setVersion(String version)
{ public void setVersion(String version) {
this.version = version; this.version = version;
} }
public String getVersion() public String getVersion() {
{
return version; return version;
} }
public void setSysApk(String sysApk)
{ public void setSysApk(String sysApk) {
this.sysApk = sysApk; this.sysApk = sysApk;
} }
public String getSysApk() public String getSysApk() {
{
return sysApk; return sysApk;
} }
public void setSysApkSize(String sysApkSize)
{ public void setSysApkSize(String sysApkSize) {
this.sysApkSize = sysApkSize; this.sysApkSize = sysApkSize;
} }
public String getSysApkSize() public String getSysApkSize() {
{
return sysApkSize; return sysApkSize;
} }
public void setSysType(String sysType)
{ public void setSysType(String sysType) {
this.sysType = sysType; this.sysType = sysType;
} }
public String getSysType() public String getSysType() {
{
return sysType; return sysType;
} }
public void setUploadingStatus(Long uploadingStatus)
{ public void setUploadingStatus(Long uploadingStatus) {
this.uploadingStatus = uploadingStatus; this.uploadingStatus = uploadingStatus;
} }
public Long getUploadingStatus() public Long getUploadingStatus() {
{
return uploadingStatus; return uploadingStatus;
} }
public void setUploadingLogId(Long uploadingLogId)
{ public void setUploadingLogId(Long uploadingLogId) {
this.uploadingLogId = uploadingLogId; this.uploadingLogId = uploadingLogId;
} }
public Long getUploadingLogId() public Long getUploadingLogId() {
{
return uploadingLogId; return uploadingLogId;
} }
public void setOrderNum(Long orderNum)
{ public void setOrderNum(Long orderNum) {
this.orderNum = orderNum; this.orderNum = orderNum;
} }
public Long getOrderNum() public Long getOrderNum() {
{
return orderNum; return orderNum;
} }
public void setIsDelete(Long isDelete)
{ public void setIsDelete(Long isDelete) {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
public Long getIsDelete() public Long getIsDelete() {
{
return isDelete; return isDelete;
} }
public void setCreated(String created)
{ public void setCreated(String created) {
this.created = created; this.created = created;
} }
public String getCreated() public String getCreated() {
{
return created; return created;
} }
public void setModified(String modified)
{ public void setModified(String modified) {
this.modified = modified; this.modified = modified;
} }
public String getModified() public String getModified() {
{
return modified; return modified;
} }
public String getAppCode() {
return appCode;
}
public void setAppCode(String appCode) {
this.appCode = appCode;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("uploadingType", getUploadingType()) .append("uploadingType", getUploadingType())
.append("sysApkName", getSysApkName()) .append("sysApkName", getSysApkName())
.append("version", getVersion()) .append("version", getVersion())
.append("sysApk", getSysApk()) .append("sysApk", getSysApk())
.append("sysApkSize", getSysApkSize()) .append("sysApkSize", getSysApkSize())
.append("sysType", getSysType()) .append("sysType", getSysType())
.append("uploadingStatus", getUploadingStatus()) .append("uploadingStatus", getUploadingStatus())
.append("uploadingLogId", getUploadingLogId()) .append("uploadingLogId", getUploadingLogId())
.append("orderNum", getOrderNum()) .append("orderNum", getOrderNum())
.append("isDelete", getIsDelete()) .append("isDelete", getIsDelete())
.append("created", getCreated()) .append("created", getCreated())
.append("modified", getModified()) .append("modified", getModified())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.toString(); .append("appCode", getAppId())
.append("appId", getAppCode())
.toString();
} }
} }

1
sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java
View File

@ -54,6 +54,7 @@ public class SysApkInfoServiceImpl implements ISysApkInfoService
public int insertSysApkInfo(SysApkInfo sysApkInfo) public int insertSysApkInfo(SysApkInfo sysApkInfo)
{ {
sysApkInfo.setCreateTime(DateUtils.getNowDate()); sysApkInfo.setCreateTime(DateUtils.getNowDate());
sysApkInfo.setUpdateTime(DateUtils.getNowDate());
return sysApkInfoMapper.insertSysApkInfo(sysApkInfo); return sysApkInfoMapper.insertSysApkInfo(sysApkInfo);
} }

4
sf-admin/src/main/resources/application.yml
View File

@ -59,9 +59,9 @@ spring:
servlet: servlet:
multipart: multipart:
# 单个文件大小 # 单个文件大小
max-file-size: 10MB max-file-size: 100MB
# 设置总上传的文件大小 # 设置总上传的文件大小
max-request-size: 20MB max-request-size: 200MB
# 服务模块 # 服务模块
devtools: devtools:
restart: restart:

7
sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
View File

@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="SysApkInfo" id="SysApkInfoResult"> <resultMap type="SysApkInfo" id="SysApkInfoResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="appId" column="app_id" />
<result property="appCode" column="app_code" />
<result property="uploadingType" column="uploading_type" /> <result property="uploadingType" column="uploading_type" />
<result property="sysApkName" column="sys_apk_name" /> <result property="sysApkName" column="sys_apk_name" />
<result property="version" column="version" /> <result property="version" column="version" />
@ -23,12 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSysApkInfoVo"> <sql id="selectSysApkInfoVo">
select id, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO select id, app_id,app_code, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO
</sql> </sql>
<select id="selectSysApkInfoList" parameterType="SysApkInfo" resultMap="SysApkInfoResult"> <select id="selectSysApkInfoList" parameterType="SysApkInfo" resultMap="SysApkInfoResult">
<include refid="selectSysApkInfoVo"/> <include refid="selectSysApkInfoVo"/>
<where> <where>
<if test="appCode != null and appCode != ''"> and app_code = #{appCode}</if>
<if test="uploadingType != null and uploadingType != ''"> and uploading_type = #{uploadingType}</if> <if test="uploadingType != null and uploadingType != ''"> and uploading_type = #{uploadingType}</if>
<if test="sysApkName != null and sysApkName != ''"> and sys_apk_name like concat('%', #{sysApkName}, '%')</if> <if test="sysApkName != null and sysApkName != ''"> and sys_apk_name like concat('%', #{sysApkName}, '%')</if>
<if test="version != null and version != ''"> and version = #{version}</if> <if test="version != null and version != ''"> and version = #{version}</if>