微调

lic-system/src/main/java/com/system/controller/LicInfoController.java

@@ -24,7 +24,7 @@ public class LicInfoController {
 
     @ApiOperation("Lic信息列表")
     @GetMapping("/lic/info/list")
-    public RestResponse licInfoList(@ModelAttribute LicInfoListInVo inVo) {
+    public RestResponse<LicInfoListOutVo> licInfoList(@ModelAttribute LicInfoListInVo inVo) {
         LicInfoListOutVo outVo = locInfoService.licInfoList(inVo);
         return RestResponse.success(outVo);
     }

lic-system/src/main/java/com/system/dto/DockerServiceDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-@ApiModel(value = "docker镜像表", description = "私有镜像")
+@ApiModel(value = "docker镜像表Dto", description = "私有镜像Dto")
 public class DockerServiceDto implements Serializable {
 
     private static final long serialVersionUID = 1L;

lic-system/src/main/java/com/system/entity/DockerImage.java

 package com.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -25,11 +26,13 @@ public class DockerImage implements Serializable {
     private Integer id;
 
     @ApiModelProperty(value = "镜像名")
+    @TableField(value = "`name`")
     private String name;
 
     @ApiModelProperty(value = "服务路径")
     private String contextPath;
 
     @ApiModelProperty(value = "描述")
+    @TableField(value = "`describe`")
     private String describe;
 }

lic-system/src/main/java/com/system/serivce/impl/DockerImageVersionServiceImpl.java

@@ -17,14 +17,17 @@ public class DockerImageVersionServiceImpl extends ServiceImpl<DockerImageVersio
     @Override
     public boolean deleteByImageId(Integer imageId) {
         LambdaQueryWrapper<DockerImageVersion> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DockerImageVersion::getImageId,imageId);
+        wrapper.eq(DockerImageVersion::getImageId, imageId);
+        if (count(wrapper) == 0) {
+            return true;
+        }
         return this.remove(wrapper);
     }
 
     @Override
     public List<DockerImageVersion> listByImageId(Integer imagesId) {
         LambdaQueryWrapper<DockerImageVersion> qw = new LambdaQueryWrapper<>();
-        qw.eq(DockerImageVersion::getImageId,imagesId);
+        qw.eq(DockerImageVersion::getImageId, imagesId);
         return list(qw);
     }
 }

lic-system/src/main/java/com/system/transfer/lic/LicInfoCreateInVo.java

@@ -45,6 +45,9 @@ public class LicInfoCreateInVo {
      */
     private List<String> moduleVerification;
 
+    /**
+     * 服务
+     */
     private List<DockerServiceDto> dockerServices;
 
     /**

lic-system/src/main/java/com/system/transfer/lic/LicInfoListOutVo.java

 package com.system.transfer.lic;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -8,17 +10,20 @@ import java.util.List;
  * @author Inori
  */
 @Data
+@ApiModel(value="LicInfoListOutVo")
 public class LicInfoListOutVo {
 
     /**
      * 总数
      */
+    @ApiModelProperty(value = "条数")
     private Integer total;
 
 
     /**
      * 记录
      */
+    @ApiModelProperty(value = "item")
     private List<LicInfoListOutVoRecords> records;
 
 

lic-system/src/main/java/com/system/transfer/response/RestResponse.java

@@ -3,7 +3,7 @@ package com.system.transfer.response;
 /**
  * @author Inori
  */
-public class RestResponse {
+public class RestResponse<T> {
     public static final int CODE_SUCCESS = 200;
     public static final int CODE_VERSION_NONSUPPORT = 305;
     public static final int CODE_PARAM_ERROR = 400;
@@ -15,7 +15,7 @@ public class RestResponse {
 
     private int code;
     private String message;
-    private Object data = null;
+    private T data;
 
     public static RestResponse success() {
         RestResponse restResponse = new RestResponse();
@@ -24,8 +24,8 @@ public class RestResponse {
         return restResponse;
     }
 
-    public static RestResponse success(Object data) {
-        RestResponse restResponse = new RestResponse();
+    public static <T>RestResponse<T> success(T data) {
+        RestResponse<T> restResponse = new RestResponse<T>();
         restResponse.setCode(200);
         restResponse.setData(data);
         return restResponse;
@@ -85,7 +85,7 @@ public class RestResponse {
         return data;
     }
 
-    public void setData(Object data) {
+    public void setData(T data) {
         this.data = data;
     }
 

lic-system/src/main/resources/application.yaml

 spring:
   profiles:
-    active: test
+    active: docker