Browse Source

增加对外公开接口

hechunping 2 years ago
parent
commit
9040b8c2b1

+ 23 - 15
sys-api-service/src/main/java/com/xy/service/SysAgreementServiceImpl.java

@@ -1,25 +1,24 @@
 package com.xy.service;
 package com.xy.service;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.dto.SysAgreementDto;
 import com.xy.entity.SysAgreement;
 import com.xy.entity.SysAgreement;
 import com.xy.mapper.SysAgreementMapper;
 import com.xy.mapper.SysAgreementMapper;
-import com.xy.service.SysAgreementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 
 import java.util.List;
 import java.util.List;
-import com.xy.utils.R;
-import com.xy.utils.PageBean;
-import com.xy.dto.SysAgreementDto;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.PostMapping;
-import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.xy.utils.MybatisPlusQuery;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.validation.annotation.Validated;
-import com.xy.utils.Emptys;
 
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
 import static com.xy.utils.PlusBeans.toIPage;
@@ -36,8 +35,17 @@ import static com.xy.utils.PlusBeans.toPageBean;
 */
 */
 @Service
 @Service
 @AllArgsConstructor
 @AllArgsConstructor
-@Api(tags = "")
+@Api(tags = "系统协议管理")
 public class SysAgreementServiceImpl extends ServiceImpl<SysAgreementMapper, SysAgreement> implements SysAgreementService {
 public class SysAgreementServiceImpl extends ServiceImpl<SysAgreementMapper, SysAgreement> implements SysAgreementService {
+    @PostMapping("listByMember")
+    @ApiOperation("协议列表展示(对外公开)")
+    public R<List<SysAgreementDto.ListByMemberVo>> listByMember(@RequestBody @Validated SysAgreementDto.ListByMemberDto dto){
+        LambdaQueryWrapper<SysAgreement> lqw = new LambdaQueryWrapper<SysAgreement>()
+                .in(SysAgreement::getType,dto.getTypeList())
+                .eq(SysAgreement::getStatus,true);
+        return R.ok(copy(SysAgreementDto.ListByMemberVo.class,list(lqw)));
+    }
+
 
 
     @PostMapping("obj")
     @PostMapping("obj")
     @ApiOperation("对象查询")
     @ApiOperation("对象查询")

+ 47 - 8
sys-api/src/main/java/com/xy/dto/SysAgreementDto.java

@@ -6,7 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 
 
+import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -18,6 +20,33 @@ import java.time.LocalDateTime;
  */
  */
 public class SysAgreementDto {
 public class SysAgreementDto {
 
 
+    @Data
+    @Accessors(chain = true)
+    public static class ListByMemberDto {
+        @NotEmpty(message = "类型不能为空")
+        @ApiModelProperty(value = "类型")
+        private List<String> typeList;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class ListByMemberVo {
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @ApiModelProperty(value = "标题")
+        private String title;
+
+        @ApiModelProperty(value = "类型")
+        private String type;
+
+        @ApiModelProperty(value = "内容")
+        private String content;
+
+        @ApiModelProperty(value = "版本")
+        private String version;
+    }
+
     @Data
     @Data
     @Accessors(chain = true)
     @Accessors(chain = true)
     public static class SelectList extends Vo {
     public static class SelectList extends Vo {
@@ -35,20 +64,35 @@ public class SysAgreementDto {
 
 
     @Data
     @Data
     @Accessors(chain = true)
     @Accessors(chain = true)
-    public static class Save extends Vo {
+    public static class Save {
+        @ApiModelProperty(value = "标题")
+        private String title;
+
+        @ApiModelProperty(value = "类型")
+        private String type;
+
+        @ApiModelProperty(value = "内容")
+        private String content;
 
 
+        @ApiModelProperty(value = "版本")
+        private String version;
+
+        @ApiModelProperty(value = "是否显示:0=隐藏,1=显示")
+        private Boolean status;
     }
     }
 
 
     @Data
     @Data
     @Accessors(chain = true)
     @Accessors(chain = true)
-    public static class Update extends Vo {
-
+    public static class Update extends Save{
+        @ApiModelProperty(value = "id")
+        private Long id;
     }
     }
 
 
     @Data
     @Data
     @Accessors(chain = true)
     @Accessors(chain = true)
     public static class Vo {
     public static class Vo {
 
 
+        @ApiModelProperty(value = "id")
         private Long id;
         private Long id;
 
 
         @ApiModelProperty(value = "标题")
         @ApiModelProperty(value = "标题")
@@ -79,11 +123,6 @@ public class SysAgreementDto {
         @ApiModelProperty(value = "更新时间")
         @ApiModelProperty(value = "更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
         private LocalDateTime updateTime;
-
-        @ApiModelProperty(value = "逻辑删除")
-        private Boolean deleted;
-
-
     }
     }
 
 
 }
 }