apk增加修改

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

@@ -39,4 +39,11 @@ public interface ApkFileUpLoadMapper {
      * @return
      */
     public ApkUploadVo getById(Long id);
+
+    /****
+     * 修改
+     * @param apkUploadVo
+     * @return
+     */
+    public int upload(ApkUploadVo apkUploadVo);
 }

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

@@ -112,6 +112,13 @@ public class ApkFileUpLoadController extends BaseController {
         return ResultData.success(apkFileUpLoadService.getById(id));
     }
 
+    @Log(title = "修改APK包")
+    @PreAuthorize(hasPermi = "laboratory:apkupload:edit")
+    @PostMapping("/editApk")
+    public ResultData editApk(ApkUploadVo apkUploadVo) {
+        return ResultData.success(apkFileUpLoadService.upload(apkUploadVo));
+    }
+
     /**
      * log新增升级日志
      */

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

@@ -36,6 +36,9 @@ public class ApkUpload extends BaseEntity {
     @ApiModelProperty("信息描述")
     private String apkInfo;
 
+    @ApiModelProperty("文件信息")
+    private String fileData;
+
     public Long getId() {
         return id;
     }
@@ -87,4 +90,12 @@ public class ApkUpload extends BaseEntity {
     public String getApkInfo() {        return apkInfo;    }
 
     public void setApkInfo(String apkInfo) {        this.apkInfo = apkInfo;    }
+
+    public String getFileData() {
+        return fileData;
+    }
+
+    public void setFileData(String fileData) {
+        this.fileData = fileData;
+    }
 }

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

@@ -101,4 +101,10 @@ public interface ApkFileUpLoadService {
      */
     public ApkUploadVo getById(Long apkId);
 
+    /****
+     * 修改
+     * @param apkUploadVo
+     * @return
+     */
+    public int upload(ApkUploadVo apkUploadVo);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.domain.vo.LabHardwareVO;
 import com.zd.laboratory.mapper.ApkFileUpLoadMapper;
@@ -23,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * Controller
@@ -196,4 +194,19 @@ public class ApkFileUpLoadServiceImpl implements ApkFileUpLoadService {
     public ApkUploadVo getById(Long apkId) {
         return apkFileUpLoadMapper.getById(apkId);
     }
+
+    /****
+     * 修改
+     * @param apkUploadVo
+     * @return
+     */
+    @Override
+    public int upload(ApkUploadVo apkUploadVo) {
+        if(StringUtils.isNull(apkUploadVo.getId())){
+            throw new ServiceException("主键为空！");
+        }
+        apkUploadVo.setUpdateTime(new Date());
+        apkUploadVo.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName());
+        return apkFileUpLoadMapper.upload(apkUploadVo);
+    }
 }

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

@@ -17,6 +17,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="remark" column="remark"/>
+        <result property="fileData" column="fileData"/>
     </resultMap>
 
     <select id="selectApkFileUpLoadList" parameterType="com.zd.laboratory.onemachine.domain.ApkUploadVo"
@@ -43,6 +44,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="remark != null">remark,</if>
+            <if test="fileData != null">file_data,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="apkName != null">#{apkName},</if>
@@ -56,6 +58,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="fileData != null">#{fileData},</if>
         </trim>
     </insert>
 
@@ -77,9 +80,27 @@
                create_time,
                update_by,
                update_time,
-               remark
+               remark,
+               file_data
         from apk_upload
         where id = #{id}
     </select>
 
+    <update id="upload" parameterType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
+        update apk_upload
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="apkName != null">apk_name = #{apkName},</if>
+            <if test="apkFileUpload != null">apk_file_upload = #{apkFileUpload},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="versionName != null">version_name = #{versionName},</if>
+            <if test="onepcType != null">onepc_type = #{onepcType},</if>
+            <if test="apkInfo != null">apk_info = #{apkInfo},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="fileData != null">file_data = #{fileData},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
 </mapper>