Skip to content

8
8timerapiv200
Commit fa568dc1 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!417
parents 76d47ee4 a73f940b
Showing with 12 additions and 108 deletions
src/main/java/cn/timer/api/bean/app/CheckAppVersion.java
......@@ -44,7 +44,7 @@ public class CheckAppVersion extends Model<CheckAppVersion> {
private String version;
@ApiModelProperty(value = "最低限制 ", example = "最低限制")
private String limiti;
private String limitVersion;
@ApiModelProperty(value = "下载地址 ", example = "下载地址")
private String url;
......@@ -56,7 +56,7 @@ public class CheckAppVersion extends Model<CheckAppVersion> {
private String remark;
@ApiModelProperty(value = " ", example = "101")
private Integer forcei;
private Integer must;
@ApiModelProperty(value = "最后修改时间 ", example = "最后修改时间")
private String updateTime;
......
src/main/java/cn/timer/api/controller/app/AppModuleController.java
......@@ -27,8 +27,10 @@ public class AppModuleController {
public Result<Object> CheckAppVersion(@PathVariable("typename") String typename)
throws ParseException {
// 1:android 2:ios
CheckAppVersion ver = CheckAppVersion.builder().build().selectOne(new QueryWrapper<CheckAppVersion>().lambda().eq(CheckAppVersion::getSystem, typename));
CheckAppVersion ver = CheckAppVersion.builder().url("").downloadUrl("").remark("").build();
ver = CheckAppVersion.builder().build().selectOne(new QueryWrapper<CheckAppVersion>().lambda().eq(CheckAppVersion::getSystem, typename));
return ResultUtil.data(ver, "操作成功!");
}
......
src/main/resources/mapping/app/CheckAppVersionMapper.xml
......@@ -7,11 +7,11 @@
<id column="id" property="id" />
<result column="system" property="system" />
<result column="version" property="version" />
<result column="limiti" property="limiti" />
<result column="limit_version" property="limitVersion" />
<result column="url" property="url" />
<result column="download_url" property="downloadUrl" />
<result column="remark" property="remark" />
<result column="forcei" property="forcei" />
<result column="must" property="must" />
<result column="update_time" property="updateTime" />
</resultMap>
......@@ -19,11 +19,11 @@
id,
system,
version,
limiti,
limit_version,
url,
download_url,
remark,
forcei,
must,
update_time
</sql>
......@@ -31,110 +31,13 @@
id CheckAppVersion_id,
system CheckAppVersion_system,
version CheckAppVersion_version,
limiti CheckAppVersion_limiti,
limit_version CheckAppVersion_limit_version,
url CheckAppVersion_url,
download_url CheckAppVersion_download_url,
remark CheckAppVersion_remark,
forcei CheckAppVersion_forcei,
must CheckAppVersion_must,
update_time CheckAppVersion_update_time
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.app.CheckAppVersion">
INSERT INTO check_app_version
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != system'>
system,
</if>
<if test ='null != version'>
version,
</if>
<if test ='null != limiti'>
limiti,
</if>
<if test ='null != url'>
url,
</if>
<if test ='null != downloadUrl'>
download_url,
</if>
<if test ='null != remark'>
remark,
</if>
<if test ='null != forcei'>
forcei,
</if>
<if test ='null != updateTime'>
update_time
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != system'>
#{system},
</if>
<if test ='null != version'>
#{version},
</if>
<if test ='null != limiti'>
#{limiti},
</if>
<if test ='null != url'>
#{url},
</if>
<if test ='null != downloadUrl'>
#{downloadUrl},
</if>
<if test ='null != remark'>
#{remark},
</if>
<if test ='null != forcei'>
#{forcei},
</if>
<if test ='null != updateTime'>
#{updateTime}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM check_app_version
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.app.CheckAppVersion">
UPDATE check_app_version
<set>
<if test ='null != system'>system = #{system},</if>
<if test ='null != version'>version = #{version},</if>
<if test ='null != limiti'>limiti = #{limiti},</if>
<if test ='null != url'>url = #{url},</if>
<if test ='null != downloadUrl'>download_url = #{downloadUrl},</if>
<if test ='null != remark'>remark = #{remark},</if>
<if test ='null != forcei'>forcei = #{forcei},</if>
<if test ='null != updateTime'>update_time = #{updateTime}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM check_app_version
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM check_app_version
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM check_app_version
</select>
-->
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment