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

Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test

Browse Source
This commit is contained in:
张洋川 2024-04-24 12:37:16 +08:00
commit b9bdf4abf4
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java
View File

@ -103,9 +103,20 @@ public class DeploymentServicePublish extends BaseEntity
private String appCode;
/** 系统编码 */
private String apkUrl;
/** 二维码 */
private String quickMark;
public String getApkUrl() {
return apkUrl;
}
public void setApkUrl(String apkUrl) {
this.apkUrl = apkUrl;
}
public String getQuickMark() {
return quickMark;
@ -341,6 +352,7 @@ public class DeploymentServicePublish extends BaseEntity
.append("createTime", getCreateTime())
.append("appCode", getAppCode())
.append("quickMark", getQuickMark())
.append("apkUrl", getApkUrl())
.toString();
}
}

6
sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="applyId" column="apply_id" />
<result property="appName" column="app_name" />
<result property="appCode" column="app_code" />
<result property="apkUrl" column="apk_url" />
<result property="quickMark" column="quick_mark" />
<result property="systemType" column="system_type" />
<result property="apkId" column="apk_id" />
@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDeploymentServicePublishVo">
select id, apply_id, app_name, app_code, quick_mark, system_type, apk_id, app_store_address, version, version_desc, publish_environment, publish_strategy, result_notify, public_version, force_update, download_verification, update_object, validity_start_time, validity_end_time, remark, status, is_delete, created, modified, create_time, update_time from DEPLOYMENT_SERVICE_PUBLISH
select id, apply_id, app_name, app_code,apk_url , quick_mark, system_type, apk_id, app_store_address, version, version_desc, publish_environment, publish_strategy, result_notify, public_version, force_update, download_verification, update_object, validity_start_time, validity_end_time, remark, status, is_delete, created, modified, create_time, update_time from DEPLOYMENT_SERVICE_PUBLISH
</sql>
<select id="selectDeploymentServicePublishList" parameterType="DeploymentServicePublish" resultMap="DeploymentServicePublishResult">
@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="applyId != null">apply_id,</if>
<if test="appName != null and appName != ''">app_name,</if>
<if test="apkUrl != null and apkUrl != ''">apk_url,</if>
<if test="systemType != null and systemType != ''">system_type,</if>
<if test="apkId != null and apkId != ''">apk_id,</if>
<if test="appStoreAddress != null">app_store_address,</if>
@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="applyId != null">#{applyId},</if>
<if test="appName != null and appName != ''">#{appName},</if>
<if test="apkUrl != null and apkUrl != ''">#{apkUrl},</if>
<if test="systemType != null and systemType != ''">#{systemType},</if>
<if test="apkId != null and apkId != ''">#{apkId},</if>
<if test="appStoreAddress != null">#{appStoreAddress},</if>
@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyId != null">apply_id = #{applyId},</if>
<if test="appName != null and appName != ''">app_name = #{appName},</if>
<if test="appCode != null and appCode != ''">app_code = #{appCode},</if>
<if test="apkUrl != null and apkUrl != ''">app_code = #{appCode},</if>
<if test="quickMark != null and quickMark != ''">quick_mark = #{quickMark},</if>
<if test="systemType != null and systemType != ''">system_type = #{systemType},</if>
<if test="apkId != null and apkId != ''">apk_id = #{apkId},</if>

6
sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml
View File

@ -51,6 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="uploadingType != null and uploadingType != ''">uploading_type,</if>
<if test="sysApkName != null and sysApkName != ''">sys_apk_name,</if>
<if test="appId != null and appId != ''">app_id,</if>
<if test="appCode != null and appCode != ''">app_code,</if>
<if test="version != null and version != ''">version,</if>
<if test="sysApk != null">sys_apk,</if>
<if test="sysApkSize != null">sys_apk_size,</if>
@ -67,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="uploadingType != null and uploadingType != ''">#{uploadingType},</if>
<if test="sysApkName != null and sysApkName != ''">#{sysApkName},</if>
<if test="appId != null and appId != ''">#{appId},</if>
<if test="appCode != null and appCode != ''">#{appCode},</if>
<if test="version != null and version != ''">#{version},</if>
<if test="sysApk != null">#{sysApk},</if>
<if test="sysApkSize != null">#{sysApkSize},</if>
@ -87,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="uploadingType != null and uploadingType != ''">uploading_type = #{uploadingType},</if>
<if test="sysApkName != null and sysApkName != ''">sys_apk_name = #{sysApkName},</if>
<if test="appId != null and appId != ''">app_id = #{appId},</if>
<if test="appCode != null and appCode != ''">app_code = #{appCode},</if>
<if test="version != null and version != ''">version = #{version},</if>
<if test="sysApk != null">sys_apk = #{sysApk},</if>
<if test="sysApkSize != null">sys_apk_size = #{sysApkSize},</if>