APK上传新增详情描述

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/ApkFileUpLoadMapper.java

@@ -33,4 +33,10 @@ public interface ApkFileUpLoadMapper {
      */
     public int deleteApkUploadByIds(Long id);
 
+    /***
+     * 根据id查询详情
+     * @param id
+     * @return
+     */
+    public ApkUploadVo getById(Long id);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/controller/ApkFileUpLoadController.java

@@ -96,6 +96,21 @@ public class ApkFileUpLoadController extends BaseController {
         return getDataTable(list);
     }
 
+    @PreAuthorize(hasPermi = "laboratory:apkupload:list")
+    @GetMapping("/apkUploadList")
+    @ApiOperation("查询apk上传的版本信息")
+    public TableDataInfo apkUploadList(ApkUploadVo apkLogVo) {
+        startPage("create_time", "descending");
+        List<ApkUploadVo> list = apkFileUpLoadService.selectApkFileUpLoadList(apkLogVo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "查询apk版本详情")
+    @PreAuthorize(hasPermi = "laboratory:apkupload:query")
+    @GetMapping("/getById")
+    public ResultData getById(Long id) {
+        return ResultData.success(apkFileUpLoadService.getById(id));
+    }
 
     /**
      * log新增升级日志

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/domain/ApkUpload.java

@@ -33,6 +33,9 @@ public class ApkUpload extends BaseEntity {
     @ApiModelProperty("1是一体机2学习内容")
     private Integer onepcType;
 
+    @ApiModelProperty("信息描述")
+    private String apkInfo;
+
     public Long getId() {
         return id;
     }
@@ -80,4 +83,8 @@ public class ApkUpload extends BaseEntity {
     public void setOnepcType(Integer onepcType) {
         this.onepcType = onepcType;
     }
+
+    public String getApkInfo() {        return apkInfo;    }
+
+    public void setApkInfo(String apkInfo) {        this.apkInfo = apkInfo;    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ApkFileUpLoadService.java

@@ -94,4 +94,11 @@ public interface ApkFileUpLoadService {
      */
     public int deleteApkUploadByIds(Long apkId);
 
+    /***
+     * 根据id查询详情
+     * @param apkId
+     * @return
+     */
+    public ApkUploadVo getById(Long apkId);
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/ApkFileUpLoadServiceImpl.java

@@ -186,4 +186,14 @@ public class ApkFileUpLoadServiceImpl implements ApkFileUpLoadService {
     public int deleteApkUploadByIds(Long apkId) {
         return apkFileUpLoadMapper.deleteApkUploadByIds(apkId);
     }
+
+    /***
+     * 根据id查询详情
+     * @param apkId
+     * @return
+     */
+    @Override
+    public ApkUploadVo getById(Long apkId) {
+        return apkFileUpLoadMapper.getById(apkId);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/ApkFileUploadMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="version" column="version"/>
         <result property="versionName" column="version_name"/>
         <result property="onepcType" column="onepc_type"/>
+        <result property="apkInfo" column="apk_info"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
@@ -22,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ul.*,ul.id apkId from apk_upload ul
         <where>
             <if test="onepcType != null "> and ul.onepc_type = #{onepcType} </if>
+            <if test="versionName != null "> and ul.version_name  like concat("%", #{versionName}, "%")  </if>
         </where>
     </select>
 
@@ -33,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version,</if>
             <if test="versionName != null">version_name,</if>
             <if test="onepcType != null">onepc_type,</if>
+            <if test="apkInfo != null">apk_info,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -45,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">#{version},</if>
             <if test="versionName != null">#{versionName},</if>
             <if test="onepcType != null">#{onepcType},</if>
+            <if test="apkInfo != null">#{apkInfo},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -57,4 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from apk_upload where id = #{id}
     </delete>
 
+    <select id="getById"  resultType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
+        select * from apk_upload where id=#{id}
+    </select>
+
 </mapper>