diff --git a/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java b/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java index 5ac20f9..6239438 100644 --- a/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java +++ b/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java @@ -77,6 +77,8 @@ public class SysApkInfoController extends BaseController @PostMapping public AjaxResult add(@RequestBody SysApkInfo sysApkInfo) { + sysApkInfo.setCreated(getUsername()); + sysApkInfo.setModified(getUsername()); return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo)); } @@ -88,6 +90,7 @@ public class SysApkInfoController extends BaseController @PutMapping public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo) { + sysApkInfo.setModified(getUsername()); return toAjax(sysApkInfoService.updateSysApkInfo(sysApkInfo)); } diff --git a/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java b/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java index fe06f86..8b09ef0 100644 --- a/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java +++ b/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java @@ -7,196 +7,232 @@ import com.sf.common.core.domain.BaseEntity; /** * 安装包管理(新)对象 SYS_APK_INFO - * + * * @author ztzh * @date 2024-04-11 */ -public class SysApkInfo extends BaseEntity -{ +public class SysApkInfo extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键 */ + /** + * 主键 + */ private Long id; - /** 上传类型 */ + /** + * 上传类型 + */ + private String appId; + + + private String appCode; + + /** + * 上传类型 + */ @Excel(name = "上传类型") private String uploadingType; - /** 安装包名称 */ + /** + * 安装包名称 + */ @Excel(name = "安装包名称") private String sysApkName; - /** 版本号 */ + /** + * 版本号 + */ @Excel(name = "版本号") private String version; - /** 安装包 */ + /** + * 安装包 + */ @Excel(name = "安装包") private String sysApk; - /** 安装包大小 */ + /** + * 安装包大小 + */ @Excel(name = "安装包大小") private String sysApkSize; - /** 安装包类型 */ + /** + * 安装包类型 + */ @Excel(name = "安装包类型") private String sysType; - /** 上传状态 */ + /** + * 上传状态 + */ private Long uploadingStatus; - /** 日志id */ + /** + * 日志id + */ private Long uploadingLogId; - /** 排序 */ + /** + * 排序 + */ private Long orderNum; - /** 逻辑删除,0:未删除,1:删除 */ + /** + * 逻辑删除,0:未删除,1:删除 + */ private Long isDelete; - /** 创建人 */ + /** + * 创建人 + */ @Excel(name = "创建人") private String created; - /** 更新人 */ + /** + * 更新人 + */ private String modified; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setUploadingType(String uploadingType) - { + + public void setUploadingType(String uploadingType) { this.uploadingType = uploadingType; } - public String getUploadingType() - { + public String getUploadingType() { return uploadingType; } - public void setSysApkName(String sysApkName) - { + + public void setSysApkName(String sysApkName) { this.sysApkName = sysApkName; } - public String getSysApkName() - { + public String getSysApkName() { return sysApkName; } - public void setVersion(String version) - { + + public void setVersion(String version) { this.version = version; } - public String getVersion() - { + public String getVersion() { return version; } - public void setSysApk(String sysApk) - { + + public void setSysApk(String sysApk) { this.sysApk = sysApk; } - public String getSysApk() - { + public String getSysApk() { return sysApk; } - public void setSysApkSize(String sysApkSize) - { + + public void setSysApkSize(String sysApkSize) { this.sysApkSize = sysApkSize; } - public String getSysApkSize() - { + public String getSysApkSize() { return sysApkSize; } - public void setSysType(String sysType) - { + + public void setSysType(String sysType) { this.sysType = sysType; } - public String getSysType() - { + public String getSysType() { return sysType; } - public void setUploadingStatus(Long uploadingStatus) - { + + public void setUploadingStatus(Long uploadingStatus) { this.uploadingStatus = uploadingStatus; } - public Long getUploadingStatus() - { + public Long getUploadingStatus() { return uploadingStatus; } - public void setUploadingLogId(Long uploadingLogId) - { + + public void setUploadingLogId(Long uploadingLogId) { this.uploadingLogId = uploadingLogId; } - public Long getUploadingLogId() - { + public Long getUploadingLogId() { return uploadingLogId; } - public void setOrderNum(Long orderNum) - { + + public void setOrderNum(Long orderNum) { this.orderNum = orderNum; } - public Long getOrderNum() - { + public Long getOrderNum() { return orderNum; } - public void setIsDelete(Long isDelete) - { + + public void setIsDelete(Long isDelete) { this.isDelete = isDelete; } - public Long getIsDelete() - { + public Long getIsDelete() { return isDelete; } - public void setCreated(String created) - { + + public void setCreated(String created) { this.created = created; } - public String getCreated() - { + public String getCreated() { return created; } - public void setModified(String modified) - { + + public void setModified(String modified) { this.modified = modified; } - public String getModified() - { + public String getModified() { 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 public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("uploadingType", getUploadingType()) - .append("sysApkName", getSysApkName()) - .append("version", getVersion()) - .append("sysApk", getSysApk()) - .append("sysApkSize", getSysApkSize()) - .append("sysType", getSysType()) - .append("uploadingStatus", getUploadingStatus()) - .append("uploadingLogId", getUploadingLogId()) - .append("orderNum", getOrderNum()) - .append("isDelete", getIsDelete()) - .append("created", getCreated()) - .append("modified", getModified()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("uploadingType", getUploadingType()) + .append("sysApkName", getSysApkName()) + .append("version", getVersion()) + .append("sysApk", getSysApk()) + .append("sysApkSize", getSysApkSize()) + .append("sysType", getSysType()) + .append("uploadingStatus", getUploadingStatus()) + .append("uploadingLogId", getUploadingLogId()) + .append("orderNum", getOrderNum()) + .append("isDelete", getIsDelete()) + .append("created", getCreated()) + .append("modified", getModified()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("appCode", getAppId()) + .append("appId", getAppCode()) + .toString(); } } diff --git a/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java b/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java index 3d3bc69..4821588 100644 --- a/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java +++ b/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java @@ -54,6 +54,7 @@ public class SysApkInfoServiceImpl implements ISysApkInfoService public int insertSysApkInfo(SysApkInfo sysApkInfo) { sysApkInfo.setCreateTime(DateUtils.getNowDate()); + sysApkInfo.setUpdateTime(DateUtils.getNowDate()); return sysApkInfoMapper.insertSysApkInfo(sysApkInfo); } diff --git a/sf-admin/src/main/resources/application.yml b/sf-admin/src/main/resources/application.yml index 1a466e0..4a496a5 100644 --- a/sf-admin/src/main/resources/application.yml +++ b/sf-admin/src/main/resources/application.yml @@ -59,9 +59,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 100MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 200MB # 服务模块 devtools: restart: diff --git a/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml b/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml index d1a60cf..7d55141 100644 --- a/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml +++ b/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml @@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -23,12 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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